Changeset 164 in libcf

Timestamp:

09/08/14 00:52:00 (10 years ago)

Author:

cheese

Message:

#1 change WaitSingleObject to CriticalSection for windows

Location:

trunk

Files:

• src/cf_mutex.c (modified) (6 diffs)
• src/cf_util.c (modified) (1 diff)
• windows/libcf/libcf.vcproj (modified) (2 diffs)

trunk/src/cf_mutex.c

@@ -10 +10 @@
 #include "cf_error.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 
@@ -15 +16 @@
 # include <windows.h>
 # include <process.h>
-# define MUTEX_TYPE     HANDLE
+# define MUTEX_TYPE     CRITICAL_SECTION
 #else // #if defined(_WIN32) || defined(_WIN64)
 # include <pthread.h>
@@ -53 +54 @@
     {
 #if defined(_WIN32) || defined(_WIN64)
-        context->mid = CreateMutexA (NULL, FALSE, NULL);
-        if (context->mid == NULL)
-        {
-            result = CF_ERROR_MUTEX_CREATE;
-            TRY_BREAK;
-        }
+        InitializeCriticalSection (&context->mid);
 #else
         result = pthread_mutex_init (&context->mid, NULL);
@@ -93 +89 @@
 
 #if defined(_WIN32) || defined(_WIN64)
-    if (context->mid == NULL)
-        return CF_ERROR_MUTEX_INVALID_ARGS;
-
-    CloseHandle (context->mid);
+    DeleteCriticalSection (&context->mid);
 #else
     pthread_mutex_destroy (&context->mid);
@@ -117 +110 @@
 {
     CF_MUTEX_CONTEXT * context = (CF_MUTEX_CONTEXT *) ctx;
+    BOOL st;
 
     ASSERT_CTX (ctx);
 
 #if defined(_WIN32) || defined(_WIN64)
-    WaitForSingleObject (context->mid, INFINITE);
+    st = TryEnterCriticalSection (&context->mid);
+    fprintf (stderr, "%d ", st);
 #else
     pthread_mutex_lock (&context->mid);
@@ -144 +139 @@
 
 #if defined(_WIN32) || defined(_WIN64)
-    ReleaseMutex (context->mid);
+    LeaveCriticalSection (&context->mid);
 #else
     pthread_mutex_unlock (&context->mid);

trunk/src/cf_util.c

@@ -8 +8 @@
 #include "cf_util.h"
 #include "cf_error.h"
+#include "cf_local.h"
 
 #include <stdio.h>

trunk/windows/libcf/libcf.vcproj

@@ -223 +223 @@
                 >
             </File>
+            <File
+                RelativePath="..\..\src\cf_util.c"
+                >
+            </File>
         </Filter>
         <Filter
@@ -285 +289 @@
                 >
             </File>
+            <File
+                RelativePath="..\..\include\cf_util.h"
+                >
+            </File>
         </Filter>
         <Filter