/hg/release/icedtea6-1.7: Message protocol overhaul to fix race ...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 1 09:47:22 PDT 2010
changeset 92e2665861fb in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=92e2665861fb
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Mar 09 15:54:50 2010 -0500
Message protocol overhaul to fix race conditions
- Added unique reference identifiers to Java -> C++ requests so that
the correct responses are serviced (fixes some bad race conditions
when multiple applets are running).
- Fix race conditions that caused some of the set tests to
intermittently fail.
diffstat:
13 files changed, 264 insertions(+), 170 deletions(-)
ChangeLog | 80 ++++++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 25 +-
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 86 ++++-----
plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java | 26 --
plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java | 18 -
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 95 +++++++---
plugin/icedteanp/java/sun/applet/PluginCallRequest.java | 22 +-
plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java | 14 -
plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java | 20 --
plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java | 22 --
plugin/icedteanp/java/sun/applet/PluginStreamHandler.java | 4
plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java | 19 --
plugin/tests/LiveConnect/common.js | 3
diffs (truncated from 1006 to 500 lines):
diff -r 261595447146 -r 92e2665861fb ChangeLog
--- a/ChangeLog Wed Apr 28 17:18:35 2010 +0100
+++ b/ChangeLog Tue Mar 09 15:54:50 2010 -0500
@@ -1,3 +1,83 @@ 2010-04-28 Andrew John Hughes <ahughes
+2010-03-09 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaNPPlugin.cc
+ (consume_message): Handle the new reference field and send it back when
+ sending proxy and cookie info.
+ (get_proxy_info): Update response format for proxy information to make it
+ consistent with new Gecko API.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+ (newMessageOnBus): Account for the new reference field and send it back
+ with the response.
+ (sendWindow): Same.
+ (eval): Same.
+ (call): Same.
+ (sendString): Same.
+ (setMember): Same. Also, move responding code from _setMember to setMember
+ for consistency and to solve a rather bad race condition that affected
+ reliability.
+ (sendMember): Account for the new reference field and send it back
+ with the response.
+ (queue_processor): Move array index slots based on new positions with
+ reference ids.
+ (_setMember): Move response code back to setMember.
+ * plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java
+ (GetMemberPluginCallRequest): Change method signature to receive a
+ reference identifier.
+ (parse): Update to handle new reference identifiers.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java
+ (GetWindowPluginCallRequest): Change method signature to receive a
+ reference identifier.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Added new
+ statis private requestIdentityCounter variable that provides unique
+ reference numbers.
+ (createPanel): Send a dummy (0) reference number with initialization msg.
+ (getRequestIdentifier): New method. Returns a unique reference number
+ and then increments requestIdentityCounter in a thread-safe manner.
+ (getWindow): Send reference id to getPluginCallRequest.
+ (getMember): Same.
+ (setMember): Same.
+ (setSlot): Same.
+ (getSlot): Same.
+ (eval): Same.
+ (removeMember): Same.
+ (call): Same.
+ (requestPluginCookieInfo): Same.
+ (requestPluginProxyInfo): Same.
+ (JavaScriptFinalize): Same.
+ (javascriptToString): Same.
+ * plugin/icedteanp/java/sun/applet/PluginCallRequest.java: Track reference
+ numbers instead of the 'return string' marker.
+ (serviceable): Change from abstract to implemented method, returns weather
+ or not the given message is servicable by this request based on unique
+ reference numbers.
+ * plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java
+ (getPluginCallRequest): Pass reference numbers to concrete class
+ constructors.
+ * plugin/icedteanp/java/sun/applet/PluginCookieInfoRequest.java
+ (PluginCookieInfoRequest): Receive new reference number and pass it to
+ parent.
+ (parseString): Update to handle new reference numbers in message.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/PluginProxyInfoRequest.java
+ (PluginProxyInfoRequest): Receive new reference number and pass it to
+ parent.
+ (parseReturn): Update to handle new reference numbers in message. Also,
+ parse based on new format returned by the C++ side.
+ (serviceable): Removed method. serviceable() is now implemented in the
+ parent class and uses unique reference identifiers.
+ * plugin/icedteanp/java/sun/applet/PluginStreamHandler.java
+ (handleMessage): Pass reference to finishCallRequest().
+ * plugin/icedteanp/java/sun/applet/VoidPluginCallRequest.java
+ (VoidPluginCallRequest): Update to handle new reference numbers in
+ message.
+ * plugin/tests/LiveConnect/common.js
+ (testAll): Check eval tests checkbox before calling doTest();
+
2010-04-28 Andrew John Hughes <ahughes at redhat.com>
PR icedtea/476
diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Apr 28 17:18:35 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Tue Mar 09 15:54:50 2010 -0500
@@ -1222,15 +1222,15 @@ void consume_message(gchar* message) {
else if (g_str_has_prefix (message, "plugin "))
{
// internal plugin related message
- gchar** parts = g_strsplit (message, " ", 3);
+ gchar** parts = g_strsplit (message, " ", 5);
if (g_str_has_prefix(parts[1], "PluginProxyInfo"))
{
gchar* proxy;
uint32_t len;
- gchar* decoded_url = (gchar*) calloc(strlen(parts[2]) + 1, sizeof(gchar));
- IcedTeaPluginUtilities::decodeURL(parts[2], &decoded_url);
- PLUGIN_DEBUG_4ARG("parts[0]=%s, parts[1]=%s, parts[2]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[2], decoded_url);
+ gchar* decoded_url = (gchar*) calloc(strlen(parts[4]) + 1, sizeof(gchar));
+ IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
+ PLUGIN_DEBUG_5ARG("parts[0]=%s, parts[1]=%s, reference, parts[3]=%s, parts[4]=%s -- decoded_url=%s\n", parts[0], parts[1], parts[3], parts[4], decoded_url);
gchar* proxy_info;
@@ -1238,7 +1238,7 @@ void consume_message(gchar* message) {
proxy = (char*) malloc(sizeof(char)*2048);
#endif
- proxy_info = g_strconcat ("plugin PluginProxyInfo ", NULL);
+ proxy_info = g_strconcat ("plugin PluginProxyInfo reference ", parts[3], " ", NULL);
if (get_proxy_info(decoded_url, &proxy, &len) == NPERR_NO_ERROR)
{
proxy_info = g_strconcat (proxy_info, proxy, NULL);
@@ -1259,10 +1259,10 @@ void consume_message(gchar* message) {
} else if (g_str_has_prefix(parts[1], "PluginCookieInfo"))
{
- gchar* decoded_url = (gchar*) calloc(strlen(parts[2])+1, sizeof(gchar));
- IcedTeaPluginUtilities::decodeURL(parts[2], &decoded_url);
+ gchar* decoded_url = (gchar*) calloc(strlen(parts[4])+1, sizeof(gchar));
+ IcedTeaPluginUtilities::decodeURL(parts[4], &decoded_url);
- gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo ", parts[2], " ", NULL);
+ gchar* cookie_info = g_strconcat ("plugin PluginCookieInfo reference ", parts[3], " ", NULL);
gchar* cookie_string;
uint32_t len;
if (get_cookie_info(decoded_url, &cookie_string, &len) == NPERR_NO_ERROR)
@@ -1358,7 +1358,14 @@ get_proxy_info(const char* siteAddr, cha
nsDependentCString ipAddr;
record->GetNextAddrAsString(ipAddr);
- snprintf(*proxy, sizeof(char)*1024, "%s://%s:%d", ptype.get(), ipAddr.get(), pport);
+ if (!strcmp(ptype.get(), "http"))
+ {
+ snprintf(*proxy, sizeof(char)*1024, "%s %s:%d", "PROXY", ipAddr.get(), pport);
+ } else
+ {
+ snprintf(*proxy, sizeof(char)*1024, "%s %s:%d", "SOCKS", ipAddr.get(), pport);
+ }
+
*len = strlen(*proxy);
PLUGIN_DEBUG_2ARG("Proxy info for %s: %s\n", siteAddr, *proxy);
diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Apr 28 17:18:35 2010 +0100
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Tue Mar 09 15:54:50 2010 -0500
@@ -103,7 +103,7 @@ PluginRequestProcessor::newMessageOnBus(
IcedTeaPluginUtilities::printStringVector("PluginRequestProcessor::newMessageOnBus:", message_parts);
type = message_parts->at(0);
- command = message_parts->at(2);
+ command = message_parts->at(4);
if (type == "instance")
{
@@ -122,7 +122,7 @@ PluginRequestProcessor::newMessageOnBus(
command == "Eval")
{
- // Update queue synchronously
+ // Update queue synchronously
pthread_mutex_lock(&message_queue_mutex);
message_queue->push_back(message_parts);
pthread_mutex_unlock(&message_queue_mutex);
@@ -152,6 +152,7 @@ PluginRequestProcessor::sendWindow(std::
{
std::string type;
std::string command;
+ int reference;
std::string response = std::string();
std::string window_ptr_str = std::string();
NPVariant* variant = new NPVariant();
@@ -160,7 +161,8 @@ PluginRequestProcessor::sendWindow(std::
type = message_parts->at(0);
id = atoi(message_parts->at(1).c_str());
- command = message_parts->at(2);
+ reference = atoi(message_parts->at(3).c_str());
+ command = message_parts->at(4);
NPP instance;
get_instance_from_id(id, instance);
@@ -173,7 +175,7 @@ PluginRequestProcessor::sendWindow(std::
IcedTeaPluginUtilities::JSIDToString(variant, &window_ptr_str);
// We need the context 0 for backwards compatibility with the Java side
- IcedTeaPluginUtilities::constructMessagePrefix(0, &response);
+ IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
response += " JavaScriptGetWindow ";
response += window_ptr_str;
@@ -201,14 +203,16 @@ PluginRequestProcessor::eval(std::vector
NPP instance;
std::string script;
NPVariant result;
+ int reference;
std::string response = std::string();
std::string return_type = std::string();
int id;
- window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(message_parts->at(3));
+ reference = atoi(message_parts->at(3).c_str());
+ window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(message_parts->at(5));
instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(window_ptr);
- java_result = request_processor.getString(message_parts->at(4));
+ java_result = request_processor.getString(message_parts->at(6));
CHECK_JAVA_RESULT(java_result);
script.append(*(java_result->return_string));
@@ -240,7 +244,7 @@ PluginRequestProcessor::eval(std::vector
std::string result_variant_jniid = std::string();
createJavaObjectFromVariant(instance, *result_variant, &result_variant_jniid);
- IcedTeaPluginUtilities::constructMessagePrefix(0, &response);
+ IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
response += " JavaScriptEval ";
response += result_variant_jniid;
@@ -262,6 +266,7 @@ PluginRequestProcessor::call(std::vector
NPP instance;
std::string window_ptr_str;
NPVariant* window_ptr;
+ int reference;
std::string window_function_name;
std::vector<NPVariant> args = std::vector<NPVariant>();
std::vector<std::string> arg_ids = std::vector<std::string>();
@@ -270,20 +275,22 @@ PluginRequestProcessor::call(std::vector
JavaRequestProcessor java_request = JavaRequestProcessor();
JavaResultData* java_result;
+ reference = atoi(message_parts->at(3).c_str());
+
// window
- window_ptr_str = message_parts->at(3);
+ window_ptr_str = message_parts->at(5);
window_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(window_ptr_str);
// instance
instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(window_ptr);
// function name
- java_result = java_request.getString(message_parts->at(4));
+ java_result = java_request.getString(message_parts->at(6));
CHECK_JAVA_RESULT(java_result);
window_function_name.append(*(java_result->return_string));
// arguments
- for (int i=5; i < message_parts->size(); i++)
+ for (int i=7; i < message_parts->size(); i++)
{
arg_ids.push_back(message_parts->at(i));
}
@@ -342,7 +349,7 @@ PluginRequestProcessor::call(std::vector
result_variant_jniid = "0";
}
- IcedTeaPluginUtilities::constructMessagePrefix(0, &response);
+ IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
response += " JavaScriptCall ";
response += result_variant_jniid;
@@ -364,9 +371,11 @@ PluginRequestProcessor::sendString(std::
NPVariant* variant;
JavaRequestProcessor java_request = JavaRequestProcessor();
JavaResultData* java_result;
+ int reference;
std::string response = std::string();
- variant_ptr = message_parts->at(3);
+ reference = atoi(message_parts->at(3).c_str());
+ variant_ptr = message_parts->at(5);
variant = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(variant_ptr);
AsyncCallThreadData thread_data = AsyncCallThreadData();
@@ -393,7 +402,7 @@ PluginRequestProcessor::sendString(std::
#endif
// We need the context 0 for backwards compatibility with the Java side
- IcedTeaPluginUtilities::constructMessagePrefix(0, &response);
+ IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
response += " JavaScriptToString ";
response += thread_data.result;
@@ -418,6 +427,8 @@ PluginRequestProcessor::setMember(std::v
{
std::string propertyNameID;
std::string value = std::string();
+ std::string response = std::string();
+ int reference;
NPP instance;
NPVariant* member;
@@ -428,24 +439,26 @@ PluginRequestProcessor::setMember(std::v
IcedTeaPluginUtilities::printStringVector("PluginRequestProcessor::_setMember - ", message_parts);
- member = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(3)));
- propertyNameID = message_parts->at(4);
+ reference = atoi(message_parts->at(3).c_str());
- if (message_parts->at(5) == "literalreturn")
+ member = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(5)));
+ propertyNameID = message_parts->at(6);
+
+ if (message_parts->at(7) == "literalreturn")
{
- value.append(message_parts->at(5));
+ value.append(message_parts->at(7));
value.append(" ");
- value.append(message_parts->at(6));
+ value.append(message_parts->at(8));
} else
{
- value.append(message_parts->at(5));
+ value.append(message_parts->at(7));
}
instance = IcedTeaPluginUtilities::getInstanceFromMemberPtr(member);
- if (message_parts->at(2) == "SetSlot")
+ if (message_parts->at(4) == "SetSlot")
{
- property_identifier = browser_functions.getintidentifier(atoi(message_parts->at(4).c_str()));
+ property_identifier = browser_functions.getintidentifier(atoi(message_parts->at(6).c_str()));
} else
{
java_result = java_request.getString(propertyNameID);
@@ -485,6 +498,10 @@ PluginRequestProcessor::setMember(std::v
}
#endif
+ IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
+ response.append(" JavaScriptSetMember ");
+ plugin_to_java_bus->post(response.c_str());
+
cleanup:
delete message_parts;
@@ -514,6 +531,7 @@ PluginRequestProcessor::sendMember(std::
JavaResultData* java_result;
NPVariant* parent_ptr;
+ //int reference;
std::string member_id = std::string();
std::string jsObjectClassID = std::string();
std::string jsObjectConstructorID = std::string();
@@ -523,18 +541,20 @@ PluginRequestProcessor::sendMember(std::
int method_id;
int instance_id;
- long reference;
+ int reference;
// debug printout of parent thread data
IcedTeaPluginUtilities::printStringVector("PluginRequestProcessor::getMember:", message_parts);
+ reference = atoi(message_parts->at(3).c_str());
+
// store info in local variables for easy access
instance_id = atoi(message_parts->at(1).c_str());
- parent_ptr = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(3)));
- member_id += message_parts->at(4);
+ parent_ptr = (NPVariant*) (IcedTeaPluginUtilities::stringToJSID(message_parts->at(5)));
+ member_id += message_parts->at(6);
/** Request data from Java if necessary **/
- if (message_parts->at(2) == "GetSlot")
+ if (message_parts->at(4) == "GetSlot")
{
member_identifier = browser_functions.getintidentifier(atoi(member_id.c_str()));
} else
@@ -551,10 +571,6 @@ PluginRequestProcessor::sendMember(std::
member_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str());
}
-
- /** Make an internal request for the main thread to handle, to get the member pointer **/
-
- reference = internal_req_ref_counter++;
AsyncCallThreadData thread_data = AsyncCallThreadData();
thread_data.result_ready = false;
@@ -583,8 +599,6 @@ PluginRequestProcessor::sendMember(std::
#endif
PLUGIN_DEBUG_1ARG("Member PTR after internal request: %s\n", thread_data.result.c_str());
-
- internal_req_ref_counter--;
java_result = java_request.findClass(0, "netscape.javascript.JSObject");
@@ -631,7 +645,7 @@ PluginRequestProcessor::sendMember(std::
}
- IcedTeaPluginUtilities::constructMessagePrefix(0, &response);
+ IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
if (message_parts->at(2) == "GetSlot")
{
response.append(" JavaScriptGetMember ");
@@ -674,7 +688,7 @@ queue_processor(void* data)
if (message_parts)
{
- command = message_parts->at(2);
+ command = message_parts->at(4);
if (command == "GetMember")
{
@@ -739,7 +753,6 @@ _setMember(void* data)
_setMember(void* data)
{
std::string* value;
- std::string response = std::string();
NPP instance;
NPVariant value_variant = NPVariant();
@@ -758,12 +771,7 @@ _setMember(void* data)
((AsyncCallThreadData*) data)->call_successful = browser_functions.setproperty(instance, member, *property, &value_variant);
- IcedTeaPluginUtilities::constructMessagePrefix(0, &response);
- response.append(" JavaScriptSetMember ");
- plugin_to_java_bus->post(response.c_str());
-
((AsyncCallThreadData*) data)->result_ready = true;
-
}
void
diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java
--- a/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java Wed Apr 28 17:18:35 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/GetMemberPluginCallRequest.java Tue Mar 09 15:54:50 2010 -0500
@@ -41,35 +41,21 @@ public class GetMemberPluginCallRequest
public class GetMemberPluginCallRequest extends PluginCallRequest {
Object object = null;
- public GetMemberPluginCallRequest(String message, String returnString) {
- super(message, returnString);
- PluginDebug.debug ("GetMEMBerPLUGINCAlL " + message + " " + returnString);
+ public GetMemberPluginCallRequest(String message, Long reference) {
+ super(message, reference);
+ PluginDebug.debug ("GetMemberPluginCall " + message);
}
public void parseReturn(String message) {
- PluginDebug.debug ("GetMEMBerparseReturn GOT: " + message);
+ PluginDebug.debug ("GetMemberParseReturn GOT: " + message);
String[] args = message.split(" ");
// FIXME: Is it even possible to distinguish between null and void
// here?
- if (args[1] != "null" && args[1] != "void")
- object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[1]));
+ if (args[3] != "null" && args[3] != "void")
+ object = AppletSecurityContextManager.getSecurityContext(0).getObject(Integer.parseInt(args[3]));
setDone(true);
}
- /**
- * Returns whether the given message is serviceable by this object
- *
- * @param message The message to service
- * @return boolean indicating if message is serviceable
- */
- public boolean serviceable(String message) {
- return message.contains("JavaScriptCall") ||
- message.contains("JavaScriptEval") ||
- message.contains("JavaScriptGetMember") ||
- message.contains("JavaScriptGetSlot") ||
- message.contains("JavaScriptToString");
- }
-
public Object getObject() {
return this.object;
}
diff -r 261595447146 -r 92e2665861fb plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java
--- a/plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java Wed Apr 28 17:18:35 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/GetWindowPluginCallRequest.java Tue Mar 09 15:54:50 2010 -0500
@@ -46,27 +46,17 @@ public class GetWindowPluginCallRequest
// FIXME: look into int vs long JavaScript internal values.
long internal;
- public GetWindowPluginCallRequest(String message, String returnString) {
- super(message, returnString);
+ public GetWindowPluginCallRequest(String message, Long reference) {
+ super(message, reference);
}
public void parseReturn(String message) {
- PluginDebug.debug ("GetWINDOWparseReturn GOT: " + message);
+ PluginDebug.debug ("GetWindowParseReturn GOT: " + message);
String[] args = message.split(" ");
// FIXME: add thread ID to messages to support multiple
More information about the distro-pkg-dev
mailing list