void
pthread_cond::BroadCast ()
{
+ /* TODO: implement the same race fix as Signal has */
if (pthread_mutex_lock (&cond_access))
system_printf ("Failed to lock condition variable access mutex, this %0p\n", this);
int count = waiting;
- if (!verifyable_object_isvalid (&mutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (&mutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
{
if (pthread_mutex_unlock (&cond_access))
system_printf ("Failed to unlock condition variable access mutex, this %0p\n", this);
{
if (pthread_mutex_lock (&cond_access))
system_printf ("Failed to lock condition variable access mutex, this %0p\n", this);
- if (!verifyable_object_isvalid (&mutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (&mutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
{
if (pthread_mutex_unlock (&cond_access))
system_printf ("Failed to unlock condition variable access mutex, this %0p\n",
this);
return;
}
+ int temp = waiting;
+ if (!temp)
+ /* nothing to signal */
+ {
+ if (pthread_mutex_unlock (&cond_access))
+ system_printf ("Failed to unlock condition variable access mutex, this %0p\n", this);
+ return;
+ }
PulseEvent (win32_obj_id);
+ /* No one can start waiting until we release the condition access mutex */
+ /* The released thread will decrement waiting when it gets a time slice...
+ without waiting for the access mutex
+ */
+ int spins = 10;
+ while (InterlockedIncrement (&waiting) != (temp - 1) && spins)
+ {
+ InterlockedDecrement (&waiting);
+ /* give up the cpu to force a context switch. */
+ Sleep (0);
+ if (spins == 5)
+ /* we've had 5 timeslices, and the woekn thread still hasn't done it's
+ * thing - maybe we raced it with the event? */
+ PulseEvent (win32_obj_id);
+ spins--;
+ }
+ InterlockedDecrement (&waiting);
if (pthread_mutex_unlock (&cond_access))
system_printf ("Failed to unlock condition variable access mutex, this %0p\n", this);
}
/*Generic memory acccess routine - where should it live ? */
int __stdcall
-check_valid_pointer (void *pointer)
+check_valid_pointer (void const *pointer)
{
- if (!pointer || IsBadWritePtr (pointer, sizeof (verifyable_object)))
+ if (!pointer || IsBadWritePtr ((void *) pointer, sizeof (verifyable_object)))
return EFAULT;
return 0;
}
-int
-verifyable_object_isvalid (void const * objectptr, long magic)
+verifyable_object_state
+verifyable_object_isvalid (void const * objectptr, long magic, void *static_ptr)
{
verifyable_object **object = (verifyable_object **)objectptr;
if (check_valid_pointer (object))
- return 0;
- if (!*object || *object == PTHREAD_MUTEX_INITIALIZER)
- return 0;
+ return INVALID_OBJECT;
+ if (!*object)
+ return INVALID_OBJECT;
+ if (static_ptr && *object == static_ptr)
+ return VALID_STATIC_OBJECT;
if (check_valid_pointer (*object))
- return 0;
+ return INVALID_OBJECT;
if ((*object)->magic != magic)
- return 0;
- return -1;
+ return INVALID_OBJECT;
+ return VALID_OBJECT;
+}
+
+verifyable_object_state
+verifyable_object_isvalid (void const * objectptr, long magic)
+{
+ return verifyable_object_isvalid (objectptr, magic, NULL);
}
/* Pthreads */
__pthread_create (pthread_t *thread, const pthread_attr_t *attr,
void *(*start_routine) (void *), void *arg)
{
- if (attr && !verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (attr && verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*thread = new pthread ();
(*thread)->create (start_routine, attr ? *attr : NULL, arg);
- if (!verifyable_object_isvalid (thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (thread, PTHREAD_MAGIC) != VALID_OBJECT)
{
delete (*thread);
*thread = NULL;
int
__pthread_cancel (pthread_t thread)
{
- if (!verifyable_object_isvalid (&thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (&thread, PTHREAD_MAGIC) != VALID_OBJECT)
return ESRCH;
if (thread->cancelstate == PTHREAD_CANCEL_ENABLE)
{
int
__pthread_attr_init (pthread_attr_t *attr)
{
+ if (check_valid_pointer (attr))
+ return EINVAL;
*attr = new pthread_attr;
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
{
delete (*attr);
*attr = NULL;
__pthread_attr_getinheritsched (const pthread_attr_t *attr,
int *inheritsched)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*inheritsched = (*attr)->inheritsched;
return 0;
__pthread_attr_getschedparam (const pthread_attr_t *attr,
struct sched_param *param)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*param = (*attr)->schedparam;
return 0;
int
__pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*policy = SCHED_FIFO;
return 0;
int
__pthread_attr_getscope (const pthread_attr_t *attr, int *contentionscope)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*contentionscope = (*attr)->contentionscope;
return 0;
int
__pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
if (detachstate < 0 || detachstate > 1)
return EINVAL;
int
__pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*detachstate = (*attr)->joinable;
return 0;
int
__pthread_attr_setinheritsched (pthread_attr_t *attr, int inheritsched)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
if (inheritsched != PTHREAD_INHERIT_SCHED
&& inheritsched != PTHREAD_EXPLICIT_SCHED)
__pthread_attr_setschedparam (pthread_attr_t *attr,
const struct sched_param *param)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
if (!valid_sched_parameters (param))
return ENOTSUP;
int
__pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
if (policy != SCHED_FIFO)
return ENOTSUP;
int
__pthread_attr_setscope (pthread_attr_t *attr, int contentionscope)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
if (contentionscope != PTHREAD_SCOPE_SYSTEM
&& contentionscope != PTHREAD_SCOPE_PROCESS)
int
__pthread_attr_setstacksize (pthread_attr_t *attr, size_t size)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
(*attr)->stacksize = size;
return 0;
int
__pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *size)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*size = (*attr)->stacksize;
return 0;
int
__pthread_attr_destroy (pthread_attr_t *attr)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
delete (*attr);
*attr = NULL;
__pthread_join (pthread_t *thread, void **return_val)
{
/*FIXME: wait on the thread cancellation event as well - we are a cancellation point*/
- if (!verifyable_object_isvalid (thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (thread, PTHREAD_MAGIC) != VALID_OBJECT)
return ESRCH;
if ((*thread)->attr.joinable == PTHREAD_CREATE_DETACHED)
int
__pthread_detach (pthread_t *thread)
{
- if (!verifyable_object_isvalid (thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (thread, PTHREAD_MAGIC) != VALID_OBJECT)
return ESRCH;
if ((*thread)->attr.joinable == PTHREAD_CREATE_DETACHED)
int
__pthread_suspend (pthread_t *thread)
{
- if (!verifyable_object_isvalid (thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (thread, PTHREAD_MAGIC) != VALID_OBJECT)
return ESRCH;
if ((*thread)->suspended == false)
int
__pthread_continue (pthread_t *thread)
{
- if (!verifyable_object_isvalid (thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (thread, PTHREAD_MAGIC) != VALID_OBJECT)
return ESRCH;
if ((*thread)->suspended == true)
__pthread_getschedparam (pthread_t thread, int *policy,
struct sched_param *param)
{
- if (!verifyable_object_isvalid (&thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (&thread, PTHREAD_MAGIC) != VALID_OBJECT)
return ESRCH;
*policy = SCHED_FIFO;
/*we don't return the current effective priority, we return the current requested
unsigned long
__pthread_getsequence_np (pthread_t *thread)
{
- if (!verifyable_object_isvalid (thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (thread, PTHREAD_MAGIC) != VALID_OBJECT)
return EINVAL;
return (*thread)->GetThreadId ();
}
/*The opengroup docs don't define if we should check this or not,
*but creation is relatively rare..
*/
- if (verifyable_object_isvalid (key, PTHREAD_KEY_MAGIC))
+ if (verifyable_object_isvalid (key, PTHREAD_KEY_MAGIC) == VALID_OBJECT)
return EBUSY;
*key = new pthread_key (destructor);
- if (!verifyable_object_isvalid (key, PTHREAD_KEY_MAGIC))
+ if (verifyable_object_isvalid (key, PTHREAD_KEY_MAGIC) != VALID_OBJECT)
{
delete (*key);
*key = NULL;
int
__pthread_key_delete (pthread_key_t key)
{
- if (!verifyable_object_isvalid (&key, PTHREAD_KEY_MAGIC))
+ if (verifyable_object_isvalid (&key, PTHREAD_KEY_MAGIC) != VALID_OBJECT)
return EINVAL;
delete (key);
__pthread_setschedparam (pthread_t thread, int policy,
const struct sched_param *param)
{
- if (!verifyable_object_isvalid (&thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (&thread, PTHREAD_MAGIC) != VALID_OBJECT)
return ESRCH;
if (policy != SCHED_FIFO)
return ENOTSUP;
int
__pthread_setspecific (pthread_key_t key, const void *value)
{
- if (!verifyable_object_isvalid (&key, PTHREAD_KEY_MAGIC))
+ if (verifyable_object_isvalid (&key, PTHREAD_KEY_MAGIC) != VALID_OBJECT)
return EINVAL;
(key)->set (value);
return 0;
void *
__pthread_getspecific (pthread_key_t key)
{
- if (!verifyable_object_isvalid (&key, PTHREAD_KEY_MAGIC))
+ if (verifyable_object_isvalid (&key, PTHREAD_KEY_MAGIC) != VALID_OBJECT)
return NULL;
return (key)->get ();
int
__pthread_cond_destroy (pthread_cond_t *cond)
{
- if (!verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC))
+ if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT)
return EINVAL;
/*reads are atomic */
int
__pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *attr)
{
- if (attr && !verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC))
+ if (attr && verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
- if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC))
+ if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != INVALID_OBJECT)
return EBUSY;
*cond = new pthread_cond (attr ? (*attr) : NULL);
- if (!verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC))
+ if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT)
{
delete (*cond);
*cond = NULL;
int
__pthread_cond_broadcast (pthread_cond_t *cond)
{
- if (!verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC))
+ if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT)
return EINVAL;
(*cond)->BroadCast ();
int
__pthread_cond_signal (pthread_cond_t *cond)
{
- if (!verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC))
+ if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT)
return EINVAL;
(*cond)->Signal ();
}
int
-__pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
- const struct timespec *abstime)
+__pthread_cond_dowait (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ long waitlength)
{
// and yes cond_access here is still open to a race. (we increment, context swap,
// broadcast occurs - we miss the broadcast. the functions aren't split properly.
int rv;
- if (!abstime)
- return EINVAL;
pthread_mutex **themutex = NULL;
if (*mutex == PTHREAD_MUTEX_INITIALIZER)
__pthread_mutex_init (mutex, NULL);
themutex = mutex;
- if (!verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
return EINVAL;
- if (!verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC))
+ if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT)
return EINVAL;
- struct timeb currSysTime;
- long waitlength;
- ftime(&currSysTime);
- waitlength = (abstime->tv_sec - currSysTime.time) *1000;
- if (waitlength < 0)
- return ETIMEDOUT;
/*if the cond variable is blocked, then the above timer test maybe wrong. *shrug**/
if (pthread_mutex_lock (&(*cond)->cond_access))
if (pthread_mutex_unlock (&(*cond)->cond_access))
system_printf ("Failed to unlock condition variable access mutex, this %0p\n", *cond);
rv = (*cond)->TimedWait (waitlength);
+ /* this may allow a race on the mutex acquisition and waits..
+ * But doing this within the cond access mutex creates a different race
+ */
+ bool last = false;
+ if (InterlockedDecrement (&((*cond)->waiting)) == 0)
+ last = true;
(*cond)->mutex->Lock ();
+ if (last)
+ (*cond)->mutex = NULL;
if (pthread_mutex_lock (&(*cond)->cond_access))
system_printf ("Failed to lock condition variable access mutex, this %0p\n", *cond);
- if (InterlockedDecrement (&((*cond)->waiting)) == 0)
- (*cond)->mutex = NULL;
InterlockedDecrement (&((*themutex)->condwaits));
if (pthread_mutex_unlock (&(*cond)->cond_access))
system_printf ("Failed to unlock condition variable access mutex, this %0p\n", *cond);
return rv;
}
-int
-__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
+extern "C" int
+pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
+ const struct timespec *abstime)
{
-// see cond_timedwait for notes
- int rv;
- pthread_mutex_t *themutex = mutex;
- if (*mutex == PTHREAD_MUTEX_INITIALIZER)
- __pthread_mutex_init (mutex, NULL);
- themutex = mutex;
- if (!verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC))
+ if (check_valid_pointer(abstime))
return EINVAL;
- if (!verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC))
- return EINVAL;
-
- if (pthread_mutex_lock (&(*cond)->cond_access))
- system_printf ("Failed to lock condition variable access mutex, this %0p\n", *cond);
-
- if ((*cond)->waiting)
- if ((*cond)->mutex && ((*cond)->mutex != (*themutex)))
- {
- if (pthread_mutex_unlock (&(*cond)->cond_access))
- system_printf ("Failed to unlock condition variable access mutex, this %0p\n", *cond);
- return EINVAL;
- }
- InterlockedIncrement (&((*cond)->waiting));
+ struct timeb currSysTime;
+ long waitlength;
+ ftime(&currSysTime);
+ waitlength = (abstime->tv_sec - currSysTime.time) *1000;
+ if (waitlength < 0)
+ return ETIMEDOUT;
+ return __pthread_cond_dowait (cond, mutex, waitlength);
+}
- (*cond)->mutex = (*themutex);
- InterlockedIncrement (&((*themutex)->condwaits));
- if (pthread_mutex_unlock (&(*cond)->cond_access))
- system_printf ("Failed to unlock condition variable access mutex, this %0p\n", *cond);
- rv = (*cond)->TimedWait (INFINITE);
- (*cond)->mutex->Lock ();
- if (pthread_mutex_lock (&(*cond)->cond_access))
- system_printf ("Failed to lock condition variable access mutex, this %0p\n", *cond);
- if (InterlockedDecrement (&((*cond)->waiting)) == 0)
- (*cond)->mutex = NULL;
- InterlockedDecrement (&((*themutex)->condwaits));
- if (pthread_mutex_unlock (&(*cond)->cond_access))
- system_printf ("Failed to unlock condition variable access mutex, this %0p\n", *cond);
- return rv;
+extern "C" int
+pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+ return __pthread_cond_dowait (cond, mutex, INFINITE);
}
int
__pthread_condattr_init (pthread_condattr_t *condattr)
{
*condattr = new pthread_condattr;
- if (!verifyable_object_isvalid (condattr, PTHREAD_CONDATTR_MAGIC))
+ if (verifyable_object_isvalid (condattr, PTHREAD_CONDATTR_MAGIC) != VALID_OBJECT)
{
delete (*condattr);
*condattr = NULL;
int
__pthread_condattr_getpshared (const pthread_condattr_t *attr, int *pshared)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*pshared = (*attr)->shared;
return 0;
int
__pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
if ((pshared < 0) || (pshared > 1))
return EINVAL;
int
__pthread_condattr_destroy (pthread_condattr_t *condattr)
{
- if (!verifyable_object_isvalid (condattr, PTHREAD_CONDATTR_MAGIC))
+ if (verifyable_object_isvalid (condattr, PTHREAD_CONDATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
delete (*condattr);
*condattr = NULL;
// lock myself, for the use of thread2signal
// two different kills might clash: FIXME
- if (!verifyable_object_isvalid (&thread, PTHREAD_MAGIC))
+ if (verifyable_object_isvalid (&thread, PTHREAD_MAGIC) != VALID_OBJECT)
return EINVAL;
if (thread->sigs)
__pthread_mutex_init (pthread_mutex_t *mutex,
const pthread_mutexattr_t *attr)
{
- if (attr && !verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (attr && verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT || check_valid_pointer (mutex))
return EINVAL;
- if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER) != INVALID_OBJECT)
return EBUSY;
*mutex = new pthread_mutex (attr ? (*attr) : NULL);
- if (!verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
{
delete (*mutex);
*mutex = NULL;
pthread_mutex_t *themutex=(pthread_mutex_t *) mutex;
if (*mutex == PTHREAD_MUTEX_INITIALIZER)
__pthread_mutex_init ((pthread_mutex_t *) mutex, NULL);
- if (!verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
return EINVAL;
/*We don't define _POSIX_THREAD_PRIO_PROTECT because we do't currently support
*mutex priorities.
__pthread_mutex_lock (pthread_mutex_t *mutex)
{
pthread_mutex_t *themutex = mutex;
- if (!verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC))
- return EINVAL;
- if (*mutex == PTHREAD_MUTEX_INITIALIZER)
+ switch (verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER))
{
- int rv = __pthread_mutex_init (mutex, NULL);
- if (rv)
- return rv;
+ case INVALID_OBJECT:
+ return EINVAL;
+ break;
+ case VALID_STATIC_OBJECT:
+ if (*mutex == PTHREAD_MUTEX_INITIALIZER)
+ {
+ int rv = __pthread_mutex_init (mutex, NULL);
+ if (rv)
+ return rv;
+ }
+ break;
+ case VALID_OBJECT:
+ break;
}
(*themutex)->Lock ();
return 0;
pthread_mutex_t *themutex = mutex;
if (*mutex == PTHREAD_MUTEX_INITIALIZER)
__pthread_mutex_init (mutex, NULL);
- if (!verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
return EINVAL;
if ((*themutex)->TryLock ())
return EBUSY;
{
if (*mutex == PTHREAD_MUTEX_INITIALIZER)
__pthread_mutex_init (mutex, NULL);
- if (!verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
return EINVAL;
(*mutex)->UnLock ();
return 0;
{
if (check_valid_pointer (mutex) && (*mutex == PTHREAD_MUTEX_INITIALIZER))
return 0;
- if (!verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
return EINVAL;
/*reading a word is atomic */
pthread_mutex_t *themutex = mutex;
if (*mutex == PTHREAD_MUTEX_INITIALIZER)
__pthread_mutex_init (mutex, NULL);
- if (!verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC))
+ if (verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
return EINVAL;
return ENOSYS;
}
__pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr,
int *protocol)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
return ENOSYS;
}
__pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr,
int *pshared)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*pshared = (*attr)->pshared;
return 0;
int
__pthread_mutexattr_gettype (const pthread_mutexattr_t *attr, int *type)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
*type = (*attr)->mutextype;
return 0;
int
__pthread_mutexattr_init (pthread_mutexattr_t *attr)
{
- if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != INVALID_OBJECT)
return EBUSY;
*attr = new pthread_mutexattr ();
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
{
delete (*attr);
*attr = NULL;
int
__pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
delete (*attr);
*attr = NULL;
int
__pthread_mutexattr_setprotocol (pthread_mutexattr_t *attr, int protocol)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
return ENOSYS;
}
__pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr,
int prioceiling)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
return ENOSYS;
}
__pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
int *prioceiling)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
return ENOSYS;
}
int
__pthread_mutexattr_setpshared (pthread_mutexattr_t *attr, int pshared)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
/*we don't use pshared for anything as yet. We need to test PROCESS_SHARED
*functionality
int
__pthread_mutexattr_settype (pthread_mutexattr_t *attr, int type)
{
- if (!verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC))
+ if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
return EINVAL;
if (type != PTHREAD_MUTEX_RECURSIVE)
return EINVAL;
__sem_init (sem_t *sem, int pshared, unsigned int value)
{
/*opengroup calls this undefined */
- if (verifyable_object_isvalid (sem, SEM_MAGIC))
+ if (verifyable_object_isvalid (sem, SEM_MAGIC) != INVALID_OBJECT)
return EBUSY;
if (value > SEM_VALUE_MAX)
*sem = new semaphore (pshared, value);
- if (!verifyable_object_isvalid (sem, SEM_MAGIC))
+ if (verifyable_object_isvalid (sem, SEM_MAGIC) != VALID_OBJECT)
{
delete (*sem);
*sem = NULL;
int
__sem_destroy (sem_t *sem)
{
- if (!verifyable_object_isvalid (sem, SEM_MAGIC))
+ if (verifyable_object_isvalid (sem, SEM_MAGIC) != VALID_OBJECT)
return EINVAL;
/*FIXME - new feature - test for busy against threads... */
int
__sem_wait (sem_t *sem)
{
- if (!verifyable_object_isvalid (sem, SEM_MAGIC))
+ if (verifyable_object_isvalid (sem, SEM_MAGIC) != VALID_OBJECT)
return EINVAL;
(*sem)->Wait ();
int
__sem_trywait (sem_t *sem)
{
- if (!verifyable_object_isvalid (sem, SEM_MAGIC))
+ if (verifyable_object_isvalid (sem, SEM_MAGIC) != VALID_OBJECT)
return EINVAL;
return (*sem)->TryWait ();
int
__sem_post (sem_t *sem)
{
- if (!verifyable_object_isvalid (sem, SEM_MAGIC))
+ if (verifyable_object_isvalid (sem, SEM_MAGIC) != VALID_OBJECT)
return EINVAL;
(*sem)->Post ();