[rfc][icedtea-web] refactored logging for plugin
Jiri Vanek
jvanek at redhat.com
Wed Oct 23 10:37:17 PDT 2013
On 10/22/2013 07:11 PM, Andrew Azores wrote:
> On 10/22/2013 12:00 PM, Jiri Vanek wrote:
>> Hi!
>>
>> This is adding possibility to configure plugin debug via itw-settings, is getting rid of
>> uncontrolled print outs, and add java-like headers (if enabled)
>> Please, do not look on duplicated code in PLUGIN_{error,debug} macros, I will get rid of it when
>> I will do enty points for file log and system log.
>>
>> I have intentionally ignored way to force plugin debug via -verbose sent via itw-settings jvm
>> parameters. Imho it will be missus.
>>
>> J.
>
> Applying this patch makes my Firefox immediately crash when trying to visit any page with a Java
> applet. On my F19 workstation, there is no terminal output at all when this happens, but Mozilla's
> automatic bug reporter does open. On my laptop running Arch, there is no bug reporter and nothing
> especially helpful is printed either, but it does tell me there was a segfault. On my laptop this
> can happen at any time, not just when visiting a page with an applet. I don't really know why that's
> happening the way it is, but I've never had this behaviour at all before applying this patch, and
> after the patch it's very reproducible :(
>
> Thanks,
>
Well yes, I can confirm the issue (now on latest f19). The initial patch was written on f14, jdk6
.. legacy gcc... And I swear it was working. (probably not depending on ff as even cpp tests were
passing on f14, failing on f19)
The attached patch is working fine (needs review!!! :) and only difference is initialisation of
variables. The initialisation of variables is touching files, loading custom jre and so on, however
i do not know why they failed when used where they were.
Right now, the initialisation is :
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Oct 23 19:29:21 2013 +0200
@@ -214,6 +214,10 @@
static guint appletviewer_watch_id = -1;
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);
... and ...
@@ -1843,6 +1847,11 @@
NPError
NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
{
+ 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();
PLUGIN_DEBUG ("NP_Initialize\n");
if ((browserTable == NULL) || (pluginTable == NULL))
I _hope_ that this is correct place for this call, and I'm *not* *sure* if some debug information
can escape with "such an late" initialisation.
Any hint welcomed !-(
J.
-------------- next part --------------
diff -r df5cb12080fa plugin/icedteanp/IcedTeaJavaRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaJavaRequestProcessor.cc Wed Oct 23 19:29:21 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 df5cb12080fa plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Wed Oct 23 19:29:21 2013 +0200
@@ -214,6 +214,10 @@
static guint appletviewer_watch_id = -1;
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 +252,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 +265,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 +321,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);
@@ -1843,6 +1847,11 @@
NPError
NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
{
+ 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();
PLUGIN_DEBUG ("NP_Initialize\n");
if ((browserTable == NULL) || (pluginTable == NULL))
@@ -1903,7 +1912,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 +2119,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 +2129,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 df5cb12080fa plugin/icedteanp/IcedTeaNPPlugin.h
--- a/plugin/icedteanp/IcedTeaNPPlugin.h Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.h Wed Oct 23 19:29:21 2013 +0200
@@ -115,8 +115,12 @@
/* Mutex around plugin async call queue ops */
extern pthread_mutex_t pluginAsyncCallMutex;
-// debug switch
+// debug switches
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 df5cb12080fa plugin/icedteanp/IcedTeaParseProperties.cc
--- a/plugin/icedteanp/IcedTeaParseProperties.cc Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaParseProperties.cc Wed Oct 23 19:29:21 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"
@@ -197,6 +197,35 @@
bool found = find_system_config_file(futurefile);
return read_deploy_property_value(user_properties_file(), futurefile, found, property, 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 read_deploy_property_value(string user_file, string system_file, bool usesystem_file, string property, string& dest){
//is it in user's file?
diff -r df5cb12080fa plugin/icedteanp/IcedTeaParseProperties.h
--- a/plugin/icedteanp/IcedTeaParseProperties.h Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaParseProperties.h Wed Oct 23 19:29:21 2013 +0200
@@ -47,6 +47,11 @@
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";
diff -r df5cb12080fa plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc Wed Oct 23 19:29:21 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 df5cb12080fa plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Oct 23 19:29:21 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 df5cb12080fa plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.h Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.h Wed Oct 23 19:29:21 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,50 @@
#include <glib.h>
#include <npruntime.h>
-#define PLUGIN_DEBUG(...) \
- do \
- { \
- if (plugin_debug) \
- { \
- fprintf (stdout, "ITNPP Thread# %ld: ", pthread_self()); \
- fprintf (stdout, __VA_ARGS__); \
- } \
+
+// debugging macro.
+#define PLUGIN_DEBUG(...) \
+ do \
+ { \
+ 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__); \
+ 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 df5cb12080fa plugin/icedteanp/IcedTeaScriptablePluginObject.cc
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.cc Wed Oct 23 19:29:21 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);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invalidate %p\n", npobj);
}
bool
IcedTeaScriptablePluginObject::hasMethod(NPObject *npobj, NPIdentifier name_id)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasMethod %p\n", npobj);
return false;
}
@@ -69,7 +69,7 @@
IcedTeaScriptablePluginObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args,
uint32_t argCount,NPVariant *result)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invoke %p\n", npobj);
return false;
}
@@ -77,14 +77,14 @@
IcedTeaScriptablePluginObject::invokeDefault(NPObject *npobj, const NPVariant *args,
uint32_t argCount, NPVariant *result)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::invokeDefault %p\n", npobj);
return false;
}
bool
IcedTeaScriptablePluginObject::hasProperty(NPObject *npobj, NPIdentifier name_id)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::hasProperty %p\n", npobj);
return false;
}
@@ -97,7 +97,7 @@
//NPObject* obj = IcedTeaScriptableJavaPackageObject::get_scriptable_java_package_object(getInstanceFromMemberPtr(npobj), name);
//OBJECT_TO_NPVARIANT(obj, *result);
- //printf ("Filling variant %p with object %p\n", result);
+ //PLUGIN_ERROR ("Filling variant %p with object %p\n", result);
}
return false;
@@ -106,21 +106,21 @@
bool
IcedTeaScriptablePluginObject::setProperty(NPObject *npobj, NPIdentifier name_id, const NPVariant *value)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::setProperty %p\n", npobj);
return false;
}
bool
IcedTeaScriptablePluginObject::removeProperty(NPObject *npobj, NPIdentifier name_id)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::removeProperty %p\n", npobj);
return false;
}
bool
IcedTeaScriptablePluginObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::enumerate %p\n", npobj);
return false;
}
@@ -128,7 +128,7 @@
IcedTeaScriptablePluginObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount,
NPVariant *result)
{
- printf ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptablePluginObject::construct %p\n", npobj);
return false;
}
@@ -221,7 +221,7 @@
IcedTeaScriptableJavaPackageObject::invoke(NPObject *npobj, NPIdentifier name_id, const NPVariant *args,
uint32_t argCount,NPVariant *result)
{
- printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invoke %p\n", npobj);
return false;
}
@@ -229,7 +229,7 @@
IcedTeaScriptableJavaPackageObject::invokeDefault(NPObject *npobj, const NPVariant *args,
uint32_t argCount, NPVariant *result)
{
- printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::invokeDefault %p\n", npobj);
return false;
}
@@ -338,14 +338,14 @@
bool
IcedTeaScriptableJavaPackageObject::removeProperty(NPObject *npobj, NPIdentifier name_id)
{
- printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::removeProperty %p\n", npobj);
return false;
}
bool
IcedTeaScriptableJavaPackageObject::enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
{
- printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::enumerate %p\n", npobj);
return false;
}
@@ -353,7 +353,7 @@
IcedTeaScriptableJavaPackageObject::construct(NPObject *npobj, const NPVariant *args, uint32_t argCount,
NPVariant *result)
{
- printf ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaPackageObject::construct %p\n", npobj);
return false;
}
@@ -524,7 +524,7 @@
if (id == "-1")
{
- printf("Unable to create arguments on Java side\n");
+ PLUGIN_ERROR("Unable to create arguments on Java side\n");
return false;
}
@@ -622,7 +622,7 @@
java_result = java_request.getArrayLength(instance_id);
if (java_result->error_occurred)
{
- printf("ERROR: Couldn't fetch array length\n");
+ PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
return false;
}
@@ -698,7 +698,7 @@
// If array
if (scriptable_object->is_object_array && name == "length")
{
- printf("ERROR: Array length is not a modifiable property\n");
+ PLUGIN_ERROR("ERROR: Array length is not a modifiable property\n");
return false;
} else if ( scriptable_object->is_object_array &&
browser_functions.intfromidentifier(name_id) >= 0) // else if array and requesting index
@@ -707,7 +707,7 @@
JavaResultData* java_result = java_request.getArrayLength(instance_id);
if (java_result->error_occurred)
{
- printf("ERROR: Couldn't fetch array length\n");
+ PLUGIN_ERROR("ERROR: Couldn't fetch array length\n");
return false;
}
diff -r df5cb12080fa plugin/icedteanp/IcedTeaScriptablePluginObject.h
--- a/plugin/icedteanp/IcedTeaScriptablePluginObject.h Wed Oct 23 17:52:18 2013 +0200
+++ b/plugin/icedteanp/IcedTeaScriptablePluginObject.h Wed Oct 23 19:29:21 2013 +0200
@@ -175,7 +175,7 @@
const NPVariant *args, uint32_t argCount, NPVariant *result);
static bool invokeDefault(NPObject *npobj, const NPVariant *args,
uint32_t argCount, NPVariant *result) {
- printf ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::invokeDefault %p\n", npobj);
return false;
}
static bool hasProperty(NPObject *npobj, NPIdentifier name_id);
@@ -185,12 +185,12 @@
const NPVariant *value);
static bool removeProperty(NPObject *npobj, NPIdentifier name_id) {
- printf ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::removeProperty %p\n", npobj);
return false;
}
static bool enumerate(NPObject *npobj, NPIdentifier **value,
uint32_t *count) {
- printf ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj);
+ PLUGIN_ERROR ("** Unimplemented: IcedTeaScriptableJavaObject::enumerate %p\n", npobj);
return false;
}
static bool construct(NPObject *npobj, const NPVariant *args,
More information about the distro-pkg-dev
mailing list