[Gnash-commit] gnash ChangeLog configure.ac server/dlist.cpp s...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/12/04 23:50:06

Modified files:
        .              : ChangeLog configure.ac 
        server         : dlist.cpp dlist.h 

Log message:
        get assertion checking back to enabled by default, disable instead the
        invariant testing function for DisplayList, unless explicitly requested
        with a compile time GNASH_PARANOIA_LEVEL.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5087&r2=1.5088
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.453&r2=1.454
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.59&r2=1.60

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5087
retrieving revision 1.5088
diff -u -b -r1.5087 -r1.5088
--- ChangeLog   4 Dec 2007 23:45:49 -0000       1.5087
+++ ChangeLog   4 Dec 2007 23:50:06 -0000       1.5088
@@ -1,3 +1,10 @@
+2007-12-05 Sandro Santilli <address@hidden>
+
+       * configure.ac, server/dlist.{cpp,h}: get assertion checking
+         back to enabled by default, disable instead the invariant testing
+         function for DisplayList, unless explicitly requested with a compile
+         time GNASH_PARANOIA_LEVEL.
+
 2007-12-04 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/Makefile.am: registerClassTest2 requires

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -b -r1.453 -r1.454
--- configure.ac        30 Nov 2007 23:51:26 -0000      1.453
+++ configure.ac        4 Dec 2007 23:50:06 -0000       1.454
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.453 2007/11/30 23:51:26 nihilus Exp $
+dnl $Id: configure.ac,v 1.454 2007/12/04 23:50:06 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1453,13 +1453,13 @@
 fi
 
 AC_ARG_ENABLE([cassert],
-  AC_HELP_STRING([--enable-cassert],[Enable assertion checking]),
+  AC_HELP_STRING([--disable-cassert],[Disable assertion checking]),
   [case "${enableval}" in
     yes) cassert=yes ;;
     no) cassert=no ;;
     *) AC_MSG_ERROR([bad value ${enableval} for --enable-cassert option]) ;;
   esac],
-  [cassert=no]
+  [cassert=yes]
 )
 
 if test x"$cassert" = x"no"; then

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- server/dlist.cpp    4 Dec 2007 05:26:18 -0000       1.107
+++ server/dlist.cpp    4 Dec 2007 23:50:06 -0000       1.108
@@ -107,7 +107,6 @@
     it != itEnd; ++it)
   {
     character* ch = it->get();
-    assert(ch); // is this really needed ?
 
     int chdepth = ch->get_depth();
     if ( chdepth >= nexthighestdepth )
@@ -131,7 +130,6 @@
     it != itEnd; ++it)
   {
     character* ch = it->get();
-    assert(ch); // is this really needed ?
 
     // found
     if ( ch->get_depth() == depth ) return ch;
@@ -190,7 +188,6 @@
   //log_msg(_("Before adding, list is:"));
   //dump();
 
-  assert(ch);
   assert(!ch->isUnloaded());
   ch->set_invalidated();
   ch->set_depth(depth);
@@ -291,7 +288,6 @@
   testInvariant();
 
   //GNASH_REPORT_FUNCTION;
-  assert(ch);
   assert(!ch->isUnloaded());
 
   ch->set_invalidated();
@@ -486,9 +482,7 @@
     }
   }
 
-#ifndef NDEBUG
   assert(size >= _charsByDepth.size());
-#endif
 
   testInvariant();
 
@@ -785,7 +779,6 @@
     for(iterator endIt = _charsByDepth.end(); it != endIt; ++it)
     {
         character* ch = it->get();
-        assert(ch);
 
         character* mask = ch->getMask();
         if ( mask && ch->get_visible() && ! mask->isUnloaded() )

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/dlist.h      3 Dec 2007 07:18:20 -0000       1.59
+++ server/dlist.h      4 Dec 2007 23:50:06 -0000       1.60
@@ -32,6 +32,13 @@
 #include <set>  // for testInvariant
 #endif
 
+// GNASH_PARANOIA_LEVEL:
+// 0 : (not unimplemented)
+// 1 : quick assertions
+// 2 : add testInvariant
+//
+#define GNASH_PARANOIA_LEVEL 1
+
 namespace gnash {
        class cxform;
 }
@@ -54,6 +61,7 @@
 
        void testInvariant() const
        {
+#if GNASH_PARANOIA_LEVEL > 1
 #ifndef NDEBUG
                DisplayList sorted = *this;
                // check no duplicated depths above non-removed zone.
@@ -70,6 +78,7 @@
                }
                assert(isSorted()); // check we didn't screw up ordering
 #endif
+#endif // GNASH_PARANOIA_LEVEL > 1
        }
 
        /// Output operator