/hg/icedtea-web: Back out changeset 420d72e5cee7
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Thu Oct 17 07:49:36 PDT 2013
changeset bde9b562c85e in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bde9b562c85e
author: Andrew Azores <aazores at redhat.com>
date: Thu Oct 17 10:32:46 2013 -0400
Back out changeset 420d72e5cee7
Back out changeset 420d72e5cee7 due to breaking LiveConnect feature.
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-October/024919.html
* plugin/icedteanp/IcedTeaNPPlugin.cc: undo 420d72e5cee7
* plugin/icedteanp/IcedTeaPluginUtils.cc: undo 420d72e5cee7
* plugin/icedteanp/IcedTeaPluginUtils.h: undo 420d72e5cee7
* plugin/icedteanp/IcedTeaScriptablePluginObject.cc: undo 420d72e5cee7
* plugin/icedteanp/IcedTeaScriptablePluginObject.h: undo 420d72e5cee7
* tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: undo 420d72e5cee7
diffstat:
ChangeLog | 11 +
plugin/icedteanp/IcedTeaNPPlugin.cc | 36 ++-
plugin/icedteanp/IcedTeaPluginUtils.cc | 134 ++-----
plugin/icedteanp/IcedTeaPluginUtils.h | 67 +---
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 222 ++++---------
plugin/icedteanp/IcedTeaScriptablePluginObject.h | 28 +-
tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc | 15 +-
7 files changed, 171 insertions(+), 342 deletions(-)
diffs (truncated from 848 to 500 lines):
diff -r 4d64320525d3 -r bde9b562c85e ChangeLog
--- a/ChangeLog Wed Oct 16 13:26:09 2013 -0400
+++ b/ChangeLog Thu Oct 17 10:32:46 2013 -0400
@@ -1,3 +1,14 @@
+2013-10-17 Andrew Azores <aazores at redhat.com>
+
+ Back out changeset 420d72e5cee7 due to breaking LiveConnect feature.
+ http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2013-October/024919.html
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: undo 420d72e5cee7
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: undo 420d72e5cee7
+ * plugin/icedteanp/IcedTeaPluginUtils.h: undo 420d72e5cee7
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: undo 420d72e5cee7
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.h: undo 420d72e5cee7
+ * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: undo 420d72e5cee7
+
2013-10-16 Andrew Azores <aazores at redhat.com>
Resolve deadlock issue when multiple applets are loaded simultaneously
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Oct 17 10:32:46 2013 -0400
@@ -2101,6 +2101,14 @@
if (data->is_applet_instance) // dummy instance/package?
{
+ JavaRequestProcessor java_request = JavaRequestProcessor();
+ JavaResultData* java_result;
+ std::string instance_id = std::string();
+ std::string applet_class_id = std::string();
+
+ int id = get_id_from_instance(instance);
+ gchar* id_str = g_strdup_printf ("%d", id);
+
// Some browsers.. (e.g. chromium) don't call NPP_SetWindow
// for 0x0 plugins and therefore require initialization with
// a 0 handle
@@ -2109,10 +2117,30 @@
plugin_send_initialization_message(data->instance_id, 0, 0, 0, data->parameters_string);
}
- NPObjectRef applet_object = IcedTeaScriptableJavaObject::get_scriptable_applet_object(instance);
- /* Retain because we are returning an NPObject* */
- applet_object.raw_retain();
- obj = applet_object.get();
+ java_result = java_request.getAppletObjectInstance(id_str);
+
+ g_free(id_str);
+
+ if (java_result->error_occurred)
+ {
+ printf("Error: Unable to fetch applet instance id from Java side.\n");
+ return NULL;
+ }
+
+ instance_id.append(*(java_result->return_string));
+
+ java_result = java_request.getClassID(instance_id);
+
+ if (java_result->error_occurred)
+ {
+ printf("Error: Unable to fetch applet instance id from Java side.\n");
+ return NULL;
+ }
+
+ applet_class_id.append(*(java_result->return_string));
+
+ obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, applet_class_id, instance_id, false);
+
} else
{
obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(instance, "");
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Thu Oct 17 10:32:46 2013 -0400
@@ -53,7 +53,7 @@
int IcedTeaPluginUtilities::reference = -1;
pthread_mutex_t IcedTeaPluginUtilities::reference_mutex = PTHREAD_MUTEX_INITIALIZER;
std::map<void*, NPP>* IcedTeaPluginUtilities::instance_map = new std::map<void*, NPP>();
-std::map<std::string, NPObjectRef> IcedTeaPluginUtilities::object_map;
+std::map<std::string, NPObject*>* IcedTeaPluginUtilities::object_map = new std::map<std::string, NPObject*>();
/* Plugin async call queue */
static std::vector< PluginThreadCall* >* pendingPluginThreadRequests = new std::vector< PluginThreadCall* >();
@@ -433,9 +433,9 @@
IcedTeaPluginUtilities::printStringVector(const char* prefix, std::vector<std::string>* str_vector)
{
- // This is a CPU intensive function. Run only if debugging
- if (!plugin_debug)
- return;
+ // This is a CPU intensive function. Run only if debugging
+ if (!plugin_debug)
+ return;
std::string* str = new std::string();
*str += "{ ";
@@ -561,25 +561,27 @@
* @return The associated active NPObject, NULL otherwise
*/
-NPObjectRef
+NPObject*
IcedTeaPluginUtilities::getNPObjectFromJavaKey(std::string key)
{
+
+ NPObject* object = NULL;
PLUGIN_DEBUG("getNPObjectFromJavaKey looking for %s\n", key.c_str());
- std::map<std::string, NPObjectRef>::iterator iterator = object_map.find(key);
+ std::map<std::string, NPObject*>::iterator iterator = object_map->find(key);
- if (iterator != object_map.end())
+ if (iterator != object_map->end())
{
- NPObjectRef object = object_map.find(key)->second;
+ NPObject* mapped_object = object_map->find(key)->second;
- if (getInstanceFromMemberPtr(object.get()) != NULL)
+ if (getInstanceFromMemberPtr(mapped_object) != NULL)
{
- PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object.get());
- return object;
+ object = mapped_object;
+ PLUGIN_DEBUG("getNPObjectFromJavaKey found %s. NPObject = %p\n", key.c_str(), object);
}
}
- return NPObjectRef(NULL);
+ return object;
}
/**
@@ -590,10 +592,10 @@
*/
void
-IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObjectRef object)
+IcedTeaPluginUtilities::storeObjectMapping(std::string key, NPObject* object)
{
- PLUGIN_DEBUG("Storing object %p with key %s\n", object.get(), key.c_str());
- object_map.insert(std::make_pair(key, object));
+ PLUGIN_DEBUG("Storing object %p with key %s\n", object, key.c_str());
+ object_map->insert(std::make_pair(key, object));
}
/**
@@ -606,14 +608,19 @@
IcedTeaPluginUtilities::removeObjectMapping(std::string key)
{
PLUGIN_DEBUG("Removing key %s from object map\n", key.c_str());
- object_map.erase(key);
+ object_map->erase(key);
}
/* Clear object_map. Useful for tests. */
void
IcedTeaPluginUtilities::clearObjectMapping()
{
- object_map = std::map<std::string, NPObjectRef>();
+ std::map<std::string, NPObject*>::iterator iter = object_map->begin();
+ for (; iter != object_map->end(); ++iter) {
+ browser_functions.releaseobject(iter->second);
+ }
+ delete object_map;
+ object_map = new std::map<std::string, NPObject*>();
}
/*
@@ -626,9 +633,9 @@
void
IcedTeaPluginUtilities::printStringPtrVector(const char* prefix, std::vector<std::string*>* str_ptr_vector)
{
- // This is a CPU intensive function. Run only if debugging
- if (!plugin_debug)
- return;
+ // This is a CPU intensive function. Run only if debugging
+ if (!plugin_debug)
+ return;
std::string* str = new std::string();
*str += "{ ";
@@ -812,13 +819,18 @@
std::string jclass_id = *jclass_result->return_string;
- bool is_array = (jclass_id.at(0) == '[');
- NPObjectRef object = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
- jobject_id, is_array);
+ NPObject* obj;
+ if (jclass_id.at(0) == '[') // array
+ {
+ obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
+ jobject_id, true);
+ } else
+ {
+ obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(instance, jclass_id,
+ jobject_id, false);
+ }
- OBJECT_TO_NPVARIANT(object.get(), *variant);
- /* Retain because we are returning an NPObject* */
- object.raw_retain();
+ OBJECT_TO_NPVARIANT(obj, *variant);
return true;
}
@@ -862,12 +874,12 @@
}
bool
-IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObjectRef object)
+IcedTeaPluginUtilities::isObjectJSArray(NPP instance, NPObject* object)
{
NPVariant constructor_v = NPVariant();
NPIdentifier constructor_id = browser_functions.getstringidentifier("constructor");
- browser_functions.getproperty(instance, object.get(), constructor_id, &constructor_v);
+ browser_functions.getproperty(instance, object, constructor_id, &constructor_v);
IcedTeaPluginUtilities::printNPVariant(constructor_v);
// void constructor => not an array
@@ -1075,34 +1087,6 @@
str = str.substr(start, end - start + 1);
}
-std::string
-IcedTeaPluginUtilities::stringPrintf(const char* fmt, /*variable arguments*/ ...)
-{
- /* Extract the variable arguments */
- va_list args;
- va_start(args, fmt);
-
- gchar* result = NULL;
- size_t size;
-
- /* Format the arguments into a new buffer, held in 'result' */
- size = g_vasprintf (&result, fmt, args);
-
- if (result == NULL)
- {
- // We are out of memory
- throw std::bad_alloc();
- }
-
- /* Wrap as string and free buffer */
- std::string str(result, size);
- g_free(result);
-
- va_end(args); /* Finish using variable arguments */
-
- return str;
-}
-
std::string IcedTeaPluginUtilities::NPIdentifierAsString(NPIdentifier id) {
NPUTF8* cstr = browser_functions.utf8fromidentifier(id);
if (cstr == NULL) {
@@ -1258,41 +1242,3 @@
PLUGIN_DEBUG("%p unlocked...\n", &msg_queue_mutex);
}
-void
-NPObjectRef::set(NPObject* new_object)
-{
- if (new_object != NULL) {
- /* Increase the new object's reference count */
- browser_functions.retainobject(new_object);
- }
- if (current_object != NULL) {
- /* Decrease the old object's reference count */
- browser_functions.releaseobject(current_object);
- }
-
- this->current_object = new_object;
-}
-
-NPObjectRef
-NPObjectRef::create(NPP instance, NPClass* np_class)
-{
- NPObjectRef ref;
- /* Don't use set(), otherwise we'd double-retain */
- ref.current_object = browser_functions.createobject(instance, np_class);
- return ref;
-}
-
-/* Explicit reference counting operations, use only if needed for interoperating with NPObject* */
-void
-NPObjectRef::raw_retain() {
- if (current_object != NULL) {
- browser_functions.retainobject(current_object);
- }
-}
-
-void
-NPObjectRef::raw_release() {
- if (current_object != NULL) {
- browser_functions.releaseobject(current_object);
- }
-}
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h Thu Oct 17 10:32:46 2013 -0400
@@ -153,61 +153,6 @@
/* Function to process all pending async calls */
void processAsyncCallQueue(void*);
-/* Reference-counted 'smart pointer' to NPObject */
-class NPObjectRef {
-public:
- /* Create with browser_functions.createobject.
- * This ensures the object is not double-retained. */
- static NPObjectRef create(NPP instance, NPClass* np_class);
-
- NPObjectRef(NPObject* obj = NULL) {
- current_object = NULL;
- set(obj);
- }
-
- NPObjectRef(const NPObjectRef& ref) {
- current_object = NULL;
- set(ref.current_object);
- }
-
- NPObjectRef& operator=(const NPObjectRef& ref) {
- set(ref.current_object);
- return *this;
- }
-
- ~NPObjectRef() {
- clear();
- }
-
- void set(NPObject* new_object);
-
- /* Get's the object pointer */
- NPObject* get() {
- return current_object;
- }
-
- /* Helper for getting object as different type.
- * NOTE: This cast is unchecked. */
- template <typename T>
- T as() {
- return (T)current_object;
- }
-
- /* Explicit reference counting operations, use only if needed for interoperating with NPObject* */
- void raw_retain();
- void raw_release();
-
- bool empty() {
- return (current_object == NULL);
- }
-
- void clear() {
- set(NULL);
- }
-private:
- NPObject* current_object;
-};
-
class IcedTeaPluginUtilities
{
@@ -220,8 +165,8 @@
/* Map holding window pointer<->instance relationships */
static std::map<void*, NPP>* instance_map;
- /* Map holding java-side-obj-key->NPObject relationship. */
- static std::map<std::string, NPObjectRef> object_map;
+ /* Map holding java-side-obj-key->NPObject relationship */
+ static std::map<std::string, NPObject*>* object_map;
/* Posts a call in the async call queue */
static bool postPluginThreadAsyncCall(NPP instance, void (*func) (void *), void* data);
@@ -257,8 +202,6 @@
/* Converts the given integer to a string */
static void itoa(int i, std::string* result);
- static std::string stringPrintf(const char* fmt, ...);
-
/* Copies a variant data type into a C++ string */
static std::string NPVariantAsString(NPVariant variant);
@@ -319,9 +262,9 @@
static NPP getInstanceFromMemberPtr(void* member_ptr);
- static NPObjectRef getNPObjectFromJavaKey(std::string key);
+ static NPObject* getNPObjectFromJavaKey(std::string key);
- static void storeObjectMapping(std::string key, NPObjectRef object);
+ static void storeObjectMapping(std::string key, NPObject* object);
static void removeObjectMapping(std::string key);
@@ -330,7 +273,7 @@
static void invalidateInstance(NPP instance);
- static bool isObjectJSArray(NPP instance, NPObjectRef object);
+ static bool isObjectJSArray(NPP instance, NPObject* object);
static void decodeURL(const char* url, char** decoded_url);
diff -r 4d64320525d3 -r bde9b562c85e plugin/icedteanp/IcedTeaScriptablePluginObject.cc
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Wed Oct 16 13:26:09 2013 -0400
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Thu Oct 17 10:32:46 2013 -0400
@@ -306,26 +306,24 @@
//NPIdentifier property = browser_functions.getstringidentifier(property_name.c_str());
- NPObjectRef object;
+ NPObject* obj;
if (isPropertyClass)
{
PLUGIN_DEBUG("Returning package object\n");
- object = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(
+ obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(
IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
property_name.c_str());
}
else
{
PLUGIN_DEBUG("Returning Java object\n");
- object = IcedTeaScriptableJavaObject::get_scriptable_java_object(
+ obj = IcedTeaScriptableJavaObject::get_scriptable_java_object(
IcedTeaPluginUtilities::getInstanceFromMemberPtr(npobj),
*(java_result->return_string), "0", false);
}
- OBJECT_TO_NPVARIANT(object.get(), *result);
- /* Retain because we are returning an NPObject* */
- object.raw_retain();
+ OBJECT_TO_NPVARIANT(obj, *result);
return true;
}
@@ -386,33 +384,32 @@
return np_class;
}
-/* Creates a scriptable java object (intended to be called asynch.) */
-static void
-create_scriptable_java_object_async(void* data)
-{
- PLUGIN_DEBUG("Asynchronously creating object ...\n");
-
- std::vector<void*> parameters = ((AsyncCallThreadData*) data)->parameters;
- NPP instance = (NPP) parameters.at(0);
- NPClass* np_class = (NPClass*) parameters.at(1);
- NPObjectRef* object_ref = (NPObjectRef*) parameters.at(2);
-
- *object_ref = browser_functions.createobject(instance, np_class);
-
- ((AsyncCallThreadData*) data)->result_ready = true;
-}
-
-static NPObjectRef
-create_scriptable_java_object(NPP instance)
+NPObject*
+IcedTeaScriptableJavaObject::get_scriptable_java_object(NPP instance,
+ std::string class_id,
+ std::string instance_id,
+ bool isArray)
{
/* Shared NPClass instance for IcedTeaScriptablePluginObject */
static NPClass np_class = scriptable_java_package_object_class();
+ std::string obj_key = class_id + ":" + instance_id;
+
+ PLUGIN_DEBUG("get_scriptable_java_object searching for %s...\n", obj_key.c_str());
+ IcedTeaScriptableJavaObject* scriptable_object = (IcedTeaScriptableJavaObject*) IcedTeaPluginUtilities::getNPObjectFromJavaKey(obj_key);
+
+ if (scriptable_object != NULL)
+ {
+ PLUGIN_DEBUG("Returning existing object %p\n", scriptable_object);
+ browser_functions.retainobject(scriptable_object);
+ return scriptable_object;
+ }
+
// try to create normally
- NPObjectRef np_object = NPObjectRef::create(instance, &np_class);
+ scriptable_object = (IcedTeaScriptableJavaObject*)browser_functions.createobject(instance, &np_class);
// didn't work? try creating asynch
- if (np_object.empty())
+ if (!scriptable_object)
{
AsyncCallThreadData thread_data = AsyncCallThreadData();
thread_data.result_ready = false;
@@ -421,104 +418,45 @@
thread_data.parameters.push_back(instance);
thread_data.parameters.push_back(&np_class);
- thread_data.parameters.push_back(&np_object);
+ thread_data.parameters.push_back(&scriptable_object);
- IcedTeaPluginUtilities::callAndWaitForResult(instance, &create_scriptable_java_object_async, &thread_data);
+ IcedTeaPluginUtilities::callAndWaitForResult(instance, &_createAndRetainJavaObject, &thread_data);
More information about the distro-pkg-dev
mailing list