[Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/20 12:08:05

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.cpp 

Log message:
                * server/parser/movie_def_impl.cpp (get_exported_resource):
                  tweak timeouts to give thread switching a chance; more
                  debugging.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1668&r2=1.1669
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1668
retrieving revision 1.1669
diff -u -b -r1.1668 -r1.1669
--- ChangeLog   20 Nov 2006 11:40:47 -0000      1.1668
+++ ChangeLog   20 Nov 2006 12:08:04 -0000      1.1669
@@ -1,3 +1,9 @@
+2006-11-20 Sandro Santilli <address@hidden>
+
+       * server/parser/movie_def_impl.cpp (get_exported_resource):
+         tweak timeouts to give thread switching a chance; more
+         debugging.
+
 2006-11-20 Michael Meier <address@hidden>
 
        * server/asobj: Global.cpp, Boolean.cpp, Boolean.h:

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/parser/movie_def_impl.cpp    17 Nov 2006 18:55:56 -0000      1.41
+++ server/parser/movie_def_impl.cpp    20 Nov 2006 12:08:05 -0000      1.42
@@ -1048,11 +1048,13 @@
        //      A imports B imports A
        // 
 
-       // Sleep 1/10 of a second between checks
-       const unsigned long naptime=100000;
+       // Sleep 1/2 of a second between checks
+       // NOTE: make sure the nap is enough time for
+       //       thread execution switch !!
+       const unsigned long naptime=5e5;
 
-       // Timeout after one second of NO frames progress
-       const unsigned long def_timeout=1000000/naptime;
+       // Timeout after two seconds of NO frames progress
+       const unsigned long def_timeout=2e6/naptime;
 
        unsigned long timeout=def_timeout;
        size_t loading_frame = (size_t)-1; // used to keep track of advancements
@@ -1069,6 +1071,8 @@
 
                if ( new_loading_frame != loading_frame )
                {
+                       log_msg("frame load advancement (from %lu to %lu)",
+                               loading_frame, new_loading_frame);
                        loading_frame = new_loading_frame;
                        timeout = def_timeout;
                }
@@ -1077,16 +1081,21 @@
                        if ( ! timeout-- )
                        {
                                log_warning("No frame progress in movie %s "
-                                       "after %lu "
-                                       "milliseconds, giving up on "
+                                       "after %lu milliseconds "
+                                       "(%lu microseconds = %lu iterations), "
+                                       "giving up on "
                                        "get_exported_resource(%s): "
                                        "circular IMPORTS?",
                                        get_url().c_str(),
-                                       def_timeout/1000,
+                                       (def_timeout*naptime)/1000,
+                                       def_timeout*naptime,
+                                       def_timeout,
                                        symbol.c_str());
                                return res;
                        }
 
+                       log_warning("no frame progress at iteration %lu", 
timeout);
+
                        continue; // not worth checking
                }