[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 122121e0783e08b2fc52a6c73388cd52cd06a7b4

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, objecturi has been updated
       via  122121e0783e08b2fc52a6c73388cd52cd06a7b4 (commit)
       via  e3c2db2f3c66f8dd806667eb78c6d80eb0adda00 (commit)
       via  e83266fdb9bf8a9f5cc29e20b6e4e5409f490e5f (commit)
       via  0b9a7d964d06dd0c53a3ec1452461045e66411c4 (commit)
      from  a37619aded89577df445f1866d20ff822bead448 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=122121e0783e08b2fc52a6c73388cd52cd06a7b4


commit 122121e0783e08b2fc52a6c73388cd52cd06a7b4
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 12:12:22 2010 +0200

    Add 'proplookup' --with-statistics support

diff --git a/configure.ac b/configure.ac
index 460f6e8..063fd54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -338,6 +338,7 @@ buffers=no
 que=no
 memory=no
 cache=yes
+stat_proplookup=yes
 AC_ARG_WITH(statistics,
   AC_HELP_STRING([--with-statistics=], [Specify which statistics features to 
enable]),
   if test -n ${withval}; then
@@ -370,14 +371,19 @@ AC_ARG_WITH(statistics,
         cache=yes
         nstatistics=$((nstatistics+1))
         ;;
+      proplookup)
+        stat_proplookup=yes
+        nstatistics=$((nstatistics+1))
+        ;;
       all|ALL)
         buffers=yes
         memory=yes
         queu=yes
         cache=yes
-        nstatistics=4           dnl this must be incremented if you add 
anything
+        stat_proplookup=yes
+        nstatistics=5           dnl this must be incremented if you add 
anything
         ;;
-      *) AC_MSG_ERROR([invalid statistics feature specified: ${withval} given 
(accept: buffers|que|memory|cache|all)])
+      *) AC_MSG_ERROR([invalid statistics feature specified: ${withval} given 
(accept: buffers|que|memory|cache|proplookup|all)])
         ;;
       esac]
     withval=`echo ${withval} | cut -d ' ' -f 2-6`
@@ -408,6 +414,13 @@ if test x${cache} = xyes; then
   AC_DEFINE(USE_STATS_CACHE, [1], [Support statistics collecting for the 
cache])
 fi
 
+if test x${stat_proplookup} = xyes; then
+  statistics_list="${statistics_list} proplookup"
+  AC_DEFINE(GNASH_STATS_OBJECT_URI_NOCASE, [1], [Collecting and report stats 
about ObjectURI case lookups])
+  AC_DEFINE(GNASH_STATS_PROPERTY_LOOKUPS, [1], [Collecting and report stats 
about property lookups])
+  AC_DEFINE(GNASH_STATS_STRING_TABLE_NOCASE, [1], [Collecting and report stats 
about string_table::key case lookups])
+fi
+
 dnl this is just so Makefile can print the same list
 STATISTICS_LIST="$statistics_list"
 AC_SUBST(STATISTICS_LIST)

http://git.savannah.gnu.org/cgit//commit/?id=e3c2db2f3c66f8dd806667eb78c6d80eb0adda00


commit e3c2db2f3c66f8dd806667eb78c6d80eb0adda00
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 12:11:57 2010 +0200

    header guard

diff --git a/libbase/Stats.h b/libbase/Stats.h
index eac2395..a3fa1b2 100644
--- a/libbase/Stats.h
+++ b/libbase/Stats.h
@@ -17,6 +17,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#ifndef GNASH_STATS_H
+#define GNASH_STATS_H
+
 
 #include <map>
 #include <iostream>
@@ -95,3 +98,5 @@ private:
 
 } // namespace gnash.stats
 } // namespace gnash
+
+#endif 

http://git.savannah.gnu.org/cgit//commit/?id=e83266fdb9bf8a9f5cc29e20b6e4e5409f490e5f


commit e83266fdb9bf8a9f5cc29e20b6e4e5409f490e5f
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 11:57:37 2010 +0200

    rename the stat define

diff --git a/libcore/ObjectURI.h b/libcore/ObjectURI.h
index 8194834..dd8a147 100644
--- a/libcore/ObjectURI.h
+++ b/libcore/ObjectURI.h
@@ -7,9 +7,9 @@
 #include <ostream>
 #include <sstream>
 
-//#define GNASH_STATS_OBJECT_URI_NOCASE_SKIP 1
+//#define GNASH_STATS_OBJECT_URI_NOCASE 1
 
-#ifdef GNASH_STATS_OBJECT_URI_NOCASE_SKIP
+#ifdef GNASH_STATS_OBJECT_URI_NOCASE
 # include "Stats.h"
 #endif
 
@@ -58,12 +58,12 @@ struct ObjectURI
 
         if ( ! nameNoCase ) {
             nameNoCase = st.noCase(name);
-#ifdef GNASH_STATS_OBJECT_URI_NOCASE_SKIP
+#ifdef GNASH_STATS_OBJECT_URI_NOCASE
             static stats::KeyLookup statNonSkip("ObjectURI::noCase non-skips", 
st, 0, 0, 0);
             statNonSkip.check(name);
 #endif
         }
-#ifdef GNASH_STATS_OBJECT_URI_NOCASE_SKIP
+#ifdef GNASH_STATS_OBJECT_URI_NOCASE
         else {
             static stats::KeyLookup stat("ObjectURI::noCase skips", st, 0, 0, 
0);
             stat.check(name);

http://git.savannah.gnu.org/cgit//commit/?id=0b9a7d964d06dd0c53a3ec1452461045e66411c4


commit 0b9a7d964d06dd0c53a3ec1452461045e66411c4
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 11:56:34 2010 +0200

    Split the stat define from the debug one

diff --git a/libbase/string_table.cpp b/libbase/string_table.cpp
index b873337..ffb58d2 100644
--- a/libbase/string_table.cpp
+++ b/libbase/string_table.cpp
@@ -21,9 +21,10 @@
 #include <boost/algorithm/string/case_conv.hpp>
 
 //#define DEBUG_STRING_TABLE 1
+//#define GNASH_STATS_STRING_TABLE_NOCASE 1
 //#define GNASH_PARANOIA_LEVEL 3
 
-#ifdef DEBUG_STRING_TABLE
+#ifdef GNASH_STATS_STRING_TABLE_NOCASE
 # include "Stats.h"
 #endif
 
@@ -138,9 +139,9 @@ string_table::setHighestKnownLowercase(key k)
 string_table::key
 string_table::noCase(key a) const
 {
-#ifdef DEBUG_STRING_TABLE
+#ifdef GNASH_STATS_STRING_TABLE_NOCASE
     static stats::KeyLookup kcl("string_table::noCase(maplookups)", *this);
-#endif // DEBUG_STRING_TABLE
+#endif // GNASH_STATS_STRING_TABLE_NOCASE
 
     // Avoid checking keys known to be lowercase
     if ( a <= _highestKnownLowercase ) {
@@ -151,7 +152,7 @@ string_table::noCase(key a) const
     }
 
 // MOVE this block around for special needs
-#ifdef DEBUG_STRING_TABLE
+#ifdef GNASH_STATS_STRING_TABLE_NOCASE
     kcl.check(a);
 #endif 
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac             |   17 +++++++++++++++--
 libbase/Stats.h          |    5 +++++
 libbase/string_table.cpp |    9 +++++----
 libcore/ObjectURI.h      |    8 ++++----
 4 files changed, 29 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash