Changeset 369 for trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc

Timestamp:

May 24, 2012, 12:16:46 AM (13 years ago)

Author:

dmik

Message:

icedtea-web: Replace pthread_cancel() with old good flag variable.

This is because the whole pthreads cancellation machinery (cancellation
points, cleanup routines, etc.) is not implemented on OS/2.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc (modified) (3 diffs)

trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc

@@ -694 +694 @@
 queue_processor(void* data)
 {
-
+#ifdef __OS2__
+    QueueProcessorData *queue_processor_data = (QueueProcessorData *) data;
+    PluginRequestProcessor* processor = queue_processor_data->processor;
+#else
     PluginRequestProcessor* processor = (PluginRequestProcessor*) data;
+#endif
     std::vector<std::string*>* message_parts = NULL;
     std::string command;
@@ -704 +708 @@
     pthread_mutex_init(&wait_mutex, NULL);
 
+#ifdef __OS2__
+    queue_processor_data->stopRequested = false;
+#else
     pthread_cleanup_push(queue_cleanup, (void*) &wait_mutex);
+#endif
 
     while (true)
@@ -786 +794 @@
         message_parts = NULL;
 
+#ifdef __OS2__
+        if (queue_processor_data->stopRequested)
+            break;
+#else
         pthread_testcancel();
-    }
-
+#endif
+    }
+
+#ifdef __OS2__
+    queue_cleanup((void*) &wait_mutex);
+#else
     pthread_cleanup_pop(1);
+#endif
 }