changeset in /hg/icedtea6: Added a JNI communication bridge betw...
Deepak Bhole
dbhole at redhat.com
Mon Aug 25 12:15:36 PDT 2008
changeset 1be4e928200c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1be4e928200c
description:
Added a JNI communication bridge between C++ and Java (commented out for now,
to maintain stability from TCP)
Updated processing model to handle requests in different threads, so that
recursuve JS->JAVA->JS calls work (e.g.:
http://www.javasonics.com/support/run_liveconnect.php?mayscript)
Other bug fixes to fix exceptions and hangs
diffstat:
2 files changed, 2516 insertions(+), 1325 deletions(-)
IcedTeaPlugin.cc | 1159 ++++++++++++---
patches/icedtea-liveconnect.patch | 2682 +++++++++++++++++++++----------------
diffs (truncated from 4773 to 500 lines):
diff -r 1842897fe307 -r 1be4e928200c IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc Thu Aug 21 13:02:39 2008 +0200
+++ b/IcedTeaPlugin.cc Mon Aug 25 15:15:30 2008 -0400
@@ -134,6 +134,8 @@ private:
#define PLUGIN_TRACE_INSTANCE() Trace _trace ("Instance::", __func__)
#define PLUGIN_TRACE_EVENTSINK() Trace _trace ("EventSink::", __func__)
#define PLUGIN_TRACE_LISTENER() Trace _trace ("Listener::", __func__)
+//#define PLUGIN_TRACE_RC() Trace _trace ("ResultContainer::", __func__)
+#define PLUGIN_TRACE_RC()
// Error reporting macros.
#define PLUGIN_ERROR(message) \
@@ -242,6 +244,7 @@ static GError* channel_error = NULL;
static GError* channel_error = NULL;
// Fully-qualified appletviewer executable.
static char* appletviewer_executable = NULL;
+static char* libjvm_so = NULL;
#include <nspr.h>
@@ -301,11 +304,20 @@ char const* TYPES[10] = { "Object",
"void" };
// FIXME: create index from security context.
-#define MESSAGE_CREATE() \
+#define MESSAGE_CREATE(reference) \
nsCString message ("context "); \
message.AppendInt (0); \
- message += " "; \
- message += __func__;
+ message += " reference "; \
+ message.AppendInt (reference); \
+ message += " "; \
+ message += __func__; \
+ if (factory->resultMap[reference] == NULL) { \
+ factory->resultMap[reference] = new ResultContainer(); \
+ printf("ResultMap created -- %p %d\n", factory->resultMap[reference], factory->resultMap[reference]->returnIdentifier); \
+ } \
+ else \
+ factory->resultMap[reference]->Clear();
+
#define MESSAGE_ADD_STRING(name) \
message += " "; \
@@ -363,55 +375,60 @@ char const* TYPES[10] = { "Object",
#define MESSAGE_SEND() \
factory->SendMessageToAppletViewer (message);
-#define MESSAGE_RECEIVE_REFERENCE(cast, name) \
+
+#define PROCESS_PENDING_EVENTS \
+ PRBool hasPending; \
+ factory->current->HasPendingEvents(&hasPending); \
+ if (hasPending == PR_TRUE) { \
+ PRBool processed = PR_FALSE; \
+ factory->current->ProcessNextEvent(PR_TRUE, &processed); \
+ } else { \
+ PR_Sleep(PR_INTERVAL_NO_WAIT); \
+ }
+
+#define MESSAGE_RECEIVE_REFERENCE(reference, cast, name) \
+ nsresult res = NS_OK; \
+ printf ("RECEIVE 1\n"); \
+ while (factory->resultMap[reference]->returnIdentifier == -1) \
+ { \
+ PROCESS_PENDING_EVENTS; \
+ } \
+ printf ("RECEIVE 3\n"); \
+ if (factory->resultMap[reference]->returnIdentifier == 0) \
+ { \
+ *name = NULL; \
+ } else { \
+ *name = \
+ reinterpret_cast<cast> \
+ (factory->references.ReferenceObject (factory->resultMap[reference]->returnIdentifier)); \
+ } \
+ printf ("RECEIVE_REFERENCE: %s result: %x = %d\n", \
+ __func__, *name, factory->resultMap[reference]->returnIdentifier);
+
+// FIXME: track and free JNIIDs.
+#define MESSAGE_RECEIVE_ID(reference, cast, id, signature) \
PRBool processed = PR_FALSE; \
nsresult res = NS_OK; \
- factory->returnIdentifier = -1; \
- printf ("RECEIVE 1\n"); \
- while (factory->returnIdentifier == -1) \
+ printf("RECEIVE ID 1\n"); \
+ while (factory->resultMap[reference]->returnIdentifier == -1) \
{ \
- printf ("RECEIVE 2\n"); \
- res = factory->current->ProcessNextEvent (PR_TRUE, \
- &processed); \
- PLUGIN_CHECK_RETURN (__func__, res); \
+ PROCESS_PENDING_EVENTS; \
} \
- printf ("RECEIVE 3\n"); \
- *name = \
- reinterpret_cast<cast> \
- (factory->references.ReferenceObject (factory->returnIdentifier)); \
- printf ("RECEIVE_REFERENCE: %s result: %x = %d\n", \
- __func__, *name, factory->returnIdentifier);
-
-// FIXME: track and free JNIIDs.
-#define MESSAGE_RECEIVE_ID(cast, id, signature) \
- PRBool processed = PR_FALSE; \
- nsresult result = NS_OK; \
- factory->returnIdentifier = -1; \
- while (factory->returnIdentifier == -1) \
- { \
- result = factory->current->ProcessNextEvent (PR_TRUE, \
- &processed); \
- PLUGIN_CHECK_RETURN (__func__, result); \
- } \
- \
+ \
*id = reinterpret_cast<cast> \
- (new JNIID (factory->returnIdentifier, signature));
-// \
-// printf ("RECEIVE_ID: %s result: %x = %d, %s\n", \
-// __func__, *id, factory->returnIdentifier, \
-// signature);
-
-#define MESSAGE_RECEIVE_VALUE(type, result) \
- PRBool processed = PR_FALSE; \
- nsresult res = NS_OK; \
- factory->returnValue = ""; \
- while (factory->returnValue == "") \
- { \
- res = factory->current->ProcessNextEvent (PR_TRUE, \
- &processed); \
- PLUGIN_CHECK_RETURN (__func__, res); \
- } \
- *result = ParseValue (type, factory->returnValue);
+ (new JNIID (factory->resultMap[reference]->returnIdentifier, signature)); \
+ printf ("RECEIVE_ID: %s result: %x = %d, %s\n", \
+ __func__, *id, factory->resultMap[reference]->returnIdentifier, \
+ signature);
+
+#define MESSAGE_RECEIVE_VALUE(reference, ctype, result) \
+ nsresult res = NS_OK; \
+ printf("RECEIVE VALUE 1\n"); \
+ while (factory->resultMap[reference]->returnValue == "") \
+ { \
+ PROCESS_PENDING_EVENTS; \
+ } \
+ *result = ParseValue (type, factory->resultMap[reference]->returnValue);
// \
// char* valueString = ValueString (type, *result); \
// printf ("RECEIVE_VALUE: %s result: %x = %s\n", \
@@ -419,72 +436,70 @@ char const* TYPES[10] = { "Object",
// free (valueString); \
// valueString = NULL;
-#define MESSAGE_RECEIVE_SIZE(result) \
+#define MESSAGE_RECEIVE_SIZE(reference, result) \
PRBool processed = PR_FALSE; \
nsresult res = NS_OK; \
- factory->returnValue = ""; \
- while (factory->returnValue == "") \
+ printf("RECEIVE SIZE 1\n"); \
+ while (factory->resultMap[reference]->returnValue == "") \
{ \
- res = factory->current->ProcessNextEvent (PR_TRUE, \
- &processed); \
- PLUGIN_CHECK_RETURN (__func__, res); \
+ PROCESS_PENDING_EVENTS; \
} \
nsresult conversionResult; \
- *result = factory->returnValue.ToInteger (&conversionResult); \
+ *result = factory->resultMap[reference]->returnValue.ToInteger (&conversionResult); \
PLUGIN_CHECK ("parse integer", conversionResult);
// \
// printf ("RECEIVE_SIZE: %s result: %x = %d\n", \
// __func__, result, *result);
// strdup'd string must be freed by calling function.
-#define MESSAGE_RECEIVE_STRING(char_type, result) \
+#define MESSAGE_RECEIVE_STRING(reference, char_type, result) \
PRBool processed = PR_FALSE; \
nsresult res = NS_OK; \
- factory->returnValue = ""; \
- while (factory->returnValue == "") \
+ printf("RECEIVE STRING 1\n"); \
+ while (factory->resultMap[reference]->returnValue == "") \
{ \
- res = factory->current->ProcessNextEvent (PR_TRUE, \
- &processed); \
- PLUGIN_CHECK_RETURN (__func__, res); \
+ PROCESS_PENDING_EVENTS; \
} \
+ printf("Setting result to: %s\n", strdup (factory->resultMap[reference]->returnValue.get ())); \
*result = reinterpret_cast<char_type const*> \
- (strdup (factory->returnValue.get ()));
+ (strdup (factory->resultMap[reference]->returnValue.get ()));
// \
// printf ("RECEIVE_STRING: %s result: %x = %s\n", \
// __func__, result, *result);
// strdup'd string must be freed by calling function.
-#define MESSAGE_RECEIVE_STRING_UCS(result) \
+#define MESSAGE_RECEIVE_STRING_UCS(reference, result) \
PRBool processed = PR_FALSE; \
nsresult res = NS_OK; \
- factory->returnValueUCS.Truncate (); \
- while (factory->returnValueUCS.IsEmpty ()) \
+ printf("RECEIVE STRING UCS 1\n"); \
+ while (factory->resultMap[reference]->returnValueUCS.IsEmpty()) \
{ \
- res = factory->current->ProcessNextEvent (PR_TRUE, \
- &processed); \
- PLUGIN_CHECK_RETURN (__func__, res); \
+ PROCESS_PENDING_EVENTS; \
} \
- int length = factory->returnValueUCS.Length (); \
+ int length = factory->resultMap[reference]->returnValueUCS.Length (); \
jchar* newstring = static_cast<jchar*> (PR_Malloc (length)); \
memset (newstring, 0, length); \
- memcpy (newstring, factory->returnValueUCS.get (), length); \
+ memcpy (newstring, factory->resultMap[reference]->returnValueUCS.get (), length); \
+ std::cout << "Setting result to: " << factory->resultMap[reference]->returnValueUCS.get() << std::endl; \
*result = static_cast<jchar const*> (newstring);
// \
// printf ("RECEIVE_STRING: %s result: %x = %s\n", \
// __func__, result, *result);
-#define MESSAGE_RECEIVE_BOOLEAN(result) \
+#define MESSAGE_RECEIVE_BOOLEAN(reference, result) \
PRBool processed = PR_FALSE; \
nsresult res = NS_OK; \
- factory->returnIdentifier = -1; \
- while (factory->returnIdentifier == -1) \
+ printf("RECEIVE BOOLEAN 1\n"); \
+ while (factory->resultMap[reference]->returnIdentifier == -1) \
{ \
- res = factory->current->ProcessNextEvent (PR_TRUE, \
- &processed); \
- PLUGIN_CHECK_RETURN (__func__, res); \
+ PROCESS_PENDING_EVENTS; \
} \
- *result = factory->returnIdentifier;
+ *result = factory->resultMap[reference]->returnIdentifier;
+// res = factory->current->ProcessNextEvent (PR_TRUE, \
+// &processed); \
+// PLUGIN_CHECK_RETURN (__func__, res); \
+
// \
// printf ("RECEIVE_BOOLEAN: %s result: %x = %s\n", \
// __func__, result, *result ? "true" : "false");
@@ -524,6 +539,8 @@ extern "C" NS_EXPORT nsresult NSGetFacto
#include <nsCOMPtr.h>
#include <nsILocalFile.h>
#include <prthread.h>
+#include <queue>
+#include <nsIEventTarget.h>
// // FIXME: I had to hack dist/include/xpcom/xpcom-config.h to comment
// // out this line: #define HAVE_CPP_2BYTE_WCHAR_T 1 so that
// // nsStringAPI.h would not trigger a compilation assertion failure:
@@ -625,8 +642,50 @@ ReferenceHashtable::UnreferenceObject (P
}
}
+class ResultContainer
+{
+ public:
+ ResultContainer();
+ ~ResultContainer();
+ void Clear();
+ PRUint32 returnIdentifier;
+ nsCString returnValue;
+ nsString returnValueUCS;
+
+};
+
+ResultContainer::ResultContainer ()
+{
+ PLUGIN_TRACE_RC();
+
+ returnIdentifier = -1;
+ returnValue.Truncate();
+ returnValueUCS.Truncate();
+}
+
+ResultContainer::~ResultContainer ()
+{
+ PLUGIN_TRACE_RC();
+
+ returnIdentifier = -1;
+ returnValue.Truncate();
+ returnValueUCS.Truncate();
+}
+
+void
+ResultContainer::Clear()
+{
+ PLUGIN_TRACE_RC();
+
+ returnIdentifier = -1;
+ returnValue.Truncate();
+ returnValueUCS.Truncate();
+}
+
#include <nsTArray.h>
#include <nsILiveconnect.h>
+#include <nsIProcess.h>
+#include <map>
class IcedTeaJNIEnv;
@@ -667,16 +726,17 @@ public:
nsresult SetTransport (nsISocketTransport* transport);
void Connected ();
void Disconnected ();
+// PRUint32 returnIdentifier;
+// nsCString returnValue;
+// nsString returnValueUCS;
PRBool IsConnected ();
nsCOMPtr<nsIAsyncInputStream> async;
nsCOMPtr<nsIThread> current;
- PRUint32 returnIdentifier;
- nsCString returnValue;
- nsString returnValueUCS;
ReferenceHashtable references;
// FIXME: make private?
JNIEnv* proxyEnv;
nsISecureEnv* secureEnv;
+ std::map<PRUint32,ResultContainer*> resultMap;
void GetMember ();
void SetMember ();
void GetSlot ();
@@ -693,24 +753,52 @@ private:
nsresult TestAppletviewer ();
void DisplayFailureDialog ();
nsresult StartAppletviewer ();
+ void ProcessMessage();
+ void ConsumeMsgFromJVM();
+ nsCOMPtr<nsIThread> processThread;
nsCOMPtr<IcedTeaEventSink> sink;
nsCOMPtr<nsISocketTransport> transport;
nsCOMPtr<nsIInputStream> input;
nsCOMPtr<nsIOutputStream> output;
+ nsCOMPtr<nsIProcess> applet_viewer_process;
PRBool connected;
PRUint32 next_instance_identifier;
// Does not do construction/deconstruction or reference counting.
nsDataHashtable<nsUint32HashKey, IcedTeaPluginInstance*> instances;
PRUint32 object_identifier_return;
+ PRMonitor *jvmMsgQueuePRMonitor;
+ std::queue<nsCString> jvmMsgQueue;
int javascript_identifier;
int name_identifier;
int args_identifier;
int string_identifier;
int slot_index;
int value_identifier;
+ PRBool shutting_down;
+
+/**
+ * JNI I/O related code
+ *
+
+ void WriteToJVM(nsCString& message);
+ void InitJVM();
+ void ReadFromJVM();
+
+ PRMonitor *jvmPRMonitor;
+ nsCOMPtr<nsIThread> readThread;
+ JavaVM *jvm;
+ JNIEnv *javaEnv;
+ jclass javaPluginClass;
+ jobject javaPluginObj;
+ jmethodID getMessageMID;
+ jmethodID postMessageMID;
+
+ */
+
};
class IcedTeaEventSink;
+
class IcedTeaPluginInstance : public nsIPluginInstance,
public nsIJVMPluginInstance
@@ -726,6 +814,7 @@ public:
void GetWindow ();
nsIPluginInstancePeer* peer;
+ PRBool initialized;
private:
@@ -738,12 +827,15 @@ private:
PRUint32 instance_identifier;
nsCString instanceIdentifierPrefix;
};
+
#include <nsISocketProviderService.h>
#include <nsISocketProvider.h>
#include <nsIServerSocket.h>
#include <nsIComponentManager.h>
#include <nsIPluginInstance.h>
+#include <sys/types.h>
+#include <sys/stat.h>
class IcedTeaSocketListener : public nsIServerSocketListener
{
@@ -1013,6 +1105,12 @@ private:
~IcedTeaJNIEnv ();
IcedTeaPluginFactory* factory;
+
+ PRMonitor *contextCounterPRMonitor;
+
+ int IncrementContextCounter();
+ void DecrementContextCounter();
+ int contextCounter;
};
NS_IMPL_ISUPPORTS6 (IcedTeaPluginFactory, nsIFactory, nsIPlugin, nsIJVMManager,
@@ -1029,7 +1127,8 @@ IcedTeaPluginFactory::IcedTeaPluginFacto
slot_index (0),
value_identifier (0),
connected (PR_FALSE),
- liveconnect (0)
+ liveconnect (0),
+ shutting_down(PR_FALSE)
{
PLUGIN_TRACE_FACTORY ();
instances.Init ();
@@ -1101,6 +1200,11 @@ IcedTeaPluginFactory::Initialize ()
getter_AddRefs (liveconnect));
PLUGIN_CHECK_RETURN ("liveconnect", result);
+/*
+ * Socket initialization code for TCP/IP communication
+ *
+ */
+
nsCOMPtr<nsIServerSocket> socket;
result = manager->CreateInstanceByContractID (NS_SERVERSOCKET_CONTRACTID,
nsnull,
@@ -1110,11 +1214,21 @@ IcedTeaPluginFactory::Initialize ()
// FIXME: hard-coded port
result = socket->Init (50007, PR_TRUE, -1);
+
+
PLUGIN_CHECK_RETURN ("socket init", result);
nsCOMPtr<IcedTeaSocketListener> listener = new IcedTeaSocketListener (this);
result = socket->AsyncListen (listener);
PLUGIN_CHECK_RETURN ("add socket listener", result);
+
+/**
+ * JNI I/O code
+
+ // Initialize mutex to control access to the jvm
+ jvmPRMonitor = PR_NewMonitor();
+*/
+ jvmMsgQueuePRMonitor = PR_NewMonitor();
result = StartAppletviewer ();
PLUGIN_CHECK_RETURN ("started appletviewer", result);
@@ -1128,6 +1242,12 @@ IcedTeaPluginFactory::Initialize ()
result = threadManager->GetCurrentThread (getter_AddRefs (current));
PLUGIN_CHECK_RETURN ("current thread", result);
+/*
+ *
+ * Socket related code for TCP/IP communication
+ *
+ */
+
PLUGIN_DEBUG ("Instance::Initialize: awaiting connection from appletviewer");
PRBool processed;
// FIXME: move this somewhere applet-window specific so it doesn't block page
@@ -1156,14 +1276,44 @@ IcedTeaPluginFactory::Initialize ()
result = async->AsyncWait (this, 0, 0, current);
PLUGIN_CHECK_RETURN ("add async wait", result);
- return result;
+ return NS_OK;
}
NS_IMETHODIMP
IcedTeaPluginFactory::Shutdown ()
{
- NOT_IMPLEMENTED ();
- return NS_ERROR_NOT_IMPLEMENTED;
+ shutting_down = PR_TRUE;
+
+ nsCString shutdownStr("shutdown");
+ SendMessageToAppletViewer(shutdownStr);
+
+ // wake up process thread to tell it to shutdown
+ PRThread *prThread;
+ processThread->GetPRThread(&prThread);
+ printf("Interrupting process thread...");
+ PRStatus res = PR_Interrupt(prThread);
More information about the distro-pkg-dev
mailing list