[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/dlist.h server/movie_roo...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/dlist.h server/movie_roo... |
Date: |
Tue, 22 Apr 2008 12:58:03 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/04/22 12:58:03
Modified files:
. : ChangeLog
server : dlist.h movie_root.cpp movie_root.h
Log message:
* server/dlist.h, server/movie_root.{cpp,h}: set
GNASH_PARANOIA_LEVEL if not already set, use it
to engage expensive assertions when > 1.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6343&r2=1.6344
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.177&r2=1.178
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.118&r2=1.119
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6343
retrieving revision 1.6344
diff -u -b -r1.6343 -r1.6344
--- ChangeLog 22 Apr 2008 11:42:53 -0000 1.6343
+++ ChangeLog 22 Apr 2008 12:58:02 -0000 1.6344
@@ -1,3 +1,9 @@
+2008-04-22 Sandro Santilli <address@hidden>
+
+ * server/dlist.h, server/movie_root.{cpp,h}: set
+ GNASH_PARANOIA_LEVEL if not already set, use it
+ to engage expensive assertions when > 1.
+
2008-04-22 Benjamin Wolsey <address@hidden>
* server/as_prop_flags.h: add onlySWF9Up to cleared visible flags
Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/dlist.h 3 Apr 2008 14:24:01 -0000 1.64
+++ server/dlist.h 22 Apr 2008 12:58:03 -0000 1.65
@@ -37,7 +37,9 @@
// 1 : quick assertions
// 2 : add testInvariant
//
-#define GNASH_PARANOIA_LEVEL 1
+#ifndef GNASH_PARANOIA_LEVEL
+# define GNASH_PARANOIA_LEVEL 1
+#endif
namespace gnash {
class cxform;
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- server/movie_root.cpp 21 Apr 2008 11:27:43 -0000 1.177
+++ server/movie_root.cpp 22 Apr 2008 12:58:03 -0000 1.178
@@ -1611,14 +1611,32 @@
// should be NOT unloaded and thus marked as reachable by their
// parent.
//std::for_each(_liveChars.begin(), _liveChars.end(),
boost::bind(&character::setReachable, _1));
+#if GNASH_PARANOIA_LEVEL > 1
+ for (LiveChars::const_iterator i=_liveChars.begin(), e=_liveChars.end();
i!=e; ++i)
+ {
+ assert((*i)->isReachable());
+ }
+#endif
// NOTE: cleanupUnloadedListeners should have cleaned up all unloaded key
listeners
// the remaining ones should be marked by their parents
//std::for_each(m_key_listeners.begin(), m_key_listeners.end(),
boost::bind(&character::setReachable, _1));
+#if GNASH_PARANOIA_LEVEL > 1
+ for (LiveChars::const_iterator i=m_key_listeners.begin(),
e=m_key_listeners.end(); i!=e; ++i)
+ {
+ assert((*i)->isReachable());
+ }
+#endif
// NOTE: cleanupUnloadedListeners should have cleaned up all unloaded
mouse listeners
// the remaining ones should be marked by their parents
//std::for_each(m_mouse_listeners.begin(), m_mouse_listeners.end(),
boost::bind(&character::setReachable, _1));
+#if GNASH_PARANOIA_LEVEL > 1
+ for (LiveChars::const_iterator i=m_mouse_listeners.begin(),
e=m_mouse_listeners.end(); i!=e; ++i)
+ {
+ assert((*i)->isReachable());
+ }
+#endif
}
#endif // GNASH_USE_GC
Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- server/movie_root.h 21 Apr 2008 11:27:43 -0000 1.118
+++ server/movie_root.h 22 Apr 2008 12:58:03 -0000 1.119
@@ -82,6 +82,15 @@
# include "tree.hh"
#endif
+// GNASH_PARANOIA_LEVEL:
+// 0 : (not unimplemented)
+// 1 : quick assertions
+// 2 : add testInvariant
+//
+#ifndef GNASH_PARANOIA_LEVEL
+# define GNASH_PARANOIA_LEVEL 1
+#endif
+
#include <vector>
#include <list>
#include <set>
@@ -565,7 +574,9 @@
void addLiveChar(boost::intrusive_ptr<character> ch)
{
// Don't register the object in the list twice
+#if GNASH_PARANOIA_LEVEL > 1
assert(std::find(_liveChars.begin(), _liveChars.end(), ch) ==
_liveChars.end());
+#endif
_liveChars.push_front(ch);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/dlist.h server/movie_roo...,
Sandro Santilli <=