/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Oct 25 03:16:31 PDT 2013
changeset 00db867f53be in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=00db867f53be
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 25 09:43:24 2013 +0200
OutputController.getCallerClass now gets out also from sun.applet.PluginDebug class.
changeset bdbeab87f803 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bdbeab87f803
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 25 11:10:25 2013 +0200
All output messages redirected to PLUGIN_{DEBUG,ERROR} macros
changeset cdb796a6195b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cdb796a6195b
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Oct 25 12:19:15 2013 +0200
Plugin debug can now be controlled from itw_settings, in same way java side. For now ICEDTEAPLUGIN_DEBUG on the debug in same way as deployment.log itw-settings property. Individual logging streams are controlled by deployment.log.{headers,file,stdstreams,system} System and file are not yet fully done (same as java side in this moment). Streams are true, all others false by default.
* plugin/icedteanp/IcedTeaNPPlugin.cc: initialized variables new bool variables (debug_initiated), (plugin_debug_headers), (plugin_debug_to_file), (plugin_debug_to_system) as false and (plugin_debug_to_streams) as true.
* plugin/icedteanp/IcedTeaNPPlugin.h: above variables declared as extern * plugin/icedteanp/IcedTeaParseProperties.cc: initialization of (default_file_ITW_deploy_props_name) and (custom_jre_key) moved here from IcedTeaNPPlugin.h. New method (read_bool_property) and its more concrete shortcuts (is_debug_on) (is_debug_header_on) (is_logging_to_file) (is_logging_to_stds) (is_logging_to_system) implemented to access properties.
* plugin/icedteanp/IcedTeaParseProperties.h: above methods declared.
* plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_{ERROR,DEBUG}) methods adapted headers/debug/streams logic as described in title. Headers made more informative (like java side)
* tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on) extended to TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_off).TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off) extended to TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_off), and new testsTEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_on) TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_on) (100x slower then without headers)
diffstat:
ChangeLog | 50 ++++++
netx/net/sourceforge/jnlp/util/logging/OutputController.java | 4 +-
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc | 20 +-
plugin/icedteanp/IcedTeaNPPlugin.cc | 17 +-
plugin/icedteanp/IcedTeaNPPlugin.h | 7 +-
plugin/icedteanp/IcedTeaParseProperties.cc | 36 ++++-
plugin/icedteanp/IcedTeaParseProperties.h | 9 +-
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc | 6 +-
plugin/icedteanp/IcedTeaPluginUtils.cc | 6 +-
plugin/icedteanp/IcedTeaPluginUtils.h | 70 +++++++--
plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 40 ++--
plugin/icedteanp/IcedTeaScriptablePluginObject.h | 6 +-
tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc | 88 ++++++++++++
13 files changed, 293 insertions(+), 66 deletions(-)
diffs (truncated from 798 to 500 lines):
diff -r 2ab117a919e5 -r cdb796a6195b ChangeLog
--- a/ChangeLog Thu Oct 24 10:11:37 2013 -0400
+++ b/ChangeLog Fri Oct 25 12:19:15 2013 +0200
@@ -1,3 +1,53 @@
+2013-10-25 Jiri Vanek <jvanek at redhat.com>
+
+ Plugin debug can now be controlled from itw_settings, in same way java side.
+ For now ICEDTEAPLUGIN_DEBUG on the debug in same way as deployment.log
+ itw-settings property. Individual logging streams are controlled by
+ deployment.log.{headers,file,stdstreams,system} System and file are not yet
+ fully done (same as java side in this moment). Streams are true, all others
+ false by default.
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: initialized variables new bool
+ variables (debug_initiated), (plugin_debug_headers), (plugin_debug_to_file),
+ (plugin_debug_to_system) as false and (plugin_debug_to_streams) as true.
+ * plugin/icedteanp/IcedTeaNPPlugin.h: above variables declared as extern
+ * plugin/icedteanp/IcedTeaParseProperties.cc: initialization of
+ (default_file_ITW_deploy_props_name) and (custom_jre_key) moved here from
+ IcedTeaNPPlugin.h. New method (read_bool_property) and its more concrete
+ shortcuts (is_debug_on) (is_debug_header_on) (is_logging_to_file)
+ (is_logging_to_stds) (is_logging_to_system) implemented to access properties.
+ * plugin/icedteanp/IcedTeaParseProperties.h: above methods declared.
+ * plugin/icedteanp/IcedTeaPluginUtils.h: (PLUGIN_{ERROR,DEBUG}) methods
+ adapted headers/debug/streams logic as described in title. Headers made more
+ informative (like java side)
+ * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc:
+ TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on) extended to
+ TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_off).
+ TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off) extended to
+ TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_off), and new tests
+ TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on_headers_on)
+ TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off_headers_on) (100x slower then
+ without headers)
+
+2013-10-25 Jiri Vanek <jvanek at redhat.com>
+
+ all output messages redirected to PLUGIN_{DEBUG,ERROR} macros
+ * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: affected
+ * plugin/icedteanp/IcedTeaNPPlugin.cc: affected
+ * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: affected
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: affected
+ * plugin/icedteanp/IcedTeaPluginUtils.h: affected
+ * plugin/icedteanp/IcedTeaRunnable.cc: affected
+ * plugin/icedteanp/IcedTeaScriptablePluginObject.cc: affected
+ * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: added
+ (TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_on)) and
+ (TEST(PLUGIN_DEBUG_ERROR_PROFILING_debug_off)) which call new
+ (doDebugErrorRun) and are measuring refactoring impacts.
+
+2013-10-25 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/util/logging/OutputController.java:
+ (getCallerClass) now gets out also from sun.applet.PluginDebug class.
+
2013-10-24 Andrew Azores <aazores at redhat.com>
Fix array index out of bounds due to malformed plugin message (PR539)
diff -r 2ab117a919e5 -r cdb796a6195b netx/net/sourceforge/jnlp/util/logging/OutputController.java
--- a/netx/net/sourceforge/jnlp/util/logging/OutputController.java Thu Oct 24 10:11:37 2013 -0400
+++ b/netx/net/sourceforge/jnlp/util/logging/OutputController.java Fri Oct 25 12:19:15 2013 +0200
@@ -362,7 +362,9 @@
int i = 1;
for (; i < stack.length; i++) {
result = stack[i];//at least moving up
- if (stack[i].getClassName().contains(OutputController.class.getName())) {
+ if (stack[i].getClassName().contains(OutputController.class.getName()) ||
+ //PluginDebug.class.getName() not avaiable during netx make
+ stack[i].getClassName().contains("sun.applet.PluginDebug") ) {
continue;
} else {
break;
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Fri Oct 25 12:19:15 2013 +0200
@@ -78,7 +78,7 @@
result->error_msg->append(" ");
}
- printf("Error on Java side: %s\n", result->error_msg->c_str());
+ PLUGIN_ERROR("Error on Java side: %s\n", result->error_msg->c_str());
result->error_occurred = true;
result_ready = true;
@@ -947,7 +947,7 @@
java_result = java_request.newArray(java_array_type, length_str);
if (java_result->error_occurred) {
- printf("Unable to create array\n");
+ PLUGIN_ERROR("Unable to create array\n");
id->append("-1");
return;
}
@@ -966,7 +966,7 @@
createJavaObjectFromVariant(instance, value, &value_id);
if (value_id == "-1") {
- printf("Unable to populate array\n");
+ PLUGIN_ERROR("Unable to populate array\n");
id->clear();
id->append("-1");
return;
@@ -1002,7 +1002,7 @@
// the result we want is in result_string (assuming there was no error)
if (java_result->error_occurred)
{
- printf("Unable to get JSObject class id\n");
+ PLUGIN_ERROR("Unable to get JSObject class id\n");
id->clear();
id->append("-1");
return;
@@ -1018,7 +1018,7 @@
// the result we want is in result_string (assuming there was no error)
if (java_result->error_occurred)
{
- printf("Unable to get JSObject constructor id\n");
+ PLUGIN_ERROR("Unable to get JSObject constructor id\n");
id->clear();
id->append("-1");
return;
@@ -1042,7 +1042,7 @@
// the result we want is in result_string (assuming there was no error)
if (java_result->error_occurred)
{
- printf("Unable to create JSObject\n");
+ PLUGIN_ERROR("Unable to create JSObject\n");
id->clear();
id->append("-1");
return;
@@ -1059,7 +1059,7 @@
// the result we want is in result_string (assuming there was no error)
if (java_result->error_occurred) {
- printf("Unable to find classid for %s\n", className.c_str());
+ PLUGIN_ERROR("Unable to find classid for %s\n", className.c_str());
id->append("-1");
return;
}
@@ -1074,7 +1074,7 @@
// the result we want is in result_string (assuming there was no error)
if (java_result->error_occurred) {
- printf("Unable to find string constructor for %s\n", className.c_str());
+ PLUGIN_ERROR("Unable to find string constructor for %s\n", className.c_str());
id->append("-1");
return;
}
@@ -1086,7 +1086,7 @@
java_result = java_request.newString(stringArg);
if (java_result->error_occurred) {
- printf("Unable to create requested object\n");
+ PLUGIN_ERROR("Unable to create requested object\n");
id->append("-1");
return;
}
@@ -1099,7 +1099,7 @@
java_result = java_request.newObjectWithConstructor("[System]", jsObjectClassID, jsObjectConstructorID, args);
if (java_result->error_occurred) {
- printf("Unable to create requested object\n");
+ PLUGIN_ERROR("Unable to create requested object\n");
id->append("-1");
return;
}
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Oct 25 12:19:15 2013 +0200
@@ -213,7 +213,12 @@
static GPid appletviewer_pid = -1;
static guint appletviewer_watch_id = -1;
+bool debug_initiated = false;
int plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL;
+bool plugin_debug_headers = false;
+bool plugin_debug_to_file = false ;
+bool plugin_debug_to_streams = true ;
+bool plugin_debug_to_system = false;
int plugin_debug_suspend = (getenv("ICEDTEAPLUGIN_DEBUG") != NULL) &&
(strcmp(getenv("ICEDTEAPLUGIN_DEBUG"), "suspend") == 0);
@@ -248,7 +253,7 @@
if (IcedTeaPluginUtilities::file_exists(custom_jre+"/bin/java")){
return custom_jre+"/bin/java";
} else {
- fprintf(stderr, "Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+ PLUGIN_ERROR("Your custom jre (/bin/java check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
}
}
return appletviewer_default_executable;
@@ -261,7 +266,7 @@
if (IcedTeaPluginUtilities::file_exists(custom_jre+"/lib/rt.jar")){
return custom_jre+"/lib/rt.jar";
} else {
- fprintf(stderr, "Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
+ PLUGIN_ERROR("Your custom jre (/lib/rt.jar check) %s is not valid. Please fix %s in your %s. In attempt to run using default one. \n", custom_jre.c_str(), custom_jre_key.c_str(), default_file_ITW_deploy_props_name.c_str());
}
}
return appletviewer_default_rtjar;
@@ -317,7 +322,7 @@
identifier = browser_functions.getstringidentifier("document");
if (!browser_functions.hasproperty(instance, window_ptr, identifier))
{
- printf("%s not found!\n", "document");
+ PLUGIN_ERROR("%s not found!\n", "document");
}
browser_functions.getproperty(instance, window_ptr, identifier, &member_ptr);
@@ -1903,7 +1908,7 @@
np_error = plugin_test_appletviewer ();
if (np_error != NPERR_NO_ERROR)
{
- fprintf(stderr, "Unable to find java executable %s\n", get_plugin_executable().c_str());
+ PLUGIN_ERROR("Unable to find java executable %s\n", get_plugin_executable().c_str());
return np_error;
}
@@ -2110,7 +2115,7 @@
if (java_result->error_occurred)
{
- printf("Error: Unable to fetch applet instance id from Java side.\n");
+ PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
return NULL;
}
@@ -2120,7 +2125,7 @@
if (java_result->error_occurred)
{
- printf("Error: Unable to fetch applet instance id from Java side.\n");
+ PLUGIN_ERROR("Error: Unable to fetch applet instance id from Java side.\n");
return NULL;
}
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h Fri Oct 25 12:19:15 2013 +0200
@@ -115,8 +115,13 @@
/* Mutex around plugin async call queue ops */
extern pthread_mutex_t pluginAsyncCallMutex;
-// debug switch
+// debug switches
+extern bool debug_initiated;
extern int plugin_debug;
+extern bool plugin_debug_headers;
+extern bool plugin_debug_to_file;
+extern bool plugin_debug_to_streams;
+extern bool plugin_debug_to_system;
// Browser function table.
extern NPNetscapeFuncs browser_functions;
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaParseProperties.cc
--- a/plugin/icedteanp/IcedTeaParseProperties.cc Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaParseProperties.cc Fri Oct 25 12:19:15 2013 +0200
@@ -50,7 +50,7 @@
#include "IcedTeaPluginUtils.h"
-
+#include "IcedTeaNPPlugin.h"
#include "IcedTeaParseProperties.h"
/*
The public api is nearly impossible to test due to "hardcoded paths"
@@ -75,7 +75,8 @@
//for passing two dummy files
bool find_custom_jre(string user_file, string main_file,string& dest);
//end of non-public IcedTeaParseProperties api
-
+const std::string default_file_ITW_deploy_props_name = "deployment.properties";
+const std::string custom_jre_key = "deployment.jre.dir";
void remove_all_spaces(string& str)
{
@@ -147,6 +148,37 @@
}
return find_system_config_file(main_properties_file(), jdest, found, default_java_properties_file(), dest);
}
+
+
+bool read_bool_property(string key, bool defaultValue){
+ string value;
+ if (!read_deploy_property_value(key, value)) {
+ return defaultValue;
+ }
+ if (value == "true") {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+bool is_debug_on(){
+ return read_bool_property("deployment.log",false);
+}
+bool is_debug_header_on(){
+ return read_bool_property("deployment.log.headers",false);
+}
+bool is_logging_to_file(){
+ return read_bool_property("deployment.log.file",false);
+}
+bool is_logging_to_stds(){
+ return read_bool_property("deployment.log.stdstreams",true);
+}
+bool is_logging_to_system(){
+ return read_bool_property("deployment.log.system",true);
+}
+
+
//abstraction for testing purposes
bool find_system_config_file(string main_file, string custom_jre_file, bool usecustom_jre, string default_java_file, string& dest){
if (IcedTeaPluginUtilities::file_exists(main_file)) {
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaParseProperties.h
--- a/plugin/icedteanp/IcedTeaParseProperties.h Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaParseProperties.h Fri Oct 25 12:19:15 2013 +0200
@@ -47,7 +47,12 @@
bool find_system_config_file(std::string& dest);
bool find_custom_jre(std::string& dest);
bool read_deploy_property_value(std::string property, std::string& dest);
+bool is_debug_on();
+bool is_debug_header_on();
+bool is_logging_to_file();
+bool is_logging_to_stds();
+bool is_logging_to_system();
//half public api
-const std::string default_file_ITW_deploy_props_name = "deployment.properties";
-const std::string custom_jre_key = "deployment.jre.dir";
+extern const std::string default_file_ITW_deploy_props_name;
+extern const std::string custom_jre_key;
//end of public api
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Fri Oct 25 12:19:15 2013 +0200
@@ -440,7 +440,7 @@
// the result we want is in result_string (assuming there was no error)
if (java_result->error_occurred)
{
- printf("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
+ PLUGIN_ERROR("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg->c_str());
//goto cleanup;
}
@@ -521,7 +521,7 @@
// the result we want is in result_string (assuming there was no error)
if (java_result->error_occurred)
{
- printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
+ PLUGIN_ERROR("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
//goto cleanup;
}
@@ -800,7 +800,7 @@
if (!browser_functions.hasproperty(instance, parent_ptr, member_identifier))
{
- printf("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
+ PLUGIN_ERROR("%s not found!\n", IcedTeaPluginUtilities::NPIdentifierAsString(member_identifier).c_str());
}
((AsyncCallThreadData*) data)->call_successful = browser_functions.getproperty(instance, parent_ptr, member_identifier, member_ptr);
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Fri Oct 25 12:19:15 2013 +0200
@@ -399,7 +399,7 @@
wchar_t c;
- if (plugin_debug) printf("Converted UTF-16LE string: ");
+ PLUGIN_DEBUG("Converted UTF-16LE string: ");
result_unicode_str->clear();
for (int i = begin; i < begin+length; i+=2)
@@ -413,14 +413,14 @@
(c >= 'A' && c <= 'Z') ||
(c >= '0' && c <= '9'))
{
- if (plugin_debug) printf("%c", c);
+ PLUGIN_DEBUG("%c", c);
}
result_unicode_str->push_back(c);
}
// not routing via debug print macros due to wide-string issues
- if (plugin_debug) printf(". Length=%d\n", result_unicode_str->length());
+ PLUGIN_DEBUG(". Length=%d\n", result_unicode_str->length());
}
/*
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h Fri Oct 25 12:19:15 2013 +0200
@@ -45,6 +45,8 @@
#include <pthread.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
#include <cstring>
#include <iostream>
@@ -59,30 +61,68 @@
#include <glib.h>
#include <npruntime.h>
-#define PLUGIN_DEBUG(...) \
- do \
- { \
- if (plugin_debug) \
- { \
- fprintf (stdout, "ITNPP Thread# %ld: ", pthread_self()); \
- fprintf (stdout, __VA_ARGS__); \
- } \
+#include "IcedTeaParseProperties.h"
+
+// debugging macro.
+#define initialize_debug() \
+ do \
+ { \
+ if (!debug_initiated) { \
+ debug_initiated = true; \
+ plugin_debug = getenv ("ICEDTEAPLUGIN_DEBUG") != NULL || is_debug_on(); \
+ plugin_debug_headers = is_debug_header_on(); \
+ plugin_debug_to_file = is_logging_to_file(); \
+ plugin_debug_to_streams = is_logging_to_stds(); \
+ plugin_debug_to_system = is_logging_to_system(); \
+ } \
+ } while (0)
+
+
+#define PLUGIN_DEBUG(...) \
+ do \
+ { \
+ initialize_debug(); \
+ if (plugin_debug) { \
+ if (plugin_debug_to_streams) { \
+ if (plugin_debug_headers) { \
+ char s[1000]; \
+ time_t t = time(NULL); \
+ struct tm * p = localtime(&t); \
+ strftime(s, 1000, "%a %b %d %H:%M:%S %Z %Y", p); \
+ const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME"); \
+ fprintf (stdout, "[%s][ITW-C-PLUGIN][MESSAGE_DEBUG][%s][%s:%d] ITNPP Thread# %ld: ", \
+ userNameforDebug, s, __FILE__, __LINE__, pthread_self()); \
+ } \
+ fprintf (stdout, __VA_ARGS__); \
+ } \
+ } \
} while (0)
-
- // Error reporting macros.
+
+// Error reporting macro.
#define PLUGIN_ERROR(...) \
-do \
+ do \
{ \
- fprintf (stderr, "%s:%d: thread %p: Error: %s\n", \
- __FILE__, __LINE__, \
- g_thread_self (), __VA_ARGS__); \
+ initialize_debug(); \
+ if (plugin_debug_to_streams) { \
+ if (plugin_debug_headers) { \
+ char s[1000]; \
+ time_t t = time(NULL); \
+ struct tm * p = localtime(&t); \
+ strftime(s, 1000, "%A, %B %d %Y", p); \
+ const char *userNameforDebug = (getenv("USERNAME") == NULL) ? "unknown user" : getenv("USERNAME"); \
+ fprintf (stderr, "[%s][ITW-C-PLUGIN][ERROR_ALL][%s][%s:%d] thread %p: ", \
+ userNameforDebug, s, __FILE__, __LINE__, g_thread_self ()); \
+ } \
+ fprintf (stderr, __VA_ARGS__); \
+ } \
} while (0)
+
#define CHECK_JAVA_RESULT(result_data) \
{ \
if (((JavaResultData*) result_data)->error_occurred) \
{ \
- printf("Error: Error occurred on Java side: %s.\n", \
+ PLUGIN_ERROR("Error: Error occurred on Java side: %s.\n", \
((JavaResultData*) result_data)->error_msg->c_str()); \
return; \
} \
diff -r 2ab117a919e5 -r cdb796a6195b plugin/icedteanp/IcedTeaScriptablePluginObject.cc
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Thu Oct 24 10:11:37 2013 -0400
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Fri Oct 25 12:19:15 2013 +0200
@@ -49,19 +49,19 @@
void
IcedTeaScriptablePluginObject::deAllocate(NPObject *npobj)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::deAllocate %p\n", npobj);
}
void
IcedTeaScriptablePluginObject::invalidate(NPObject *npobj)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
More information about the distro-pkg-dev
mailing list