Changeset 429 for trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginRequestProcessor.h

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaPluginRequestProcessor.h (modified) (5 diffs)

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

@@ -47 +47 @@
 
 #include <npapi.h>
-
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-#include <npupp.h>
-#else
-#include <npapi.h>
 #include <npruntime.h>
-#endif
 
 #include "IcedTeaPluginUtils.h"
@@ -76 +70 @@
 void* queue_processor(void* data);
 
-/* Mutex to ensure that the request queue is accessed synchronously */
-extern pthread_mutex_t message_queue_mutex;
-
-/* Mutex to ensure synchronized writes */
-extern pthread_mutex_t syn_write_mutex;
-
-/* Queue for holding messages that get processed in a separate thread */
-extern std::vector< std::vector<std::string*>* >* message_queue;
-
 /**
  * Processes requests made TO the plugin (by java or anyone else)
@@ -92 +77 @@
     private:
 
-        /* Requests that are still pending */
-        std::map<pthread_t, uintmax_t>* pendingRequests;
+        /* Mutex to ensure that the request queue is accessed synchronously */
+        pthread_mutex_t message_queue_mutex;
+
+        /* Condition on which the queue processor waits */
+        pthread_cond_t cond_message_available;
+
+        /* Queue for holding messages that get processed in a separate thread */
+        std::vector< std::vector<std::string*>* >* message_queue;
+
+        /* Mutex to ensure synchronized writes */
+        pthread_mutex_t syn_write_mutex;
 
         /* Dispatch request processing to a new thread for asynch. processing */
@@ -103 +97 @@
         /* Stores the variant on java side */
         void storeVariantInJava(NPVariant variant, std::string* result);
-
-    public:
-        PluginRequestProcessor(); /* Constructor */
-        ~PluginRequestProcessor(); /* Destructor */
-
-        /* Process new requests (if applicable) */
-        virtual bool newMessageOnBus(const char* message);
 
         /* Send member ID to Java */
@@ -131 +118 @@
         /* Loads a URL into the specified target */
         void loadURL(std::vector<std::string*>* message_parts);
+
+    public:
+        PluginRequestProcessor(); /* Constructor */
+        ~PluginRequestProcessor(); /* Destructor */
+
+        /* Process new requests (if applicable) */
+        virtual bool newMessageOnBus(const char* message);
+
+        /* Thread run method for processing queued messages */
+        void queueProcessorThread();
 };