Changeset 57 in libcf for trunk/test/test.c

Timestamp:

04/07/13 03:27:55 (11 years ago)

Author:

cheese

Message:

#1 fix thread interface

File:

• trunk/test/test.c (modified) (11 diffs)

trunk/test/test.c

@@ -29 +29 @@
 const char * file = "./log.txt";
 
-CF_THREAD_RETURN CF_THREAD_CALL test_log_mt (void * arg)
+int test_log_mt (void * arg)
 {
     static int cnt = 0;
@@ -52 +52 @@
     CF_DEBUG_PRINT (stderr, "end %dth thread\n", th);
 
-    return (CF_THREAD_RETURN)0;
+    return 0;
 }
 
@@ -171 +171 @@
 }
 
-CF_THREAD_RETURN CF_THREAD_CALL socket_echo_server (void * arg)
+int socket_echo_server (void * arg)
 {
     int srvsock = *((int *)arg);
@@ -184 +184 @@
     {
         CF_DEBUG_PRINT (stderr, "failed to accept on server\n");
-        return (CF_THREAD_RETURN)-1;
+        return -1;
     }
     CF_Log_Write (LOG_SOCKET, "SERVER", "accepted\n");
@@ -193 +193 @@
         {
             CF_DEBUG_PRINT (stderr, "failed to recv on server\n");
-            return (CF_THREAD_RETURN)-2;
+            return -2;
         }
         CF_Log_Write (LOG_SOCKET, "SERVER", "recv {%s}\n", buf);
@@ -199 +199 @@
         if (CF_Socket_Send (clntsock, buf, recvd) < 0)
         {
-            return (CF_THREAD_RETURN)-3;
+            return -3;
         }
         CF_Log_Write (LOG_SOCKET, "SERVER", "resp {%s}\n", buf);
@@ -206 +206 @@
     CF_Socket_Close (clntsock);
 
-    return (CF_THREAD_RETURN)0;
-    /*------------------------------------------------------------*/
-}
-
-CF_THREAD_RETURN CF_THREAD_CALL socket_echo_client (void * arg)
+    return 0;
+    /*------------------------------------------------------------*/
+}
+
+int socket_echo_client (void * arg)
 {
     int sock = 0;
@@ -224 +224 @@
     {
         CF_DEBUG_PRINT (stderr, "failed to connect on client\n");
-        return (CF_THREAD_RETURN)-1;
+        return -1;
     }
     CF_Log_Write (LOG_SOCKET, "CLIENT", "connected\n");
@@ -233 +233 @@
         {
             CF_DEBUG_PRINT (stderr, "failed to send on client %d\n", errno);
-            return (CF_THREAD_RETURN)-2;
+            return -2;
         }
         CF_Log_Write (LOG_SOCKET, "CLIENT", "sent {%s}\n", buf);
@@ -242 +242 @@
         {
             CF_DEBUG_PRINT (stderr, "failed to recv on client\n");
-            return (CF_THREAD_RETURN)-3;
+            return -3;
         }
         CF_Log_Write (LOG_SOCKET, "CLIENT", "recv {%s}\n", buf);
@@ -249 +249 @@
     CF_Socket_Close (sock);
 
-    return (CF_THREAD_RETURN)0;
+    return 0;
     /*------------------------------------------------------------*/
 }