Changeset 369

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.

Location:

trunk/icedtea-web/plugin/icedteanp

Files:

• IcedTeaNPPlugin.cc (modified) (2 diffs)
• IcedTeaNPPlugin.h (modified) (1 diff)
• IcedTeaPluginRequestProcessor.cc (modified) (3 diffs)

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

@@ -2341 +2341 @@
   plugin_to_java_bus->subscribe(java_req_proc);
 
+#ifdef __OS2__
+  queue_processor_data1.processor = plugin_req_proc;
+  queue_processor_data2.processor = plugin_req_proc;
+  queue_processor_data3.processor = plugin_req_proc;
+  pthread_create (&plugin_request_processor_thread1, NULL, &queue_processor, (void*) &queue_processor_data1);
+  pthread_create (&plugin_request_processor_thread2, NULL, &queue_processor, (void*) &queue_processor_data2);
+  pthread_create (&plugin_request_processor_thread3, NULL, &queue_processor, (void*) &queue_processor_data3);
+#else
   pthread_create (&plugin_request_processor_thread1, NULL, &queue_processor, (void*) plugin_req_proc);
   pthread_create (&plugin_request_processor_thread2, NULL, &queue_processor, (void*) plugin_req_proc);
   pthread_create (&plugin_request_processor_thread3, NULL, &queue_processor, (void*) plugin_req_proc);
+#endif
 
   itnp_plugin_thread_id = pthread_self();
@@ -2531 +2540 @@
   initialized = false;
 
+#ifdef __OS2__
+  // pthread_cancel() isn't implemented on OS?2, so use an old good flag
+  queue_processor_data1.stopRequested = true;
+  queue_processor_data2.stopRequested = true;
+  queue_processor_data3.stopRequested = true;
+  pthread_cond_broadcast(&cond_message_available);
+#else
   pthread_cancel(plugin_request_processor_thread1);
   pthread_cancel(plugin_request_processor_thread2);
   pthread_cancel(plugin_request_processor_thread3);
+#endif
 
   pthread_join(plugin_request_processor_thread1, NULL);

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.h

@@ -94 +94 @@
 static pthread_t plugin_request_processor_thread3;
 
+#ifdef __OS2__
+struct QueueProcessorData
+{
+    PluginRequestProcessor *processor;
+    bool stopRequested;
+};
+
+static QueueProcessorData queue_processor_data1 = { NULL, false };
+static QueueProcessorData queue_processor_data2 = { NULL, false };
+static QueueProcessorData queue_processor_data3 = { NULL, false };
+#endif
+
 // Condition on which the queue processor waits
 extern pthread_cond_t cond_message_available;

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
 }