Loading...
--- Libc/Libc-498/pthreads/pthread_mutex.c
+++ Libc/Libc-320/pthreads/pthread_mutex.c
@@ -1,7 +1,9 @@
/*
- * Copyright (c) 2000-2003, 2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
+ *
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
@@ -52,24 +54,6 @@
#include "pthread_internals.h"
-#include "plockstat.h"
-
-extern int __unix_conforming;
-
-#ifndef BUILDING_VARIANT /* [ */
-
-#define BLOCK_FAIL_PLOCKSTAT 0
-#define BLOCK_SUCCESS_PLOCKSTAT 1
-
-/* This function is never called and exists to provide never-fired dtrace
- * probes so that user d scripts don't get errors.
- */
-__private_extern__ void _plockstat_never_fired(void)
-{
- PLOCKSTAT_MUTEX_SPIN(NULL);
- PLOCKSTAT_MUTEX_SPUN(NULL, 0, 0);
-}
-
/*
* Destroy a mutex variable.
*/
@@ -85,27 +69,17 @@
mutex->busy == (pthread_cond_t *)NULL)
{
mutex->sig = _PTHREAD_NO_SIG;
- res = 0;
+ res = ESUCCESS;
}
else
res = EBUSY;
- } else if (mutex->sig == _PTHREAD_KERN_MUTEX_SIG) {
- int mutexid = mutex->_pthread_mutex_kernid;
- UNLOCK(mutex->lock);
- if( __pthread_mutex_destroy(mutexid) == -1)
- return(errno);
- mutex->sig = _PTHREAD_NO_SIG;
- return(0);
- } else
+ }
+ else
res = EINVAL;
UNLOCK(mutex->lock);
return (res);
}
-#ifdef PR_5243343
-/* 5243343 - temporary hack to detect if we are running the conformance test */
-extern int PR_5243343_flag;
-#endif /* PR_5243343 */
/*
* Initialize a mutex variable, possibly with additional attributes.
*/
@@ -119,27 +93,10 @@
mutex->prioceiling = attr->prioceiling;
mutex->protocol = attr->protocol;
mutex->type = attr->type;
- mutex->pshared = attr->pshared;
- if (attr->pshared == PTHREAD_PROCESS_SHARED) {
- mutex->lock_count = 0;
- mutex->owner = (pthread_t)NULL;
- mutex->next = (pthread_mutex_t *)NULL;
- mutex->prev = (pthread_mutex_t *)NULL;
- mutex->busy = (pthread_cond_t *)NULL;
- mutex->waiters = 0;
- mutex->sem = SEMAPHORE_NULL;
- mutex->order = SEMAPHORE_NULL;
- mutex->sig = 0;
- if( __pthread_mutex_init(mutex, attr) == -1)
- return(errno);
- mutex->sig = _PTHREAD_KERN_MUTEX_SIG;
- return(0);
- }
} else {
mutex->prioceiling = _PTHREAD_DEFAULT_PRIOCEILING;
mutex->protocol = _PTHREAD_DEFAULT_PROTOCOL;
mutex->type = PTHREAD_MUTEX_DEFAULT;
- mutex->pshared = _PTHREAD_DEFAULT_PSHARED;
}
mutex->lock_count = 0;
mutex->owner = (pthread_t)NULL;
@@ -150,7 +107,7 @@
mutex->sem = SEMAPHORE_NULL;
mutex->order = SEMAPHORE_NULL;
mutex->sig = _PTHREAD_MUTEX_SIG;
- return (0);
+ return (ESUCCESS);
}
/*
@@ -160,12 +117,6 @@
int
pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
{
-#if 0
- /* conformance tests depend on not having this behavior */
- /* The test for this behavior is optional */
- if (mutex->sig == _PTHREAD_MUTEX_SIG)
- return EBUSY;
-#endif
LOCK_INIT(mutex->lock);
return (_pthread_mutex_init(mutex, attr));
}
@@ -222,34 +173,15 @@
int sig = mutex->sig;
/* To provide backwards compat for apps using mutex incorrectly */
- if ((sig != _PTHREAD_MUTEX_SIG) && (sig != _PTHREAD_MUTEX_SIG_init) && (sig != _PTHREAD_KERN_MUTEX_SIG)) {
- PLOCKSTAT_MUTEX_ERROR(mutex, EINVAL);
+ if ((sig != _PTHREAD_MUTEX_SIG) && (sig != _PTHREAD_MUTEX_SIG_init))
return(EINVAL);
- }
LOCK(mutex->lock);
if (mutex->sig != _PTHREAD_MUTEX_SIG)
{
if (mutex->sig != _PTHREAD_MUTEX_SIG_init)
{
- if (mutex->sig == _PTHREAD_KERN_MUTEX_SIG) {
- int mutexid = mutex->_pthread_mutex_kernid;
- UNLOCK(mutex->lock);
-
- PLOCKSTAT_MUTEX_BLOCK(mutex);
- if( __pthread_mutex_lock(mutexid) == -1) {
- PLOCKSTAT_MUTEX_BLOCKED(mutex, BLOCK_FAIL_PLOCKSTAT);
- PLOCKSTAT_MUTEX_ERROR(mutex, errno);
- return(errno);
- }
-
- PLOCKSTAT_MUTEX_BLOCKED(mutex, BLOCK_SUCCESS_PLOCKSTAT);
- PLOCKSTAT_MUTEX_ACQUIRE(mutex, 0, 0);
- return(0);
- } else {
- UNLOCK(mutex->lock);
- PLOCKSTAT_MUTEX_ERROR(mutex, EINVAL);
- return (EINVAL);
- }
+ UNLOCK(mutex->lock);
+ return (EINVAL);
}
_pthread_mutex_init(mutex, NULL);
self = _PTHREAD_MUTEX_OWNER_SELF;
@@ -266,16 +198,11 @@
if (mutex->lock_count < USHRT_MAX)
{
mutex->lock_count++;
- PLOCKSTAT_MUTEX_ACQUIRE(mutex, 1, 0);
- res = 0;
- } else {
+ res = ESUCCESS;
+ } else
res = EAGAIN;
- PLOCKSTAT_MUTEX_ERROR(mutex, res);
- }
- } else { /* PTHREAD_MUTEX_ERRORCHECK */
+ } else /* PTHREAD_MUTEX_ERRORCHECK */
res = EDEADLK;
- PLOCKSTAT_MUTEX_ERROR(mutex, res);
- }
UNLOCK(mutex->lock);
return (res);
}
@@ -302,14 +229,11 @@
}
UNLOCK(mutex->lock);
- PLOCKSTAT_MUTEX_BLOCK(mutex);
PTHREAD_MACH_CALL(semaphore_wait_signal(sem, order), kern_res);
while (kern_res == KERN_ABORTED)
{
PTHREAD_MACH_CALL(semaphore_wait(sem), kern_res);
}
-
- PLOCKSTAT_MUTEX_BLOCKED(mutex, BLOCK_SUCCESS_PLOCKSTAT);
LOCK(mutex->lock);
if (--mutex->waiters == 0)
@@ -337,8 +261,7 @@
_pthread_mutex_add(mutex, self);
#endif
UNLOCK(mutex->lock);
- PLOCKSTAT_MUTEX_ACQUIRE(mutex, 0, 0);
- return (0);
+ return (ESUCCESS);
}
/*
@@ -355,21 +278,8 @@
{
if (mutex->sig != _PTHREAD_MUTEX_SIG_init)
{
-
- if (mutex->sig == _PTHREAD_KERN_MUTEX_SIG) {
- int mutexid = mutex->_pthread_mutex_kernid;
- UNLOCK(mutex->lock);
- if( __pthread_mutex_trylock(mutexid) == -1) {
- PLOCKSTAT_MUTEX_ERROR(mutex, errno);
- return(errno);
- }
- PLOCKSTAT_MUTEX_ACQUIRE(mutex, 0, 0);
- return(0);
- } else {
- PLOCKSTAT_MUTEX_ERROR(mutex, EINVAL);
- UNLOCK(mutex->lock);
- return (EINVAL);
- }
+ UNLOCK(mutex->lock);
+ return (EINVAL);
}
_pthread_mutex_init(mutex, NULL);
self = _PTHREAD_MUTEX_OWNER_SELF;
@@ -386,12 +296,9 @@
if (mutex->lock_count < USHRT_MAX)
{
mutex->lock_count++;
- PLOCKSTAT_MUTEX_ACQUIRE(mutex, 1, 0);
- res = 0;
- } else {
+ res = ESUCCESS;
+ } else
res = EAGAIN;
- PLOCKSTAT_MUTEX_ERROR(mutex, res);
- }
UNLOCK(mutex->lock);
return (res);
}
@@ -403,7 +310,6 @@
{
if (mutex->waiters || mutex->owner != _PTHREAD_MUTEX_OWNER_SWITCHING)
{
- PLOCKSTAT_MUTEX_ERROR(mutex, EBUSY);
UNLOCK(mutex->lock);
return (EBUSY);
}
@@ -425,8 +331,7 @@
_pthread_mutex_add(mutex, self);
#endif
UNLOCK(mutex->lock);
- PLOCKSTAT_MUTEX_ACQUIRE(mutex, 0, 0);
- return (0);
+ return (ESUCCESS);
}
/*
@@ -442,29 +347,15 @@
/* To provide backwards compat for apps using mutex incorrectly */
- if ((sig != _PTHREAD_MUTEX_SIG) && (sig != _PTHREAD_MUTEX_SIG_init) && (sig != _PTHREAD_KERN_MUTEX_SIG)) {
- PLOCKSTAT_MUTEX_ERROR(mutex, EINVAL);
+ if ((sig != _PTHREAD_MUTEX_SIG) && (sig != _PTHREAD_MUTEX_SIG_init))
return(EINVAL);
- }
LOCK(mutex->lock);
if (mutex->sig != _PTHREAD_MUTEX_SIG)
{
if (mutex->sig != _PTHREAD_MUTEX_SIG_init)
{
- if (mutex->sig == _PTHREAD_KERN_MUTEX_SIG) {
- int mutexid = mutex->_pthread_mutex_kernid;
- UNLOCK(mutex->lock);
- if( __pthread_mutex_unlock(mutexid) == -1) {
- PLOCKSTAT_MUTEX_ERROR(mutex, errno);
- return(errno);
- }
- PLOCKSTAT_MUTEX_RELEASE(mutex, 0);
- return(0);
- } else {
- PLOCKSTAT_MUTEX_ERROR(mutex, EINVAL);
- UNLOCK(mutex->lock);
- return (EINVAL);
- }
+ UNLOCK(mutex->lock);
+ return (EINVAL); /* Not a mutex variable */
}
_pthread_mutex_init(mutex, NULL);
} else
@@ -479,15 +370,13 @@
#if defined(DEBUG)
abort();
#endif
- PLOCKSTAT_MUTEX_ERROR(mutex, EPERM);
UNLOCK(mutex->lock);
return EPERM;
} else if (mutex->type == PTHREAD_MUTEX_RECURSIVE &&
--mutex->lock_count)
{
- PLOCKSTAT_MUTEX_RELEASE(mutex, 1);
- UNLOCK(mutex->lock);
- return(0);
+ UNLOCK(mutex->lock);
+ return ESUCCESS;
}
}
@@ -500,17 +389,15 @@
if (waiters)
{
mutex->owner = _PTHREAD_MUTEX_OWNER_SWITCHING;
- PLOCKSTAT_MUTEX_RELEASE(mutex, 0);
UNLOCK(mutex->lock);
PTHREAD_MACH_CALL(semaphore_signal(mutex->sem), kern_res);
}
else
{
mutex->owner = (pthread_t)NULL;
- PLOCKSTAT_MUTEX_RELEASE(mutex, 0);
UNLOCK(mutex->lock);
}
- return (0);
+ return (ESUCCESS);
}
/*
@@ -527,7 +414,7 @@
if (mutex->sig == _PTHREAD_MUTEX_SIG)
{
*prioceiling = mutex->prioceiling;
- res = 0;
+ res = ESUCCESS;
} else
res = EINVAL; /* Not an initialized 'attribute' structure */
UNLOCK(mutex->lock);
@@ -553,7 +440,7 @@
{
*old_prioceiling = mutex->prioceiling;
mutex->prioceiling = prioceiling;
- res = 0;
+ res = ESUCCESS;
} else
res = EINVAL; /* Invalid parameter */
} else
@@ -563,6 +450,16 @@
}
/*
+ * Destroy a mutex attribute structure.
+ */
+int
+pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
+{
+ attr->sig = _PTHREAD_NO_SIG; /* Uninitialized */
+ return (ESUCCESS);
+}
+
+/*
* Get the priority ceiling value from a mutex attribute structure.
* Note: written as a 'helper' function to hide implementation details.
*/
@@ -573,7 +470,7 @@
if (attr->sig == _PTHREAD_MUTEX_ATTR_SIG)
{
*prioceiling = attr->prioceiling;
- return (0);
+ return (ESUCCESS);
} else
{
return (EINVAL); /* Not an initialized 'attribute' structure */
@@ -591,7 +488,7 @@
if (attr->sig == _PTHREAD_MUTEX_ATTR_SIG)
{
*protocol = attr->protocol;
- return (0);
+ return (ESUCCESS);
} else
{
return (EINVAL); /* Not an initialized 'attribute' structure */
@@ -608,7 +505,7 @@
if (attr->sig == _PTHREAD_MUTEX_ATTR_SIG)
{
*type = attr->type;
- return (0);
+ return (ESUCCESS);
} else
{
return (EINVAL); /* Not an initialized 'attribute' structure */
@@ -623,8 +520,8 @@
{
if (attr->sig == _PTHREAD_MUTEX_ATTR_SIG)
{
- *pshared = (int)attr->pshared;
- return (0);
+ *pshared = (int)PTHREAD_PROCESS_PRIVATE;
+ return (ESUCCESS);
} else
{
return (EINVAL); /* Not an initialized 'attribute' structure */
@@ -641,8 +538,7 @@
attr->protocol = _PTHREAD_DEFAULT_PROTOCOL;
attr->type = PTHREAD_MUTEX_DEFAULT;
attr->sig = _PTHREAD_MUTEX_ATTR_SIG;
- attr->pshared = _PTHREAD_DEFAULT_PSHARED;
- return (0);
+ return (ESUCCESS);
}
/*
@@ -659,7 +555,7 @@
(prioceiling <= 999))
{
attr->prioceiling = prioceiling;
- return (0);
+ return (ESUCCESS);
} else
{
return (EINVAL); /* Invalid parameter */
@@ -685,7 +581,7 @@
(protocol == PTHREAD_PRIO_PROTECT))
{
attr->protocol = protocol;
- return (0);
+ return (ESUCCESS);
} else
{
return (EINVAL); /* Invalid parameter */
@@ -711,7 +607,7 @@
(type == PTHREAD_MUTEX_DEFAULT))
{
attr->type = type;
- return (0);
+ return (ESUCCESS);
} else
{
return (EINVAL); /* Invalid parameter */
@@ -722,6 +618,27 @@
}
}
+/*
+ *
+ */
+int
+pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared)
+{
+ if (attr->sig == _PTHREAD_MUTEX_ATTR_SIG)
+ {
+ if (pshared == PTHREAD_PROCESS_PRIVATE)
+ {
+ /* attr->pshared = protocol; */
+ return (ESUCCESS);
+ } else
+ {
+ return (EINVAL); /* Invalid parameter */
+ }
+ } else
+ {
+ return (EINVAL); /* Not an initialized 'attribute' structure */
+ }
+}
int mutex_try_lock(int *x) {
return _spin_lock_try((pthread_lock_t *)x);
@@ -748,60 +665,3 @@
sched_yield();
}
-
-/*
- * Temp: till pshared is fixed correctly
- */
-int
-pthread_mutexattr_setpshared(pthread_mutexattr_t *attr, int pshared)
-{
-#if __DARWIN_UNIX03
- if (__unix_conforming == 0)
- __unix_conforming = 1;
-#endif /* __DARWIN_UNIX03 */
-
- if (attr->sig == _PTHREAD_MUTEX_ATTR_SIG)
- {
-#if __DARWIN_UNIX03
-#ifdef PR_5243343
- if (( pshared == PTHREAD_PROCESS_PRIVATE) || (pshared == PTHREAD_PROCESS_SHARED && PR_5243343_flag))
-#else /* !PR_5243343 */
- if (( pshared == PTHREAD_PROCESS_PRIVATE) || (pshared == PTHREAD_PROCESS_SHARED))
-#endif /* PR_5243343 */
-#else /* __DARWIN_UNIX03 */
- if ( pshared == PTHREAD_PROCESS_PRIVATE)
-#endif /* __DARWIN_UNIX03 */
- {
- attr->pshared = pshared;
- return (0);
- } else
- {
- return (EINVAL); /* Invalid parameter */
- }
- } else
- {
- return (EINVAL); /* Not an initialized 'attribute' structure */
- }
-}
-
-
-#endif /* !BUILDING_VARIANT ] */
-
-/*
- * Destroy a mutex attribute structure.
- */
-int
-pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
-{
-#if __DARWIN_UNIX03
- if (__unix_conforming == 0)
- __unix_conforming = 1;
- if (attr->sig != _PTHREAD_MUTEX_ATTR_SIG)
- return (EINVAL);
-#endif /* __DARWIN_UNIX03 */
-
- attr->sig = _PTHREAD_NO_SIG; /* Uninitialized */
- return (0);
-}
-
-