Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: http://bugzilla.mozilla.org/show_bug.cgi?id=34665

Browse Source 
This change replaces all printfs in src_moz with calls to PR_LOG.  No
printfs should appear in src_moz anymore.

You won't see any console output from native code unless you define

NSPR_LOG_MODULES=webclient:3

in your environment.  Furthermore, if you want PR_LOG statements in
webclient to go to a file instead, define

WEBCLIENT_LOG_FILE=C:\VALIDDIR\filename.txt

in your environment.  This file will get created fresh each time, since
PR_LOG uses fopen(filename, "w").

New Files:

I've created ns_globals.h, included from jni_util.h.  ns_globals.h holds
an extern * to a struct used in the PR_LOG calls.

Significant changes:

WrapperFactoryImpl.cpp

nativeAppInitialize(){

Added:

#if DEBUG_RAPTOR_CANVAS
    prLogModuleInfo = PR_NewLogModule("webclient");
    const char *webclientLogFile = PR_GetEnv("WEBCLIENT_LOG_FILE");
    if (nsnull != webclientLogFile) {
        PR_SetLogFile(webclientLogFile);
        // If this fails, it just goes to stdout/stderr
    }
#endif
}

All the other files in this checkin follow the this pattern:

Before checkin:

       printf("InitMozillaStuff(%lx): Create the Event Queue for the UI thread...\n",
               initContext);

After checkin:

    if (prLogModuleInfo) {
        PR_LOG(prLogModuleInfo, 3,
               ("InitMozillaStuff(%lx): Create the Event Queue for the UI thread...\n",
               initContext));
    }

See http://lxr.mozilla.org/mozilla/source/nsprpub/pr/include/prlog.h#190

for the definition of PR_LOG


git-svn-id: svn://10.0.0.236/trunk@65380 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2000-04-05 21:38:27 +00:00
parent e095d84ccd
commit 6bd98defd0
14 changed files with 311 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/java/webclient/src_moz/NativeEventThread.cpp
View File

@@ -313,12 +313,17 @@ static void event_processor_callback(gpointer data,
gint source,
GdkInputCondition condition) {
#if DEBUG_RAPTOR_CANVAS
printf("EventHandler: event_processor_callback()\n");
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
"EventHandler: event_processor_callback()\n");
}
#endif
nsIEventQueue *eventQueue = (nsIEventQueue*)data;
eventQueue->ProcessPendingEvents();
#if DEBUG_RAPTOR_CANVAS
printf("EventHandler: Done processing pending events\n");
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3, "EventHandler: Done processing pending events\n");
}
#endif
}
#endif
@@ -333,7 +338,11 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
//TODO Add tracing from nspr.
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): Create the Event Queue for the UI thread...\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
("InitMozillaStuff(%lx): Create the Event Queue for the UI thread...\n",
initContext));
}
#endif
// Create the Event Queue for the UI thread...
@@ -355,11 +364,15 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
if (initContext->embeddedThread) {
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): embeddedThread != nsnull\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3, ("InitMozillaStuff(%lx): embeddedThread != nsnull\n", initContext));
}
#endif
if (initContext->actionQueue == nsnull) {
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): Create the action queue\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3, ("InitMozillaStuff(%lx): Create the action queue\n", initContext));
}
#endif
// We need to do something different for Unix
nsIEventQueue * EQueue = nsnull;
@@ -390,7 +403,10 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
}
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): Create the WebShell...\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
("InitMozillaStuff(%lx): Create the WebShell...\n", initContext));
}
#endif
// Create the WebShell.
rv = nsRepository::CreateInstance(kWebShellCID, nsnull, kIWebShellIID, getter_AddRefs(initContext->webShell));
@@ -400,7 +416,10 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
}
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): Init the WebShell...\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
("InitMozillaStuff(%lx): Init the WebShell...\n", initContext));
}
#endif
#ifdef XP_UNIX
@@ -420,7 +439,10 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
}
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): Install Prefs in the Webshell...\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
("InitMozillaStuff(%lx): Install Prefs in the Webshell...\n", initContext));
}
#endif
nsIPref *prefs;
@@ -451,7 +473,10 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
initContext->sessionHistory = gHistory;
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): Show the WebShell...\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
("InitMozillaStuff(%lx): Show the WebShell...\n", initContext));
}
#endif
nsCOMPtr<nsIBaseWindow> baseWindow;
@@ -482,7 +507,10 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
initContext->initComplete = TRUE;
#if DEBUG_RAPTOR_CANVAS
printf("InitMozillaStuff(%lx): enter event loop\n", initContext);
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
("InitMozillaStuff(%lx): enter event loop\n", initContext));
}
#endif
// Just need to loop once to clear out events before returning