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

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.cc (modified) (24 diffs)

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

@@ -48 +48 @@
  */
 
-// Initialize static members used by the queue processing framework
-pthread_mutex_t message_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
-pthread_mutex_t syn_write_mutex = PTHREAD_MUTEX_INITIALIZER;
-std::vector< std::vector<std::string*>* >* message_queue = new std::vector< std::vector<std::string*>* >();
-
 /**
  * PluginRequestProcessor constructor.
@@ -61 +56 @@
 PluginRequestProcessor::PluginRequestProcessor()
 {
-    this->pendingRequests = new std::map<pthread_t, uintmax_t>();
+    this->message_queue = new std::vector< std::vector<std::string*>* >();
 
     internal_req_ref_counter = 0;
 
-    pthread_mutex_init(&message_queue_mutex, NULL);
-    pthread_mutex_init(&syn_write_mutex, NULL);
-
-    pthread_cond_init(&cond_message_available, NULL);
+    pthread_mutex_init(&this->message_queue_mutex, NULL);
+    pthread_mutex_init(&this->syn_write_mutex, NULL);
+    pthread_cond_init(&this->cond_message_available, NULL);
 }
 
@@ -81 +75 @@
     PLUGIN_DEBUG("PluginRequestProcessor::~PluginRequestProcessor\n");
 
-    if (pendingRequests)
-        delete pendingRequests;
+    if (message_queue)
+        delete message_queue;
 
     pthread_mutex_destroy(&message_queue_mutex);
     pthread_mutex_destroy(&syn_write_mutex);
-
     pthread_cond_destroy(&cond_message_available);
 }
@@ -143 +136 @@
             pthread_mutex_lock(&message_queue_mutex);
             message_queue->push_back(message_parts);
+            pthread_cond_signal(&cond_message_available);
             pthread_mutex_unlock(&message_queue_mutex);
 
-            // Broadcast that a message is now available
-            pthread_cond_broadcast(&cond_message_available);
 
             return true;
@@ -414 +406 @@
     propertyNameID = *(message_parts->at(6));
 
-    if (*(message_parts->at(7)) == "literalreturn")
+    if (*(message_parts->at(7)) == "literalreturn" || *(message_parts->at(7)) == "jsobject" )
     {
         value.append(*(message_parts->at(7)));
@@ -441 +433 @@
         if (java_result->error_occurred)
         {
-            printf("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
+            PLUGIN_ERROR("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
@@ -472 +464 @@
  * This is a static function, called in another thread. Since certain data
  * can only be requested from the main thread in Mozilla, this function
- * does whatever it can seperately, and then makes an internal request that
+ * does whatever it can separately, and then makes an internal request that
  * causes _getMember to do the rest of the work.
  *
@@ -522 +514 @@
         if (java_result->error_occurred)
         {
-            printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
+            PLUGIN_ERROR("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
             //goto cleanup;
         }
@@ -636 +628 @@
 queue_cleanup(void* data)
 {
-
-    pthread_mutex_destroy((pthread_mutex_t*) data);
-
     PLUGIN_DEBUG("Queue processing stopped.\n");
+}
+
+static void
+queue_wait_cleanup(void* data)
+{
+    pthread_mutex_unlock((pthread_mutex_t*) data);
 }
 
@@ -651 +646 @@
     PluginRequestProcessor* processor = (PluginRequestProcessor*) data;
 #endif
+    processor->queueProcessorThread();
+    return NULL;
+}
+
+void
+PluginRequestProcessor::queueProcessorThread()
+{
     std::vector<std::string*>* message_parts = NULL;
     std::string command;
-    pthread_mutex_t wait_mutex = PTHREAD_MUTEX_INITIALIZER;
 
     PLUGIN_DEBUG("Queue processor initialized. Queue = %p\n", message_queue);
-
-    pthread_mutex_init(&wait_mutex, NULL);
 
 #ifdef __OS2__
     queue_processor_data->stopRequested = false;
 #else
-    pthread_cleanup_push(queue_cleanup, (void*) &wait_mutex);
+    pthread_cleanup_push(queue_cleanup, NULL);
 #endif
 
@@ -681 +680 @@
             if (command == "GetMember")
             {
-                processor->sendMember(message_parts);
+                sendMember(message_parts);
             } else if (command == "ToString")
             {
-                processor->sendString(message_parts);
+                sendString(message_parts);
             } else if (command == "SetMember")
             {
                 // write methods are synchronized
                 pthread_mutex_lock(&syn_write_mutex);
-                processor->setMember(message_parts);
+                setMember(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
             } else if (command == "Call")
@@ -695 +694 @@
                 // write methods are synchronized
                 pthread_mutex_lock(&syn_write_mutex);
-                processor->call(message_parts);
+                call(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
             } else if (command == "Eval")
@@ -701 +700 @@
                 // write methods are synchronized
                 pthread_mutex_lock(&syn_write_mutex);
-                processor->eval(message_parts);
+                eval(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
             } else if (command == "GetSlot")
@@ -707 +706 @@
                 // write methods are synchronized
                 pthread_mutex_lock(&syn_write_mutex);
-                processor->sendMember(message_parts);
+                sendMember(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
             } else if (command == "SetSlot")
@@ -713 +712 @@
                 // write methods are synchronized
                 pthread_mutex_lock(&syn_write_mutex);
-                processor->setMember(message_parts);
+                setMember(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
             } else if (command == "LoadURL") // For instance X url <url> <target>
@@ -719 +718 @@
                 // write methods are synchronized
                 pthread_mutex_lock(&syn_write_mutex);
-                processor->loadURL(message_parts);
+                loadURL(message_parts);
                 pthread_mutex_unlock(&syn_write_mutex);
             } else
@@ -732 +731 @@
         } else
         {
-            pthread_mutex_lock(&wait_mutex);
-            pthread_cond_wait(&cond_message_available, &wait_mutex);
-            pthread_mutex_unlock(&wait_mutex);
+            pthread_mutex_lock(&message_queue_mutex);
+            if (message_queue->size() == 0)
+            {
+#ifndef __OS2__            
+                pthread_cleanup_push(queue_wait_cleanup, &message_queue_mutex);
+#endif
+                pthread_cond_wait(&cond_message_available, &message_queue_mutex);
+#ifndef __OS2__
+                pthread_cleanup_pop(0);
+#endif
+            }
+            pthread_mutex_unlock(&message_queue_mutex);
         }
 
@@ -748 +756 @@
 
 #ifdef __OS2__
-    queue_cleanup((void*) &wait_mutex);
+    queue_cleanup(NULL);
+    queue_wait_cleanup(&message_queue_mutex);
 #else
     pthread_cleanup_pop(1);
@@ -781 +790 @@
         property_identifier = browser_functions.getstringidentifier(property_id->c_str());
 
-    PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", browser_functions.utf8fromidentifier(property_identifier), instance, member, value->c_str());
+    PLUGIN_DEBUG("Setting %s on instance %p, object %p to value %s\n", IcedTeaPluginUtilities::NPIdentifierAsString(property_identifier).c_str(), instance, member, value->c_str());
 
     IcedTeaPluginUtilities::javaResultToNPVariant(instance, value, &value_variant);
@@ -801 +810 @@
 
     instance = (NPP) parameters.at(0);
+
     parent_ptr = (NPObject*) parameters.at(1);
     std::string*  member_id = (std::string*) parameters.at(2);
@@ -813 +823 @@
 
     // Get the NPVariant corresponding to this member
-    PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, browser_functions.utf8fromidentifier(member_identifier));
+    PLUGIN_DEBUG("Looking for %p %p %p (%s)\n", instance, parent_ptr, member_identifier, IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
 
     if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier))
     {
-        printf("%s not found!\n", browser_functions.utf8fromidentifier(member_identifier));
+        PLUGIN_ERROR("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
     }
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr);
@@ -827 +837 @@
         createJavaObjectFromVariant(instance, *member_ptr, &member_ptr_str);
         ((AsyncCallThreadData*) data)->result.append(member_ptr_str);
-
+    } else
+    {
+        ((AsyncCallThreadData*) data)->result.append("null");
     }
     ((AsyncCallThreadData*) data)->result_ready = true;
@@ -856 +868 @@
     script_str = (std::string*) call_data->at(2);
 
-#if MOZILLA_VERSION_COLLAPSED < 1090200
-    script.utf8characters = script_str->c_str();
-    script.utf8length = script_str->size();
-
-    PLUGIN_DEBUG("Evaluating: %s\n", script_str->c_str());
-#else
     script.UTF8Characters = script_str->c_str();
     script.UTF8Length = script_str->size();
 
     PLUGIN_DEBUG("Evaluating: %s\n", script_str->c_str());
-#endif
 
     ((AsyncCallThreadData*) data)->call_successful = browser_functions.evaluate(instance, window_ptr, &script, eval_variant);
@@ -980 +985 @@
     {
         createJavaObjectFromVariant(instance, tostring_result, &(((AsyncCallThreadData*) data)->result));
+    } else
+    {
+        ((AsyncCallThreadData*) data)->result.append("null");
     }
     ((AsyncCallThreadData*) data)->result_ready = true;