Removed genereating of FCGI.xs

[catagits/fcgi2.git] / examples / threaded.c

diff --git a/examples/threaded.c b/examples/threaded.c
index 945a219..3e860ec 100755 (executable)
--- a/examples/threaded.c
+++ b/examples/threaded.c
@@ -3,21 +3,18 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: threaded.c,v 1.3 1999/07/30 19:09:46 roberts Exp $";
+static const char rcsid[] = "$Id: threaded.c,v 1.9 2001/11/20 03:23:21 robs Exp $";
 #endif /* not lint */
 
 #include "fcgi_config.h"
 
 #include <pthread.h>
+#include <sys/types.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-#ifdef _WIN32
-#include <process.h>
-#endif
-
 #include "fcgiapp.h"
 
 
@@ -28,40 +25,42 @@ static int counts[THREAD_COUNT];
 static void *doit(void *a)
 {
     int rc, i, thread_id = (int)a;
+    pid_t pid = getpid();
     FCGX_Request request;
-    FCGX_Stream *in, *out, *err;
-    FCGX_ParamArray envp;
     char *server_name;
 
-    FCGX_InitRequest(&request);
+    FCGX_InitRequest(&request, 0, 0);
 
     for (;;)
     {
         static pthread_mutex_t accept_mutex = PTHREAD_MUTEX_INITIALIZER;
         static pthread_mutex_t counts_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+        /* Some platforms require accept() serialization, some don't.. */
         pthread_mutex_lock(&accept_mutex);
-        rc = FCGX_Accept_r(&in, &out, &err, &envp, &request);
+        rc = FCGX_Accept_r(&request);
         pthread_mutex_unlock(&accept_mutex);
 
         if (rc < 0)
             break;
 
-        server_name = FCGX_GetParam("SERVER_NAME", envp);
+        server_name = FCGX_GetParam("SERVER_NAME", request.envp);
 
-        FCGX_FPrintF(out,
+        FCGX_FPrintF(request.out,
             "Content-type: text/html\r\n"
             "\r\n"
             "<title>FastCGI Hello! (multi-threaded C, fcgiapp library)</title>"
             "<h1>FastCGI Hello! (multi-threaded C, fcgiapp library)</h1>"
-            "Thread %d<p>"
+            "Thread %d, Process %ld<p>"
             "Request counts for %d threads running on host <i>%s</i><p><code>",
-            thread_id, THREAD_COUNT, server_name ? server_name : "?");
+            thread_id, pid, THREAD_COUNT, server_name ? server_name : "?");
+
+        sleep(2);
 
         pthread_mutex_lock(&counts_mutex);
         ++counts[thread_id];
         for (i = 0; i < THREAD_COUNT; i++)
-            FCGX_FPrintF(out, "%5d " , counts[i]);
+            FCGX_FPrintF(request.out, "%5d " , counts[i]);
         pthread_mutex_unlock(&counts_mutex);
 
         FCGX_Finish_r(&request);
@@ -82,6 +81,6 @@ int main(void)
 
     doit(0);
 
-    exit(0);
+    return 0;
 }