CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/11/17 15:57:41
Modified files:
. : ChangeLog
server/parser : movie_def_impl.cpp
Log message:
* server/parser/movie_def_impl.cpp (get_exported_resource) :
fixed use of timeout.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1653&r2=1.1654
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.39&r2=1.40
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1653
retrieving revision 1.1654
diff -u -b -r1.1653 -r1.1654
--- ChangeLog 17 Nov 2006 15:17:38 -0000 1.1653
+++ ChangeLog 17 Nov 2006 15:57:40 -0000 1.1654
@@ -1,6 +1,11 @@
2006-11-17 Sandro Santilli <[EMAIL PROTECTED]>
* server/parser/movie_def_impl.cpp (get_exported_resource) :
+ fixed use of timeout.
+
+2006-11-17 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * server/parser/movie_def_impl.cpp (get_exported_resource) :
use a timeout to handle circular IMPORT chains.
* server/parser/movie_def_impl.{cpp,h}:
Added MovieLoader::isSelfThread() method, more assertion
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/parser/movie_def_impl.cpp 17 Nov 2006 15:17:38 -0000 1.39
+++ server/parser/movie_def_impl.cpp 17 Nov 2006 15:57:41 -0000 1.40
@@ -1047,14 +1047,14 @@
// A imports B imports A
//
- // Timeout after one second of NO frames progress
- const unsigned long def_timeout=1000000;
-
// Sleep 1/10 of a second between checks
const unsigned long naptime=100000;
+ // Timeout after one second of NO frames progress
+ const unsigned long def_timeout=1000000/naptime;
+
unsigned long timeout=def_timeout;
- size_t loading_frame = 0; // used to keep track of advancements
+ size_t loading_frame = (size_t)-1; // used to keep track of advancements
for (;;)
{
// FIXME: make m_exports access thread-safe
_______________________________________________
Gnash-commit mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-commit
