/hg/release/icedtea-web-1.0: 2 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Mon Jun 13 11:27:06 PDT 2011
changeset 8ef012d564ba in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=8ef012d564ba
author: Deepak Bhole <dbhole at redhat.com>
date: Fri May 27 18:00:02 2011 -0400
PR735: Firefox 4 sometimes freezes if the applet calls
showDocument()
changeset af4ec6073021 in /hg/release/icedtea-web-1.0
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.0?cmd=changeset;node=af4ec6073021
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Jun 08 14:38:52 2011 -0400
Fix PR721: IcedTeaPlugin.so cannot run g_main_context_iteration on a
different thread unless a different GMainContext *context is used
diffstat:
ChangeLog | 65 ++++++
NEWS | 3 +
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 43 +++-
plugin/icedteanp/IcedTeaNPPlugin.cc | 42 ++--
plugin/icedteanp/IcedTeaNPPlugin.h | 9 +-
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 148 +++++++-------
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 22 +-
plugin/icedteanp/IcedTeaPluginUtils.cc | 105 ++++++++++
plugin/icedteanp/IcedTeaPluginUtils.h | 37 +++
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 4 +-
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 4 +-
11 files changed, 354 insertions(+), 128 deletions(-)
diffs (truncated from 734 to 500 lines):
diff -r bb091ba157f2 -r af4ec6073021 ChangeLog
--- a/ChangeLog Thu Apr 21 11:06:03 2011 -0400
+++ b/ChangeLog Wed Jun 08 14:38:52 2011 -0400
@@ -1,3 +1,68 @@
+2011-06-08 Deepak Bhole <dbhole at redhat.com>
+
+ PR721: IcedTeaPlugin.so cannot run g_main_context_iteration on a different
+ thread unless a different GMainContext *context is used
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
+ (postAndWaitForResponse): Added logic for tracking when the processor is
+ running from a plugin main thread, and logic to process main thread
+ specific messages queued thereafter until function exit.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc:
+ (itnp_plugin_thread_id): New variable. Tracks plugin main thread ID.
+ (pluginAsyncCallMutex): New variable. Mutex to lock async call queue.
+ (NP_Initialize): Initialize the itnp_plugin_thread_id variable and make
+ ithe make pluginAsyncCallMutex recursive.
+ (NP_Shutdown): Destroy pluginAsyncCallMutex.
+ * plugin/icedteanp/IcedTeaNPPlugin.h:
+ (CHROMIUM_WORKAROUND): Remove macro.
+ (itnp_plugin_thread_id): New variable. Tracks plugin main thread ID.
+ (pluginAsyncCallMutex): New variable. Mutex to lock async call queue.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (eval): Remove chromium workaround.
+ (call): Same.
+ (sendString): Same.
+ (setMember): Same.
+ (sendMember): Same.
+ (loadURL): Same.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Moved
+ async_call_thread_data to IcedTeaPluginUtils.h.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc
+ (pendingPluginThreadRequests): New variable. Queue to track events waiting
+ for async execution on plug-in thread.
+ (callAndWaitForResult): New function. Calls a method on plug-in thread and
+ waits for the execution to complete.
+ (postPluginThreadAsyncCall): New function. Posts a method call to the
+ async execution queue and calls NPN_PluginThreadAsynCall.
+ (processAsyncCallQueue): New function. Called from the plug-in thread,
+ this function empties the event queue of functions waiting for plug-in
+ thread execution.
+ * plugin/icedteanp/IcedTeaPluginUtils.h
+ (plugin_thread_call): New struct to hold async call data.
+ (async_call_thread_data): Struct moved from IcedTeaPluginRequestProcessor.
+ (processAsyncCallQueue): New function.
+ (postPluginThreadAsyncCall): Same.
+ (callAndWaitForResult): Same.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc
+ (get_scriptable_java_object): Use
+ IcedTeaPluginUtilities::callAndWaitForResult to post async callback for
+ _createAndRetainJavaObject.
+
+2011-05-27 Deepak Bhole <dbhole at redhat.com>
+
+ PR735: Firefox 4 sometimes freezes if the applet calls showDocument()
+ * plugin/icedteanp/IcedTeaNPPlugin.cc (consume_message): Defer handling to
+ url load request to the queue processor.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (PluginRequestProcessor::newMessageOnBus): Handle new LoadURL command.
+ (PluginRequestProcessor::loadURL): New method. Loads the specified url in
+ the given target.
+ (queue_processor): Process the LoadURL command.
+ (_loadURL): New async callback function to handle LoadURL commands.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Add _loadURL and
+ loadURL method declerations.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (showDocument):
+ Send the url load command in the standard "instance X reference Y
+ <command> <args>" format.
+
2011-04-21 Deepak Bhole <dbhole at redhat.com>
* plugin/icedteanp/IcedTeaNPPlugin.cc (consume_message): Use
diff -r bb091ba157f2 -r af4ec6073021 NEWS
--- a/NEWS Thu Apr 21 11:06:03 2011 -0400
+++ b/NEWS Wed Jun 08 14:38:52 2011 -0400
@@ -9,6 +9,9 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
New in release 1.0.3 (2011-XX-XX):
+* Plugin
+ - PR721: IcedTeaPlugin.so cannot run g_main_context_iteration on a different thread unless a different GMainContext *context is used
+ - PR735: Firefox 4 sometimes freezes if the applet calls showDocument()
New in release 1.0.2 (2011-04-04):
* Common Fixes and Improvements
diff -r bb091ba157f2 -r af4ec6073021 plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Thu Apr 21 11:06:03 2011 -0400
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Wed Jun 08 14:38:52 2011 -0400
@@ -247,22 +247,43 @@
plugin_to_java_bus->post(message.c_str());
// Wait for result to be filled in.
- struct timespec curr_t;
+ struct timespec curr_t;
+
+ bool isPluginThread = false;
+
+ if (pthread_self() == itnp_plugin_thread_id)
+ {
+ isPluginThread = true;
+ PLUGIN_DEBUG("JRP is in plug-in thread...\n");
+ }
do
{
- clock_gettime(CLOCK_REALTIME, &curr_t);
+ clock_gettime(CLOCK_REALTIME, &curr_t);
- if (!result_ready && (curr_t.tv_sec < t.tv_sec))
- {
- if (g_main_context_pending(NULL))
- g_main_context_iteration(NULL, false);
- else
- usleep(200);
- }
- else
- break;
+ if (!result_ready && (curr_t.tv_sec < t.tv_sec))
+ {
+ if (isPluginThread)
+ {
+ processAsyncCallQueue(NULL);
+ // Let the browser run its pending events too
+ if (g_main_context_pending(NULL))
+ {
+ g_main_context_iteration(NULL, false);
+ } else
+ {
+ usleep(1000); // 1ms
+ }
+ } else
+ {
+ usleep(1000); // 1ms
+ }
+ }
+ else
+ {
+ break;
+ }
} while (1);
if (curr_t.tv_sec >= t.tv_sec)
diff -r bb091ba157f2 -r af4ec6073021 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Apr 21 11:06:03 2011 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Jun 08 14:38:52 2011 -0400
@@ -160,6 +160,12 @@
// Applet viewer output watch source.
gint out_watch_source;
+// Thread ID of plug-in thread
+pthread_t itnp_plugin_thread_id;
+
+// Mutex to lock async call queue
+pthread_mutex_t pluginAsyncCallMutex;
+
// Applet viewer output channel.
GIOChannel* out_to_appletviewer;
@@ -1167,26 +1173,7 @@
data = (ITNPPluginData*) instance->pdata;
}
- if (g_str_has_prefix (parts[2], "url"))
- {
- // Open the URL in a new browser window.
- gchar* decoded_url = (gchar*) calloc(strlen(parts[3]) + 1, sizeof(gchar));
- IcedTeaPluginUtilities::decodeURL(parts[3], &decoded_url);
-
- PLUGIN_DEBUG ("plugin_in_pipe_callback: opening URL %s\n", decoded_url);
- PLUGIN_DEBUG ("plugin_in_pipe_callback: URL target %s\n", parts[4]);
-
- NPError np_error =
- (*browser_functions.geturlnotify) (data->owner, decoded_url, parts[4], NULL);
-
-
- if (np_error != NPERR_NO_ERROR)
- PLUGIN_ERROR ("Failed to load URL.");
-
- g_free(decoded_url);
- decoded_url = NULL;
- }
- else if (g_str_has_prefix (parts[2], "status"))
+ if (g_str_has_prefix (parts[2], "status"))
{
// clear the "instance X status" parts
@@ -2247,8 +2234,6 @@
PLUGIN_DEBUG ("NP_Initialize: using %s\n", appletviewer_executable);
- PLUGIN_DEBUG ("NP_Initialize return\n");
-
plugin_req_proc = new PluginRequestProcessor();
java_req_proc = new JavaMessageSender();
@@ -2262,6 +2247,16 @@
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);
+ itnp_plugin_thread_id = pthread_self();
+
+ pthread_mutexattr_t attribute;
+ pthread_mutexattr_init(&attribute);
+ pthread_mutexattr_settype(&attribute, PTHREAD_MUTEX_RECURSIVE);
+ pthread_mutex_init(&pluginAsyncCallMutex, &attribute);
+ pthread_mutexattr_destroy(&attribute);
+
+ PLUGIN_DEBUG ("NP_Initialize return\n");
+
return NPERR_NO_ERROR;
cleanup_appletviewer_executable:
@@ -2406,6 +2401,9 @@
g_free (in_pipe_name);
in_pipe_name = NULL;
+ // Destroy the call queue mutex
+ pthread_mutex_destroy(&pluginAsyncCallMutex);
+
initialized = false;
pthread_cancel(plugin_request_processor_thread1);
diff -r bb091ba157f2 -r af4ec6073021 plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h Thu Apr 21 11:06:03 2011 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h Wed Jun 08 14:38:52 2011 -0400
@@ -57,9 +57,6 @@
#include "IcedTeaPluginUtils.h"
#include "IcedTeaPluginRequestProcessor.h"
-// Work around across some chromium issues
-#define CHROMIUM_WORKAROUND
-
// ITNPPluginData stores all the data associated with a single plugin
// instance. A separate plugin instance is created for each <APPLET>
// tag. For now, each plugin instance spawns its own applet viewer
@@ -97,6 +94,12 @@
// Condition on which the queue processor waits
extern pthread_cond_t cond_message_available;
+// ID of plug-in thread
+extern pthread_t itnp_plugin_thread_id;
+
+/* Mutex around plugin async call queue ops */
+extern pthread_mutex_t pluginAsyncCallMutex;
+
// debug switch
extern int plugin_debug;
diff -r bb091ba157f2 -r af4ec6073021 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Apr 21 11:06:03 2011 -0400
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Jun 08 14:38:52 2011 -0400
@@ -130,11 +130,12 @@
!command->find("GetSlot") ||
!command->find("SetSlot") ||
!command->find("Eval") ||
- !command->find("Finalize"))
+ !command->find("Finalize") ||
+ !command->find("LoadURL"))
{
// Update queue synchronously
- pthread_mutex_lock(&message_queue_mutex);
+ pthread_mutex_lock(&message_queue_mutex);
message_queue->push_back(message_parts);
pthread_mutex_unlock(&message_queue_mutex);
@@ -238,20 +239,7 @@
thread_data.parameters.push_back(NPVARIANT_TO_OBJECT(*window_ptr));
thread_data.parameters.push_back(&script);
-#ifdef CHROMIUM_WORKAROUND
- // Workaround for chromium
- _eval(&thread_data);
-
- if (!thread_data.call_successful)
- {
-#endif
- thread_data.result_ready = false;
- browser_functions.pluginthreadasynccall(instance, &_eval, &thread_data);
-
- while (!thread_data.result_ready) usleep(2000); // Wait till result is ready
-#ifdef CHROMIUM_WORKAROUND
- }
-#endif
+ IcedTeaPluginUtilities::callAndWaitForResult(instance, &_eval, &thread_data);
NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
std::string result_variant_jniid = std::string();
@@ -340,20 +328,7 @@
thread_data.parameters.push_back(&arg_count);
thread_data.parameters.push_back(args_array);
-#ifdef CHROMIUM_WORKAROUND
- // Workaround for chromium
- _call(&thread_data);
-
- if (!thread_data.call_successful)
- {
-#endif
- thread_data.result_ready = false;
- browser_functions.pluginthreadasynccall(instance, &_call, &thread_data);
-
- while (!thread_data.result_ready) usleep(2000); // wait till ready
-#ifdef CHROMIUM_WORKAROUND
- }
-#endif
+ IcedTeaPluginUtilities::callAndWaitForResult(instance, &_call, &thread_data);
result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
@@ -408,19 +383,7 @@
thread_data.parameters.push_back(instance);
thread_data.parameters.push_back(variant);
-#ifdef CHROMIUM_WORKAROUND
- // Workaround for chromium
- _getString(&thread_data);
-
- if (!thread_data.call_successful)
- {
-#endif
- thread_data.result_ready = false;
- browser_functions.pluginthreadasynccall(instance, &_getString, &thread_data);
- while (!thread_data.result_ready) usleep(2000); // wait till ready
-#ifdef CHROMIUM_WORKAROUND
- }
-#endif
+ IcedTeaPluginUtilities::callAndWaitForResult(instance, &_getString, &thread_data);
// We need the context 0 for backwards compatibility with the Java side
IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
@@ -501,20 +464,7 @@
thread_data.parameters.push_back(&property_identifier);
thread_data.parameters.push_back(&value);
-#ifdef CHROMIUM_WORKAROUND
- // Workaround for chromium
- _setMember(&thread_data);
-
- if (!thread_data.call_successful)
- {
-#endif
- thread_data.result_ready = false;
- browser_functions.pluginthreadasynccall(instance, &_setMember, &thread_data);
-
- while (!thread_data.result_ready) usleep(2000); // wait till ready
-#ifdef CHROMIUM_WORKAROUND
- }
-#endif
+ IcedTeaPluginUtilities::callAndWaitForResult(instance, &_setMember, &thread_data);
IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
response.append(" JavaScriptSetMember ");
@@ -597,21 +547,7 @@
thread_data.parameters.push_back(NPVARIANT_TO_OBJECT(*parent_ptr));
thread_data.parameters.push_back(&member_identifier);
-#ifdef CHROMIUM_WORKAROUND
- // Workaround for chromium
- _getMember(&thread_data);
-
- if (!thread_data.call_successful)
- {
-#endif
- thread_data.result_ready = false;
- browser_functions.pluginthreadasynccall(instance, &_getMember, &thread_data);
-
- while (!thread_data.result_ready) usleep(2000); // wait till ready
-
-#ifdef CHROMIUM_WORKAROUND
- }
-#endif
+ IcedTeaPluginUtilities::callAndWaitForResult(instance, &_getMember, &thread_data);
PLUGIN_DEBUG("Member PTR after internal request: %s\n", thread_data.result.c_str());
@@ -714,6 +650,37 @@
plugin_to_java_bus->post(response.c_str());
}
+/**
+ * Fetches the URL and loads it into the given target
+ *
+ * @param message_parts The request message.
+ */
+void
+PluginRequestProcessor::loadURL(std::vector<std::string*>* message_parts)
+{
+
+ int id = atoi(message_parts->at(1)->c_str());
+
+ AsyncCallThreadData thread_data = AsyncCallThreadData();
+ thread_data.result_ready = false;
+ thread_data.parameters = std::vector<void*>();
+ thread_data.result = std::string();
+
+ NPP instance;
+ get_instance_from_id(id, instance);
+
+ // If instance is invalid, do not proceed further
+ if (!instance)
+ return;
+
+ thread_data.parameters.push_back(instance);
+ thread_data.parameters.push_back(message_parts->at(5)); // push url
+ thread_data.parameters.push_back(message_parts->at(6)); // push target
+
+ thread_data.result_ready = false;
+ IcedTeaPluginUtilities::callAndWaitForResult(instance, &_loadURL, &thread_data);
+}
+
static void
queue_cleanup(void* data)
{
@@ -794,6 +761,12 @@
pthread_mutex_lock(&syn_write_mutex);
processor->finalize(message_parts);
pthread_mutex_unlock(&syn_write_mutex);
+ } else if (command == "LoadURL") // For instance X url <url> <target>
+ {
+ // write methods are synchronized
+ pthread_mutex_lock(&syn_write_mutex);
+ processor->loadURL(message_parts);
+ pthread_mutex_unlock(&syn_write_mutex);
} else
{
// Nothing matched
@@ -1014,3 +987,34 @@
PLUGIN_DEBUG("_getString returning\n");
}
+void
+_loadURL(void* data) {
+
+ PLUGIN_DEBUG("_loadURL called\n");
+
+ NPP instance;
+ std::string* url;
+ std::string* target;
+
+ std::vector<void*> parameters = ((AsyncCallThreadData*) data)->parameters;
+
+ instance = (NPP) parameters.at(0);
+ url = (std::string*) parameters.at(1);
+ target = (std::string*) parameters.at(2);
+
+ PLUGIN_DEBUG("Launching %s in %s\n", url->c_str(), target->c_str());
+
+ // Each decode can expand to 4 chars at the most
+ gchar* decoded_url = (gchar*) calloc(strlen(url->c_str())*4 + 1, sizeof(gchar));
+ IcedTeaPluginUtilities::decodeURL(url->c_str(), &decoded_url);
+
+ ((AsyncCallThreadData*) data)->call_successful =
+ (*browser_functions.geturl) (instance, decoded_url, target->c_str());
+
+ ((AsyncCallThreadData*) data)->result_ready = true;
+
+ g_free(decoded_url);
+ decoded_url = NULL;
+
+ PLUGIN_DEBUG("_loadURL returning %d\n", ((AsyncCallThreadData*) data)->call_successful);
+}
diff -r bb091ba157f2 -r af4ec6073021 plugin/icedteanp/IcedTeaPluginRequestProcessor.h
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Thu Apr 21 11:06:03 2011 -0400
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Wed Jun 08 14:38:52 2011 -0400
@@ -57,18 +57,6 @@
#include "IcedTeaPluginUtils.h"
#include "IcedTeaJavaRequestProcessor.h"
-/**
- * Data structure passed to functions called in a new thread.
- */
-
-typedef struct async_call_thread_data
-{
- std::vector<void*> parameters;
- std::string result;
- bool result_ready;
- bool call_successful;
-} AsyncCallThreadData;
-
/* Internal request reference counter */
static long internal_req_ref_counter;
@@ -83,6 +71,7 @@
void _call(void* data);
void _eval(void* data);
void _getString(void* data);
+void _loadURL(void* data);
void* queue_processor(void* data);
@@ -108,10 +97,10 @@
/* Dispatch request processing to a new thread for asynch. processing */
void dispatch(void* func_ptr (void*), std::vector<std::string>* message, std::string* src);
- /* Send main window pointer to Java */
- void sendWindow(std::vector<std::string*>* message_parts);
+ /* Send main window pointer to Java */
More information about the distro-pkg-dev
mailing list