[Gnash-commit] gnash ChangeLog server/LoadVariablesThread.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/15 11:27:20

Modified files:
        .              : ChangeLog 
        server         : LoadVariablesThread.cpp sprite_instance.cpp 
        server/asobj   : LoadVars.cpp 

Log message:
        use compile-time defines to enable debugging of variables load.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6284&r2=1.6285
http://cvs.savannah.gnu.org/viewcvs/gnash/server/LoadVariablesThread.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.502&r2=1.503
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6284
retrieving revision 1.6285
diff -u -b -r1.6284 -r1.6285
--- ChangeLog   15 Apr 2008 11:00:48 -0000      1.6284
+++ ChangeLog   15 Apr 2008 11:27:18 -0000      1.6285
@@ -1,3 +1,9 @@
+2008-04-15 Sandro Santilli <address@hidden>
+
+       * server/LoadVariablesThread.cpp, server/sprite_instance.cpp,
+         server/asobj/LoadVars.cpp: use compile-time defines to enable
+         debugging of variables load.
+
 2008-04-15 Udo Giacomozzi <address@hidden>
 
        * server/button_character_instance.cpp: call set_invalidated() *before*

Index: server/LoadVariablesThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/LoadVariablesThread.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/LoadVariablesThread.cpp      19 Feb 2008 19:20:51 -0000      1.9
+++ server/LoadVariablesThread.cpp      15 Apr 2008 11:27:19 -0000      1.10
@@ -27,12 +27,16 @@
 
 #include <string>
 
+//#define DEBUG_LOAD_VARIABLES 1
+
 namespace gnash {
 
 void
 LoadVariablesThread::completeLoad()
 {
-       //log_debug("completeLoad called");
+#ifdef DEBUG_LOAD_VARIABLES
+       log_debug("completeLoad called");
+#endif
 
        using std::string;
 
@@ -50,23 +54,31 @@
        unsigned int parsedLines = 0;
        while ( size_t read = _stream->read_bytes(buf, CHUNK_SIZE) )
        {
-               //log_debug("Read %u bytes", read);
+#ifdef DEBUG_LOAD_VARIABLES
+               log_debug("Read %u bytes", read);
+#endif
 
                // TODO: use read_string ?
                string chunk(buf, read);
                toparse += chunk;
 
-               //log_debug("toparse: %s", toparse.c_str());
+#ifdef DEBUG_LOAD_VARIABLES
+               log_debug("toparse: %s", toparse.c_str());
+#endif
 
                // parse remainder
                size_t lastamp = toparse.rfind('&');
                if ( lastamp != string::npos )
                {
                        string parseable = toparse.substr(0, lastamp);
-                       //log_debug("parseable: %s", parseable.c_str());
+#ifdef DEBUG_LOAD_VARIABLES
+                       log_debug("parseable: %s", parseable.c_str());
+#endif
                        parse(parseable);
                        toparse = toparse.substr(lastamp+1);
-                       //log_debug("toparse nextline: %s", toparse.c_str());
+#ifdef DEBUG_LOAD_VARIABLES
+                       log_debug("toparse nextline: %s", toparse.c_str());
+#endif
                        ++parsedLines;
                }
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -b -r1.502 -r1.503
--- server/sprite_instance.cpp  11 Apr 2008 15:33:46 -0000      1.502
+++ server/sprite_instance.cpp  15 Apr 2008 11:27:19 -0000      1.503
@@ -81,6 +81,7 @@
 //#define GNASH_DEBUG_REPLACE 1
 //#define  DEBUG_DYNTEXT_VARIABLES 1
 //#define GNASH_DEBUG_HITTEST 1
+//#define DEBUG_LOAD_VARIABLES 1
 
 // Defining the following macro you'll get a DEBUG lien
 // for each call to the drawing API, in a format which is
@@ -4328,7 +4329,9 @@
   {
     const string name = PROPNAME(it->first);
     const string& val = it->second;
-    //log_debug(_("Setting variable '%s' to value '%s'"), name, val);
+#ifdef DEBUG_LOAD_VARIABLES
+    log_debug(_("Setting variable '%s' to value '%s'"), name, val);
+#endif
     set_member(st.find(name), val);
   }
 

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/asobj/LoadVars.cpp   14 Mar 2008 20:21:49 -0000      1.44
+++ server/asobj/LoadVars.cpp   15 Apr 2008 11:27:20 -0000      1.45
@@ -42,6 +42,8 @@
 #include <list>
 #include <boost/algorithm/string/case_conv.hpp>
 
+//#define DEBUG_LOADS 1
+
 namespace gnash {
 
 static as_value loadvars_addrequestheader(const fn_call& fn);
@@ -228,7 +230,7 @@
 {
 #ifdef DEBUG_LOADS
     static int call=0;
-    log_debug("LoadVars %p checkLoads call %d, _loadThreads: %d", (void 
*)this, _loadThreads.size(), ++call);
+    log_debug("LoadVars %p checkLoads call %d, _loadThreads: %d", (void 
*)this, ++call, _loadThreads.size());
 #endif
 
     if ( _loadThreads.empty() ) return; // nothing to do