/hg/icedtea-web: 3 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Thu Mar 3 14:54:29 PST 2011
changeset 947511f91db5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=947511f91db5
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Mar 03 17:04:56 2011 -0500
Minor cleanup of C++ code -- removed unused thread_counter
changeset 2734b22b5f01 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2734b22b5f01
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Mar 03 17:09:54 2011 -0500
Added check for instance validity before making calls to the browser
changeset 64b9d3a8239c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=64b9d3a8239c
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Mar 03 17:56:00 2011 -0500
Send initialization information to Java side via a new function
(also takes care of webkit/chromium breakage with a 0x0 sized
plugin)
diffstat:
3 files changed, 19 insertions(+), 1 deletion(-)
ChangeLog | 18 ++++++++++++++++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 1 +
plugin/icedteanp/IcedTeaPluginRequestProcessor.h | 1 -
diffs (279 lines):
diff -r 5dbf0f9de599 -r 64b9d3a8239c ChangeLog
--- a/ChangeLog Wed Mar 02 11:50:30 2011 -0500
+++ b/ChangeLog Thu Mar 03 17:56:00 2011 -0500
@@ -1,3 +1,36 @@ 2011-03-02 Omair Majid <omajid at redhat.
+2011-03-03 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (plugin_send_initialization_message): New method. Sends initialization
+ information to the Java side.
+ (ITNP_SetWindow): Call the new plugin_send_initialization_message
+ function.
+ (get_scriptable_object): Same.
+
+2011-03-03 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (eval): Proceed with _eval only if instance is valid.
+ (call): Proceed with _call only if instance is valid. Moved declaration
+ of result_variant_jniid, result_variant args_array and thread_data to
+ the top.
+ (sendString): Proceed with _getString only if instance is valid. Remove
+ thread count incrementer.
+ (setMember): Proceed with _setMember only if instance is valid. Remove
+ thread count incrementer.
+ (sendMember): Proceed with _getMember only if instance is valid.
+
+2011-03-03 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (PluginRequestProcessor): Remove initialization of tc_mutex
+ (~PluginRequestProcessor): Remove destruction of tc_mutex
+ (sendString): Removed thread count incrementer code.
+ (setMember): Same.
+ (sendMember): Same.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.h: Removed tc_mutex and
+ thread_count variables.
+
2011-03-02 Omair Majid <omajid at redhat.com>
Fix PR612.
diff -r 5dbf0f9de599 -r 64b9d3a8239c plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Mar 02 11:50:30 2011 -0500
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Mar 03 17:56:00 2011 -0500
@@ -220,6 +220,9 @@ void consume_message(gchar* message);
void consume_message(gchar* message);
void start_jvm_if_needed();
static void appletviewer_monitor(GPid pid, gint status, gpointer data);
+void plugin_send_initialization_message(char* instance, gulong handle,
+ int width, int height,
+ char* url);
// Global instance counter.
// Mutex to protect plugin_instance_counter.
@@ -768,18 +771,9 @@ ITNP_SetWindow (NPP instance, NPWindow*
data->window_height = window->height;
// Now we have everything. Send this data to the Java side
-
- gchar* instance_msg = g_strdup_printf ("instance %s handle %ld width %d height %d %s",
- data->instance_id,
- (gulong) data->window_handle,
- data->window_width,
- data->window_height,
- data->applet_tag);
-
- plugin_send_message_to_appletviewer (instance_msg);
-
- g_free(instance_msg);
- instance_msg = NULL;
+ plugin_send_initialization_message(
+ data->instance_id, (gulong) data->window_handle,
+ data->window_width, data->window_height, data->applet_tag);
g_mutex_unlock (data->appletviewer_mutex);
@@ -1834,6 +1828,25 @@ plugin_send_message_to_appletviewer (gch
PLUGIN_DEBUG ("plugin_send_message_to_appletviewer return\n");
}
+/*
+ * Sends the initialization message (handle/size/url) to the plugin
+ */
+void
+plugin_send_initialization_message(char* instance, gulong handle,
+ int width, int height, char* url)
+{
+ PLUGIN_DEBUG ("plugin_send_initialization_message\n");
+
+ gchar *window_message = g_strdup_printf ("instance %s handle %ld width %d height %d %s",
+ instance, handle, width, height, url);
+ plugin_send_message_to_appletviewer (window_message);
+ g_free (window_message);
+ window_message = NULL;
+
+ PLUGIN_DEBUG ("plugin_send_initialization_message return\n");
+}
+
+
// Stop the appletviewer process. When this is called the
// appletviewer can be in any of three states: running, crashed or
// hung. If the appletviewer is running then sending it "shutdown"
@@ -2414,11 +2427,7 @@ get_scriptable_object(NPP instance)
// a 0 handle
if (!data->window_handle)
{
- data->window_handle = 0;
- gchar *window_message = g_strdup_printf ("instance %s handle %d",
- id_str, 0);
- plugin_send_message_to_appletviewer (window_message);
- g_free (window_message);
+ plugin_send_initialization_message(data->instance_id, 0, 0, 0, data->applet_tag);
}
java_result = java_request.getAppletObjectInstance(id_str);
diff -r 5dbf0f9de599 -r 64b9d3a8239c plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Mar 02 11:50:30 2011 -0500
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Mar 03 17:56:00 2011 -0500
@@ -66,7 +66,6 @@ PluginRequestProcessor::PluginRequestPro
pthread_mutex_init(&message_queue_mutex, NULL);
pthread_mutex_init(&syn_write_mutex, NULL);
- pthread_mutex_init(&tc_mutex, NULL);
pthread_cond_init(&cond_message_available, NULL);
}
@@ -86,7 +85,6 @@ PluginRequestProcessor::~PluginRequestPr
pthread_mutex_destroy(&message_queue_mutex);
pthread_mutex_destroy(&syn_write_mutex);
- pthread_mutex_destroy(&tc_mutex);
pthread_cond_destroy(&cond_message_available);
}
@@ -223,6 +221,10 @@ PluginRequestProcessor::eval(std::vector
window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(message_parts->at(5));
instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(window_ptr);
+ // If instance is invalid, do not proceed further
+ if (!instance)
+ return;
+
java_result = request_processor.getString(*(message_parts->at(6)));
CHECK_JAVA_RESULT(java_result);
script.append(*(java_result->return_string));
@@ -282,6 +284,10 @@ PluginRequestProcessor::call(std::vector
std::string response = std::string();
JavaRequestProcessor java_request = JavaRequestProcessor();
JavaResultData* java_result;
+ NPVariant* result_variant;
+ std::string result_variant_jniid = std::string();
+ NPVariant* args_array;
+ AsyncCallThreadData thread_data = AsyncCallThreadData();
reference = atoi(message_parts->at(3)->c_str());
@@ -291,6 +297,10 @@ PluginRequestProcessor::call(std::vector
// instance
instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(window_ptr);
+
+ // If instance is invalid, do not proceed further
+ if (!instance)
+ goto cleanup;
// function name
java_result = java_request.getString(*(message_parts->at(6)));
@@ -316,11 +326,10 @@ PluginRequestProcessor::call(std::vector
}
arg_count = args.size();
- NPVariant *args_array = (NPVariant*) malloc(sizeof(NPVariant)*args.size());
+ args_array = (NPVariant*) malloc(sizeof(NPVariant)*args.size());
for (int i=0; i < args.size(); i++)
args_array[i] = args[i];
- AsyncCallThreadData thread_data = AsyncCallThreadData();
thread_data.result_ready = false;
thread_data.parameters = std::vector<void*>();
thread_data.result = std::string();
@@ -346,8 +355,7 @@ PluginRequestProcessor::call(std::vector
}
#endif
- NPVariant* result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
- std::string result_variant_jniid = std::string();
+ result_variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
if (result_variant)
{
@@ -392,6 +400,11 @@ PluginRequestProcessor::sendString(std::
thread_data.result = std::string();
NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(variant);
+
+ // If instance is invalid, do not proceed further
+ if (!instance)
+ return;
+
thread_data.parameters.push_back(instance);
thread_data.parameters.push_back(variant);
@@ -415,12 +428,6 @@ PluginRequestProcessor::sendString(std::
response += thread_data.result;
plugin_to_java_bus->post(response.c_str());
-
- cleanup:
-
- pthread_mutex_lock(&tc_mutex);
- thread_count--;
- pthread_mutex_unlock(&tc_mutex);
}
/**
@@ -462,6 +469,10 @@ PluginRequestProcessor::setMember(std::v
}
instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(member);
+
+ // If instance is invalid, do not proceed further
+ if (!instance)
+ return;
if (*(message_parts->at(4)) == "SetSlot")
{
@@ -508,13 +519,6 @@ PluginRequestProcessor::setMember(std::v
IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
response.append(" JavaScriptSetMember ");
plugin_to_java_bus->post(response.c_str());
-
- cleanup:
-
- // property_name, type and value are deleted by _setMember
- pthread_mutex_lock(&tc_mutex);
- thread_count--;
- pthread_mutex_unlock(&tc_mutex);
}
/**
@@ -584,6 +588,11 @@ PluginRequestProcessor::sendMember(std::
thread_data.result = std::string();
NPP instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(parent_ptr);
+
+ // If instance is invalid, do not proceed further
+ if (!instance)
+ return;
+
thread_data.parameters.push_back(instance);
thread_data.parameters.push_back(NPVARIANT_TO_OBJECT(*parent_ptr));
thread_data.parameters.push_back(&member_identifier);
@@ -660,14 +669,6 @@ PluginRequestProcessor::sendMember(std::
}
response.append(java_result->return_string->c_str());
plugin_to_java_bus->post(response.c_str());
-
-
- // Now be a good citizen and help keep the heap free of garbage
- cleanup:
-
- pthread_mutex_lock(&tc_mutex);
- thread_count--;
- pthread_mutex_unlock(&tc_mutex);
}
/**
diff -r 5dbf0f9de599 -r 64b9d3a8239c plugin/icedteanp/IcedTeaPluginRequestProcessor.h
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Wed Mar 02 11:50:30 2011 -0500
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.h Thu Mar 03 17:56:00 2011 -0500
@@ -84,9 +84,6 @@ void _eval(void* data);
void _eval(void* data);
void _getString(void* data);
-static pthread_mutex_t tc_mutex = PTHREAD_MUTEX_INITIALIZER;
-static int thread_count = 0;
-
void* queue_processor(void* data);
/* Mutex to ensure that the request queue is accessed synchronously */
More information about the distro-pkg-dev
mailing list