/hg/release/icedtea6-1.8: Use variadic macro for plugin debug me...
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Mon Jul 12 15:57:29 PDT 2010
changeset bab376167dbb in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=bab376167dbb
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Jul 12 18:41:55 2010 -0400
Use variadic macro for plugin debug message printing.
diffstat:
8 files changed, 230 insertions(+), 273 deletions(-)
ChangeLog | 11 +
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 16 -
plugin/icedteanp/IcedTeaJavaRequestProcessor.h | 2
plugin/icedteanp/IcedTeaNPPlugin.cc | 214 ++++++++++-----------
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 38 +--
plugin/icedteanp/IcedTeaPluginUtils.cc | 102 +++++-----
plugin/icedteanp/IcedTeaPluginUtils.h | 62 ------
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 58 ++---
diffs (truncated from 1765 to 500 lines):
diff -r 0a636a2e9b0d -r bab376167dbb ChangeLog
--- a/ChangeLog Mon Jul 12 11:13:35 2010 -0400
+++ b/ChangeLog Mon Jul 12 18:41:55 2010 -0400
@@ -1,3 +1,14 @@ 2010-07-12 Jon VanAlten <jon.vanalten at re
+2010-06-14 Deepak Bhole <dbhole at redhat.com>
+
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Use variadic macro
+ for debug message printing.
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.h: Same.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: Same.
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Same.
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: Same.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: Same.
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: Same.
+
2010-07-12 Jon VanAlten <jon.vanalten at redhat.com>
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioDataLine.java
* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioLine.java
diff -r 0a636a2e9b0d -r bab376167dbb plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Mon Jul 12 11:13:35 2010 -0400
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Mon Jul 12 18:41:55 2010 -0400
@@ -179,7 +179,7 @@ JavaRequestProcessor::newMessageOnBus(co
JavaRequestProcessor::JavaRequestProcessor()
{
- PLUGIN_DEBUG_0ARG("JavaRequestProcessor constructor\n");
+ PLUGIN_DEBUG("JavaRequestProcessor constructor\n");
// caller frees this
result = new JavaResultData();
@@ -200,7 +200,7 @@ JavaRequestProcessor::JavaRequestProcess
JavaRequestProcessor::~JavaRequestProcessor()
{
- PLUGIN_DEBUG_0ARG("JavaRequestProcessor::~JavaRequestProcessor\n");
+ PLUGIN_DEBUG("JavaRequestProcessor::~JavaRequestProcessor\n");
if (result)
{
@@ -271,7 +271,7 @@ JavaRequestProcessor::postAndWaitForResp
result->error_msg->append("Error: Timed out when waiting for response");
// Report error
- PLUGIN_DEBUG_1ARG("Error: Timed out when waiting for response to %s\n", message.c_str());
+ PLUGIN_DEBUG("Error: Timed out when waiting for response to %s\n", message.c_str());
}
java_to_plugin_bus->unSubscribe(this);
@@ -847,12 +847,12 @@ createJavaObjectFromVariant(NPP instance
if (NPVARIANT_IS_VOID(variant))
{
- PLUGIN_DEBUG_1ARG("VOID %d\n", variant);
+ PLUGIN_DEBUG("VOID %d\n", variant);
id->append("0");
return; // no need to go further
} else if (NPVARIANT_IS_NULL(variant))
{
- PLUGIN_DEBUG_1ARG("NULL\n", variant);
+ PLUGIN_DEBUG("NULL\n", variant);
id->append("0");
return; // no need to go further
} else if (NPVARIANT_IS_BOOLEAN(variant))
@@ -894,18 +894,18 @@ createJavaObjectFromVariant(NPP instance
NPObject* obj = NPVARIANT_TO_OBJECT(variant);
if (IcedTeaScriptableJavaPackageObject::is_valid_java_object(obj))
{
- PLUGIN_DEBUG_0ARG("NPObject is a Java object\n");
+ PLUGIN_DEBUG("NPObject is a Java object\n");
alreadyCreated = true;
} else
{
- PLUGIN_DEBUG_0ARG("NPObject is not a Java object\n");
+ PLUGIN_DEBUG("NPObject is not a Java object\n");
NPIdentifier length_id = browser_functions.getstringidentifier("length");
// FIXME: We currently only handle <= 2 dim arrays. Do we really need more though?
// Is it an array?
if (IcedTeaPluginUtilities::isObjectJSArray(instance, obj)) {
- PLUGIN_DEBUG_0ARG("NPObject is an array\n");
+ PLUGIN_DEBUG("NPObject is an array\n");
std::string array_id = std::string();
std::string java_array_type = std::string();
diff -r 0a636a2e9b0d -r bab376167dbb plugin/icedteanp/IcedTeaJavaRequestProcessor.h
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.h Mon Jul 12 11:13:35 2010 -0400
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.h Mon Jul 12 18:41:55 2010 -0400
@@ -46,7 +46,7 @@ exception statement from your version. *
#include "IcedTeaNPPlugin.h"
#include "IcedTeaPluginUtils.h"
-#define REQUESTTIMEOUT 120
+#define REQUESTTIMEOUT 10
/*
* This struct holds data specific to a Java operation requested by the plugin
diff -r 0a636a2e9b0d -r bab376167dbb plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jul 12 11:13:35 2010 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jul 12 18:41:55 2010 -0400
@@ -262,7 +262,7 @@ ITNP_New (NPMIMEType pluginType, NPP ins
int16_t argc, char* argn[], char* argv[],
NPSavedData* saved)
{
- PLUGIN_DEBUG_0ARG("ITNP_New\n");
+ PLUGIN_DEBUG("ITNP_New\n");
static NPObject *window_ptr;
NPIdentifier identifier;
@@ -275,7 +275,7 @@ ITNP_New (NPMIMEType pluginType, NPP ins
}
browser_functions.getproperty(instance, window_ptr, identifier, &member_ptr);
- PLUGIN_DEBUG_1ARG("Got variant %p\n", &member_ptr);
+ PLUGIN_DEBUG("Got variant %p\n", &member_ptr);
NPError np_error = NPERR_NO_ERROR;
@@ -395,12 +395,12 @@ ITNP_New (NPMIMEType pluginType, NPP ins
documentbase = NULL;
// store an identifier for this plugin
- PLUGIN_DEBUG_2ARG("Mapping id %d and instance %p\n", instance_counter, instance);
+ PLUGIN_DEBUG("Mapping id %d and instance %p\n", instance_counter, instance);
g_hash_table_insert(instance_to_id_map, instance, GINT_TO_POINTER(instance_counter));
g_hash_table_insert(id_to_instance_map, GINT_TO_POINTER(instance_counter), instance);
instance_counter++;
- PLUGIN_DEBUG_0ARG ("ITNP_New return\n");
+ PLUGIN_DEBUG ("ITNP_New return\n");
return np_error;
}
@@ -415,16 +415,16 @@ void start_jvm_if_needed()
GMutex *vm_start_mutex = g_mutex_new();
g_mutex_lock(vm_start_mutex);
- PLUGIN_DEBUG_0ARG("Checking JVM status...\n");
+ PLUGIN_DEBUG("Checking JVM status...\n");
// If the jvm is already up, do nothing
if (jvm_up)
{
- PLUGIN_DEBUG_0ARG("JVM is up. Returning.\n");
+ PLUGIN_DEBUG("JVM is up. Returning.\n");
return;
}
- PLUGIN_DEBUG_0ARG("No JVM is running. Attempting to start one...\n");
+ PLUGIN_DEBUG("No JVM is running. Attempting to start one...\n");
NPError np_error = NPERR_NO_ERROR;
ITNPPluginData* data = NULL;
@@ -447,14 +447,14 @@ void start_jvm_if_needed()
// clean up any older pip
unlink (in_pipe_name);
- PLUGIN_DEBUG_1ARG ("ITNP_New: creating input fifo: %s\n", in_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: creating input fifo: %s\n", in_pipe_name);
if (mkfifo (in_pipe_name, 0600) == -1 && errno != EEXIST)
{
PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
np_error = NPERR_GENERIC_ERROR;
goto cleanup_in_pipe_name;
}
- PLUGIN_DEBUG_1ARG ("ITNP_New: created input fifo: %s\n", in_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: created input fifo: %s\n", in_pipe_name);
// Create plugin-to-appletviewer pipe which we refer to as the
// output pipe.
@@ -473,14 +473,14 @@ void start_jvm_if_needed()
// clean up any older pip
unlink (out_pipe_name);
- PLUGIN_DEBUG_1ARG ("ITNP_New: creating output fifo: %s\n", out_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: creating output fifo: %s\n", out_pipe_name);
if (mkfifo (out_pipe_name, 0600) == -1 && errno != EEXIST)
{
PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
np_error = NPERR_GENERIC_ERROR;
goto cleanup_out_pipe_name;
}
- PLUGIN_DEBUG_1ARG ("ITNP_New: created output fifo: %s\n", out_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: created output fifo: %s\n", out_pipe_name);
// Start a separate appletviewer process for each applet, even if
// there are multiple applets in the same page. We may need to
@@ -571,9 +571,9 @@ void start_jvm_if_needed()
// cleanup_out_pipe:
// Delete output pipe.
- PLUGIN_DEBUG_1ARG ("ITNP_New: deleting input fifo: %s\n", in_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: deleting input fifo: %s\n", in_pipe_name);
unlink (out_pipe_name);
- PLUGIN_DEBUG_1ARG ("ITNP_New: deleted input fifo: %s\n", in_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: deleted input fifo: %s\n", in_pipe_name);
cleanup_out_pipe_name:
g_free (out_pipe_name);
@@ -581,9 +581,9 @@ void start_jvm_if_needed()
// cleanup_in_pipe:
// Delete input pipe.
- PLUGIN_DEBUG_1ARG ("ITNP_New: deleting output fifo: %s\n", out_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: deleting output fifo: %s\n", out_pipe_name);
unlink (in_pipe_name);
- PLUGIN_DEBUG_1ARG ("ITNP_New: deleted output fifo: %s\n", out_pipe_name);
+ PLUGIN_DEBUG ("ITNP_New: deleted output fifo: %s\n", out_pipe_name);
cleanup_in_pipe_name:
g_free (in_pipe_name);
@@ -599,7 +599,7 @@ NPError
NPError
ITNP_GetValue (NPP instance, NPPVariable variable, void* value)
{
- PLUGIN_DEBUG_0ARG ("ITNP_GetValue\n");
+ PLUGIN_DEBUG ("ITNP_GetValue\n");
NPError np_error = NPERR_NO_ERROR;
@@ -608,7 +608,7 @@ ITNP_GetValue (NPP instance, NPPVariable
// This plugin needs XEmbed support.
case NPPVpluginNeedsXEmbed:
{
- PLUGIN_DEBUG_0ARG ("ITNP_GetValue: returning TRUE for NeedsXEmbed.\n");
+ PLUGIN_DEBUG ("ITNP_GetValue: returning TRUE for NeedsXEmbed.\n");
bool* bool_value = (bool*) value;
*bool_value = true;
}
@@ -624,7 +624,7 @@ ITNP_GetValue (NPP instance, NPPVariable
break;
}
- PLUGIN_DEBUG_0ARG ("ITNP_GetValue return\n");
+ PLUGIN_DEBUG ("ITNP_GetValue return\n");
return np_error;
}
@@ -632,7 +632,7 @@ NPError
NPError
ITNP_Destroy (NPP instance, NPSavedData** save)
{
- PLUGIN_DEBUG_1ARG ("ITNP_Destroy %p\n", instance);
+ PLUGIN_DEBUG ("ITNP_Destroy %p\n", instance);
ITNPPluginData* data = (ITNPPluginData*) instance->pdata;
@@ -649,7 +649,7 @@ ITNP_Destroy (NPP instance, NPSavedData*
IcedTeaPluginUtilities::invalidateInstance(instance);
- PLUGIN_DEBUG_0ARG ("ITNP_Destroy return\n");
+ PLUGIN_DEBUG ("ITNP_Destroy return\n");
return NPERR_NO_ERROR;
}
@@ -657,7 +657,7 @@ NPError
NPError
ITNP_SetWindow (NPP instance, NPWindow* window)
{
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow\n");
if (instance == NULL)
{
@@ -679,7 +679,7 @@ ITNP_SetWindow (NPP instance, NPWindow*
// Simply return if we receive a NULL window.
if ((window == NULL) || (window->window == NULL))
{
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: got NULL window.\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow: got NULL window.\n");
return NPERR_NO_ERROR;
}
@@ -690,7 +690,7 @@ ITNP_SetWindow (NPP instance, NPWindow*
if (data->window_handle == window->window)
{
// The parent window is the same as in previous calls.
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: window already exists.\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow: window already exists.\n");
// Critical region. Read data->appletviewer_mutex and send
// a message to the appletviewer.
@@ -704,7 +704,7 @@ ITNP_SetWindow (NPP instance, NPWindow*
// SetWindow call.
if (window->width != data->window_width)
{
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: window width changed.\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow: window width changed.\n");
// The width of the plugin window has changed.
// Store the new width.
@@ -714,7 +714,7 @@ ITNP_SetWindow (NPP instance, NPWindow*
if (window->height != data->window_height)
{
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: window height changed.\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow: window height changed.\n");
// The height of the plugin window has changed.
// Store the new height.
@@ -736,7 +736,7 @@ ITNP_SetWindow (NPP instance, NPWindow*
else
{
// The appletviewer is not running.
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: appletviewer is not running.\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow: appletviewer is not running.\n");
}
g_mutex_unlock (data->appletviewer_mutex);
@@ -745,12 +745,12 @@ ITNP_SetWindow (NPP instance, NPWindow*
{
// The parent window has changed. This branch does run but
// doing nothing in response seems to be sufficient.
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: parent window changed.\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow: parent window changed.\n");
}
}
else
{
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow: setting window.\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow: setting window.\n");
// Critical region. Send messages to appletviewer.
g_mutex_lock (data->appletviewer_mutex);
@@ -774,7 +774,7 @@ ITNP_SetWindow (NPP instance, NPWindow*
data->window_handle = window->window;
}
- PLUGIN_DEBUG_0ARG ("ITNP_SetWindow return\n");
+ PLUGIN_DEBUG ("ITNP_SetWindow return\n");
return NPERR_NO_ERROR;
}
@@ -783,9 +783,9 @@ ITNP_NewStream (NPP instance, NPMIMEType
ITNP_NewStream (NPP instance, NPMIMEType type, NPStream* stream,
NPBool seekable, uint16_t* stype)
{
- PLUGIN_DEBUG_0ARG ("ITNP_NewStream\n");
+ PLUGIN_DEBUG ("ITNP_NewStream\n");
- PLUGIN_DEBUG_0ARG ("ITNP_NewStream return\n");
+ PLUGIN_DEBUG ("ITNP_NewStream return\n");
return NPERR_NO_ERROR;
}
@@ -793,17 +793,17 @@ void
void
ITNP_StreamAsFile (NPP instance, NPStream* stream, const char* filename)
{
- PLUGIN_DEBUG_0ARG ("ITNP_StreamAsFile\n");
+ PLUGIN_DEBUG ("ITNP_StreamAsFile\n");
- PLUGIN_DEBUG_0ARG ("ITNP_StreamAsFile return\n");
+ PLUGIN_DEBUG ("ITNP_StreamAsFile return\n");
}
NPError
ITNP_DestroyStream (NPP instance, NPStream* stream, NPReason reason)
{
- PLUGIN_DEBUG_0ARG ("ITNP_DestroyStream\n");
+ PLUGIN_DEBUG ("ITNP_DestroyStream\n");
- PLUGIN_DEBUG_0ARG ("ITNP_DestroyStream return\n");
+ PLUGIN_DEBUG ("ITNP_DestroyStream return\n");
return NPERR_NO_ERROR;
}
@@ -811,9 +811,9 @@ int32_t
int32_t
ITNP_WriteReady (NPP instance, NPStream* stream)
{
- PLUGIN_DEBUG_0ARG ("ITNP_WriteReady\n");
+ PLUGIN_DEBUG ("ITNP_WriteReady\n");
- PLUGIN_DEBUG_0ARG ("ITNP_WriteReady return\n");
+ PLUGIN_DEBUG ("ITNP_WriteReady return\n");
return 0;
}
@@ -822,9 +822,9 @@ ITNP_Write (NPP instance, NPStream* stre
ITNP_Write (NPP instance, NPStream* stream, int32_t offset, int32_t len,
void* buffer)
{
- PLUGIN_DEBUG_0ARG ("ITNP_Write\n");
+ PLUGIN_DEBUG ("ITNP_Write\n");
- PLUGIN_DEBUG_0ARG ("ITNP_Write return\n");
+ PLUGIN_DEBUG ("ITNP_Write return\n");
return 0;
}
@@ -832,17 +832,17 @@ void
void
ITNP_Print (NPP instance, NPPrint* platformPrint)
{
- PLUGIN_DEBUG_0ARG ("ITNP_Print\n");
+ PLUGIN_DEBUG ("ITNP_Print\n");
- PLUGIN_DEBUG_0ARG ("ITNP_Print return\n");
+ PLUGIN_DEBUG ("ITNP_Print return\n");
}
int16_t
ITNP_HandleEvent (NPP instance, void* event)
{
- PLUGIN_DEBUG_0ARG ("ITNP_HandleEvent\n");
+ PLUGIN_DEBUG ("ITNP_HandleEvent\n");
- PLUGIN_DEBUG_0ARG ("ITNP_HandleEvent return\n");
+ PLUGIN_DEBUG ("ITNP_HandleEvent return\n");
return 0;
}
@@ -851,9 +851,9 @@ ITNP_URLNotify (NPP instance, const char
ITNP_URLNotify (NPP instance, const char* url, NPReason reason,
void* notifyData)
{
- PLUGIN_DEBUG_0ARG ("ITNP_URLNotify\n");
+ PLUGIN_DEBUG ("ITNP_URLNotify\n");
- PLUGIN_DEBUG_0ARG ("ITNP_URLNotify return\n");
+ PLUGIN_DEBUG ("ITNP_URLNotify return\n");
}
NPError
@@ -924,7 +924,7 @@ static void
static void
plugin_data_new (ITNPPluginData** data)
{
- PLUGIN_DEBUG_0ARG ("plugin_data_new\n");
+ PLUGIN_DEBUG ("plugin_data_new\n");
*data = (ITNPPluginData*)
(*browser_functions.memalloc) (sizeof (struct ITNPPluginData));
@@ -933,7 +933,7 @@ plugin_data_new (ITNPPluginData** data)
if (*data)
memset (*data, 0, sizeof (struct ITNPPluginData));
- PLUGIN_DEBUG_0ARG ("plugin_data_new return\n");
+ PLUGIN_DEBUG ("plugin_data_new return\n");
}
@@ -948,7 +948,7 @@ static gchar*
static gchar*
plugin_get_documentbase (NPP instance)
{
- PLUGIN_DEBUG_0ARG ("plugin_get_documentbase\n");
+ PLUGIN_DEBUG ("plugin_get_documentbase\n");
nsIPluginInstance* xpcom_instance = NULL;
nsIPluginInstancePeer* peer = NULL;
@@ -1000,16 +1000,16 @@ plugin_get_documentbase (NPP instance)
NS_RELEASE (peer);
cleanup_done:
- PLUGIN_DEBUG_0ARG ("plugin_get_documentbase return\n");
+ PLUGIN_DEBUG ("plugin_get_documentbase return\n");
- PLUGIN_DEBUG_1ARG("plugin_get_documentbase returning: %s\n", documentbase_copy);
+ PLUGIN_DEBUG("plugin_get_documentbase returning: %s\n", documentbase_copy);
return documentbase_copy;
}
#else
static gchar*
plugin_get_documentbase (NPP instance)
{
- PLUGIN_DEBUG_0ARG ("plugin_get_documentbase\n");
+ PLUGIN_DEBUG ("plugin_get_documentbase\n");
char const* documentbase = NULL;
gchar* documentbase_copy = NULL;
@@ -1053,8 +1053,8 @@ plugin_get_documentbase (NPP instance)
browser_functions.releasevariantvalue(&href);
browser_functions.releasevariantvalue(&location);
cleanup_done:
- PLUGIN_DEBUG_0ARG ("plugin_get_documentbase return\n");
- PLUGIN_DEBUG_1ARG("plugin_get_documentbase returning: %s\n", documentbase_copy);
+ PLUGIN_DEBUG ("plugin_get_documentbase return\n");
+ PLUGIN_DEBUG("plugin_get_documentbase returning: %s\n", documentbase_copy);
return documentbase_copy;
}
@@ -1067,7 +1067,7 @@ plugin_display_failure_dialog ()
{
GtkWidget* dialog = NULL;
- PLUGIN_DEBUG_0ARG ("plugin_display_failure_dialog\n");
+ PLUGIN_DEBUG ("plugin_display_failure_dialog\n");
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1079,7 +1079,7 @@ plugin_display_failure_dialog ()
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
- PLUGIN_DEBUG_0ARG ("plugin_display_failure_dialog return\n");
+ PLUGIN_DEBUG ("plugin_display_failure_dialog return\n");
}
More information about the distro-pkg-dev
mailing list