New functions from POSIX 1003.1 2001. Untested.

3 files changed, 243 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d4edeb..b9b4422 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-23  Ross Johnson  <rpj@setup1.ise.canberra.edu.au>

 

+	* pthread_rwlock_timedrdlock.c: New - untested.

+	* pthread_rwlock_timedwrlock.c: New - untested.

+	

 	* Testsuite passed (except known MSVC++ problems)

 

 	* pthread_cond_destroy.c: Expand the time change

diff --git a/pthread_rwlock_timedrdlock.c b/pthread_rwlock_timedrdlock.c
new file mode 100644
index 0000000..fb56548
--- /dev/null
+++ b/pthread_rwlock_timedrdlock.c
@@ -0,0 +1,105 @@
+/*
+ * pthread_rwlock_timedrdlock.c
+ *
+ * Description:
+ * This translation unit implements read/write lock primitives.
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      Pthreads-win32 - POSIX Threads Library for Win32
+ *      Copyright(C) 1998 John E. Bossom
+ *      Copyright(C) 1999,2002 Pthreads-win32 contributors
+ * 
+ *      Contact Email: rpj@ise.canberra.edu.au
+ * 
+ *      The current list of contributors is contained
+ *      in the file CONTRIBUTORS included with the source
+ *      code distribution. The list can also be seen at the
+ *      following World Wide Web location:
+ *      http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * 
+ *      This library is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *      Lesser General Public License for more details.
+ * 
+ *      You should have received a copy of the GNU Lesser General Public
+ *      License along with this library in the file COPYING.LIB;
+ *      if not, write to the Free Software Foundation, Inc.,
+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <errno.h>
+#include <limits.h>
+
+#include "pthread.h"
+#include "implement.h"
+
+int
+pthread_rwlock_timedrdlock(pthread_rwlock_t *rwlock, const struct timespec * abstime)
+{
+    int result;
+    pthread_rwlock_t rwl;
+
+    if (rwlock == NULL || *rwlock == NULL)
+      {
+	return EINVAL;
+      }
+
+    /*
+     * We do a quick check to see if we need to do more work
+     * to initialise a static rwlock. We check
+     * again inside the guarded section of ptw32_rwlock_check_need_init()
+     * to avoid race conditions.
+     */
+    if (*rwlock == PTHREAD_RWLOCK_INITIALIZER)
+      {
+	result = ptw32_rwlock_check_need_init(rwlock);
+
+	if (result != 0 && result != EBUSY)
+	  {
+	    return result;
+	  }
+      }
+
+    rwl = *rwlock;
+
+    if (rwl->nMagic != PTW32_RWLOCK_MAGIC)
+      {
+	return EINVAL;
+      }
+
+    if ((result = pthread_mutex_timedlock(&(rwl->mtxExclusiveAccess), abstime)) != 0)
+      {
+	return result;
+      }
+
+    if (++rwl->nSharedAccessCount == INT_MAX)
+      {
+	if ((result = pthread_mutex_timedlock(&(rwl->mtxSharedAccessCompleted), abstime)) != 0)
+	  {
+            if (result == ETIMEDOUT)
+              {
+                ++rwl->nCompletedSharedAccessCount;
+              }
+	    (void) pthread_mutex_unlock(&(rwl->mtxExclusiveAccess));
+	    return result;
+	  }
+
+	rwl->nSharedAccessCount -= rwl->nCompletedSharedAccessCount;
+	rwl->nCompletedSharedAccessCount = 0;
+
+	if ((result = pthread_mutex_unlock(&(rwl->mtxSharedAccessCompleted))) != 0)
+	  {
+	    (void) pthread_mutex_unlock(&(rwl->mtxExclusiveAccess));
+	    return result;
+	  }
+      }
+
+    return (pthread_mutex_unlock(&(rwl->mtxExclusiveAccess)));
+}
diff --git a/pthread_rwlock_timedwrlock.c b/pthread_rwlock_timedwrlock.c
new file mode 100644
index 0000000..56ac2e9
--- /dev/null
+++ b/pthread_rwlock_timedwrlock.c
@@ -0,0 +1,135 @@
+/*
+ * pthread_rwlock_timedwrlock.c
+ *
+ * Description:
+ * This translation unit implements read/write lock primitives.
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      Pthreads-win32 - POSIX Threads Library for Win32
+ *      Copyright(C) 1998 John E. Bossom
+ *      Copyright(C) 1999,2002 Pthreads-win32 contributors
+ * 
+ *      Contact Email: rpj@ise.canberra.edu.au
+ * 
+ *      The current list of contributors is contained
+ *      in the file CONTRIBUTORS included with the source
+ *      code distribution. The list can also be seen at the
+ *      following World Wide Web location:
+ *      http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * 
+ *      This library is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *      Lesser General Public License for more details.
+ * 
+ *      You should have received a copy of the GNU Lesser General Public
+ *      License along with this library in the file COPYING.LIB;
+ *      if not, write to the Free Software Foundation, Inc.,
+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <errno.h>
+#include <limits.h>
+
+#include "pthread.h"
+#include "implement.h"
+
+int
+pthread_rwlock_timedwrlock(pthread_rwlock_t * rwlock, const struct timespec * abstime)
+{
+    int result;
+    pthread_rwlock_t rwl;
+
+    if (rwlock == NULL || *rwlock == NULL)
+      {
+	return EINVAL;
+      }
+
+    /*
+     * We do a quick check to see if we need to do more work
+     * to initialise a static rwlock. We check
+     * again inside the guarded section of ptw32_rwlock_check_need_init()
+     * to avoid race conditions.
+     */
+    if (*rwlock == PTHREAD_RWLOCK_INITIALIZER)
+      {
+	result = ptw32_rwlock_check_need_init(rwlock);
+
+	if (result != 0 && result != EBUSY)
+	  {
+	    return result;
+	  }
+      }
+
+    rwl = *rwlock;
+
+    if (rwl->nMagic != PTW32_RWLOCK_MAGIC)
+      {
+	return EINVAL;
+      }
+
+    if ((result = pthread_mutex_timedlock(&(rwl->mtxExclusiveAccess), abstime)) != 0)
+      {
+	return result;
+      }
+
+    if ((result = pthread_mutex_timedlock(&(rwl->mtxSharedAccessCompleted), abstime)) != 0)
+      {
+	(void) pthread_mutex_unlock(&(rwl->mtxExclusiveAccess));
+	return result;
+      }
+
+    if (rwl->nExclusiveAccessCount == 0) 
+      {
+	if (rwl->nCompletedSharedAccessCount > 0) 
+	  {
+	    rwl->nSharedAccessCount -= rwl->nCompletedSharedAccessCount;
+	    rwl->nCompletedSharedAccessCount = 0;
+	  }
+
+	if (rwl->nSharedAccessCount > 0) 
+	  {
+	    rwl->nCompletedSharedAccessCount = -rwl->nSharedAccessCount;
+
+	    /*
+	     * This routine may be a cancelation point
+	     * according to POSIX 1003.1j section 18.1.2.
+	     */
+#ifdef _MSC_VER
+#pragma inline_depth(0)
+#endif
+	    pthread_cleanup_push(ptw32_rwlock_cancelwrwait, (void*)rwl);
+
+	    do
+	      {
+                result = pthread_cond_timedwait(&(rwl->cndSharedAccessCompleted),
+                                                &(rwl->mtxSharedAccessCompleted),
+                                                abstime);
+	      }
+	    while (result == 0 && rwl->nCompletedSharedAccessCount < 0);
+
+	    pthread_cleanup_pop ((result != 0) ? 1 : 0);
+#ifdef _MSC_VER
+#pragma inline_depth()
+#endif
+
+	    if (result == 0)
+	      {
+		rwl->nSharedAccessCount = 0;
+	      }
+	  }
+      }
+
+    if (result == 0)
+      {
+	rwl->nExclusiveAccessCount++;
+      }
+
+    return result;
+}