Changeset 21 in libcf for trunk/src

Timestamp:

02/01/13 17:46:09 (11 years ago)

Author:

cheese

Message:

#1 add test code for multi-threading, socket and multi-threaded logging

Location:

trunk/src

Files:

• cf_socket.c (modified) (3 diffs)
• cf_thread.c (modified) (4 diffs)

trunk/src/cf_socket.c

@@ -6 +6 @@
 
 #ifdef _WIN32
-# include <WinSock2.h>
 # pragma comment (lib, "ws2_32.lib")
 # define close(__sock)  closesocket(__sock)
 # define sa_family_t    unsigned short
 #else
-# include <netinet/in.h>
-# include <sys/socket.h>
-# include <arpa/inet.h>
-# include <netdb.h>
-# include <unistd.h>
 #endif
 
@@ -216 +210 @@
     }
 
-    return CF_OK;
+    return sock;
 }
 
@@ -262 +256 @@
 
 int
-CF_Socket_Accept (const int sock,
-                  void      * address)
+CF_Socket_Accept (const int             sock,
+                  struct sockaddr_in    * address)
 {
     int                 sockClient;

trunk/src/cf_thread.c

@@ -27 +27 @@
 
 int
-CF_CLOSE_CTX (void * ctx)
+CF_Thread_Local_Close (void * ctx)
 {
 #ifdef _WIN32
@@ -67 +67 @@
     CHECK_INVALID_THREAD (*threadID);
 
-    CF_CLOSE_CTX (*threadID);
+    CF_Thread_Local_Close (*threadID);
 
     return CF_OK;
@@ -80 +80 @@
     WaitForSingleObject ((THREAD_TYPE) *threadID, INFINITE);
 #else
-    int status;
-    pthread_join (*((THREAD_TYPE *) *threadID), (void *)&status);
+    int status = 0;
+    pthread_join (*((THREAD_TYPE *) *threadID), &status);
 #endif
 
@@ -114 +114 @@
     CHECK_INVALID_MUTEX (*mutex);
 
-    CF_CLOSE_CTX (*mutex);
+    CF_Thread_Local_Close (*mutex);
 
     return CF_OK;