Changeset 1473:8784c4181a22

Timestamp:

08/27/10 05:24:32 (18 months ago)

Author:

niam

Branch:

default

Message:

[fcgi] use pc::execution module rather than using pthreads/anything directly

Location:

sources

Files:

• include/libdodo/cgiFastServer.h (modified) (1 diff)
• src/cgiFastServer.cc (modified) (4 diffs)

sources/include/libdodo/cgiFastServer.h

@@ -95 +95 @@
                  * @param data defines the data passed to the thread
                  */
-                static void *thread(void *data);
+                static int thread(void *data);
 
                 static pc::sync::thread accept;                 ///< accept lock

sources/src/cgiFastServer.cc

@@ -33 +33 @@
 #include <fcgiapp.h>
 
-#ifdef PTHREAD_EXT
-#include <pthread.h>
-#endif
-
 #include "cgiFastRequest.inline"
 
 #include <libdodo/cgiFastServer.h>
 #include <libdodo/types.h>
+#include <libdodo/pcExecutionThread.h>
+#include <libdodo/pcExecutionManager.h>
 #include <libdodo/cgiFastServerEx.h>
 #include <libdodo/cgiFastExchange.h>
@@ -92 +90 @@
 //-------------------------------------------------------------------
 
-void *
+int
 server::thread(void *data)
 {
@@ -129 +127 @@
     }
 
-    return NULL;
+    return 0;
 }
 
@@ -142 +140 @@
     handler = func;
 
-#ifdef PTHREAD_EXT
     if (threading) {
-        pthread_t *id = new pthread_t[threadsNum];
+        pc::execution::manager m;
 
-        unsigned int i = 0;
+        for (unsigned int i = 0; i < threadsNum; ++i)
+            m.run(m.add(pc::execution::thread(server::thread, &limit, pc::execution::ON_DESTRUCTION_STOP, false)));
 
-        for (; i < threadsNum; ++i)
-            pthread_create(&id[i], NULL, server::thread, &limit);
-
-        for (i = 0; i < threadsNum; ++i)
-            pthread_join(id[i], NULL);
-
-        delete [] id;
-    } else
-#endif
-    {
+        m.wait();
+    } else {
         unsigned long requests = 0;