Changeset 107 for pjproject/trunk/pjlib/src/pj/os_core_win32.c

Timestamp:

Jan 5, 2006 11:35:46 PM (18 years ago)

Author:

bennylp

Message:

Added loop transport to test transaction

File:

• pjproject/trunk/pjlib/src/pj/os_core_win32.c (modified) (8 diffs)

pjproject/trunk/pjlib/src/pj/os_core_win32.c

@@ -863 +863 @@
 struct pj_rwmutex_t
 {
-    pj_mutex_t *read_lock, *write_lock;
-    int reader_count;
+    pj_mutex_t *read_lock;
+    /* write_lock must use semaphore, because write_lock may be released
+     * by thread other than the thread that acquire the write_lock in the
+     * first place.
+     */
+    pj_sem_t   *write_lock;
+    pj_int32_t  reader_count;
 };
 
@@ -886 +891 @@
         return status;
 
-    status = pj_mutex_create_recursive(pool, name, &rwmutex->write_lock);
+    status = pj_sem_create(pool, name, 1, 1, &rwmutex->write_lock);
     if (status != PJ_SUCCESS) {
         pj_mutex_destroy(rwmutex->read_lock);
@@ -908 +913 @@
 
     status = pj_mutex_lock(mutex->read_lock);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        pj_assert(!"This pretty much is unexpected");
         return status;
+    }
 
     mutex->reader_count++;
+
+    pj_assert(mutex->reader_count < 0x7FFFFFF0L);
+
     if (mutex->reader_count == 1)
-        pj_mutex_lock(mutex->write_lock);
+        pj_sem_wait(mutex->write_lock);
 
     status = pj_mutex_unlock(mutex->read_lock);
@@ -926 +936 @@
 {
     PJ_ASSERT_RETURN(mutex, PJ_EINVAL);
-    return pj_mutex_lock(mutex->write_lock);
+    return pj_sem_wait(mutex->write_lock);
 }
 
@@ -940 +950 @@
 
     status = pj_mutex_lock(mutex->read_lock);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        pj_assert(!"This pretty much is unexpected");
         return status;
+    }
 
     pj_assert(mutex->reader_count >= 1);
@@ -947 +959 @@
     --mutex->reader_count;
     if (mutex->reader_count == 0)
-        pj_mutex_unlock(mutex->write_lock);
+        pj_sem_post(mutex->write_lock);
 
     status = pj_mutex_unlock(mutex->read_lock);
@@ -960 +972 @@
 {
     PJ_ASSERT_RETURN(mutex, PJ_EINVAL);
-    return pj_mutex_unlock(mutex->write_lock);
+    pj_assert(mutex->reader_count <= 1);
+    return pj_sem_post(mutex->write_lock);
 }
 
@@ -972 +985 @@
     PJ_ASSERT_RETURN(mutex, PJ_EINVAL);
     pj_mutex_destroy(mutex->read_lock);
-    pj_mutex_destroy(mutex->write_lock);
+    pj_sem_destroy(mutex->write_lock);
     return PJ_SUCCESS;
 }