[Gnash-commit] [SCM] Gnash branch, objecturi, updated. 4a91e3e60a6c8b9b341b087c48906b025afe3c76

[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  4a91e3e60a6c8b9b341b087c48906b025afe3c76 (commit)
       via  7477b5ee69720f6affd7ce8c32d3ab7e6335eb6e (commit)
       via  e7f1a5ce71b437a6689c247b07e2704f363fca61 (commit)
      from  7fbd2d29f27c4ca726cd5bdbc4527d5b354362da (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=4a91e3e60a6c8b9b341b087c48906b025afe3c76


commit 4a91e3e60a6c8b9b341b087c48906b025afe3c76
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 17:22:27 2010 +0200

    include gnashconfig.h for the stats defines

diff --git a/libcore/ObjectURI.h b/libcore/ObjectURI.h
index dd8a147..b3da4c6 100644
--- a/libcore/ObjectURI.h
+++ b/libcore/ObjectURI.h
@@ -3,6 +3,10 @@
 #define GNASH_OBJECTURI_H
 
 #include "string_table.h"
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h" // GNASH_STATS_OBJECT_URI_NOCASE
+#endif
+
 #include <string>
 #include <ostream>
 #include <sstream>
@@ -38,11 +42,6 @@ struct ObjectURI
         nameNoCase(0)
     {}
 
-/*
-    operator const void*() const {
-        return (name == 0) ? 0 : this;
-    }
-*/
 
     bool empty() const {
         return (name == 0);

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


commit 7477b5ee69720f6affd7ce8c32d3ab7e6335eb6e
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 17:20:43 2010 +0200

    include gnashconfig.h for the stats defines

diff --git a/libbase/string_table.cpp b/libbase/string_table.cpp
index ffb58d2..17c836a 100644
--- a/libbase/string_table.cpp
+++ b/libbase/string_table.cpp
@@ -18,6 +18,10 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "string_table.h"
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h" // GNASH_STATS_STRING_TABLE_NOCASE
+#endif
+
 #include <boost/algorithm/string/case_conv.hpp>
 
 //#define DEBUG_STRING_TABLE 1
diff --git a/libcore/PropertyList.cpp b/libcore/PropertyList.cpp
index 3561af6..e2aabff 100644
--- a/libcore/PropertyList.cpp
+++ b/libcore/PropertyList.cpp
@@ -27,6 +27,9 @@
 #include "VM.h" // For string_table
 #include "string_table.h"
 #include "GnashAlgorithm.h"
+#ifdef HAVE_CONFIG_H
+#include "gnashconfig.h" // GNASH_STATS_PROPERTY_LOOKUPS
+#endif
 
 #include <utility> // for std::make_pair
 #include <boost/bind.hpp> 
@@ -67,6 +70,9 @@ iterator_find(const PropertyList::container& p, const 
ObjectURI& uri, VM& vm)
         return p.project<0>(p.get<1>().find(uri));
     }
         
+    ObjectURI uri2 = uri;
+    ObjectURI uri3 ( uri );
+
     string_table& st = vm.getStringTable();
     const string_table::key nocase = uri.noCase(st); 
     return p.project<0>(p.get<2>().find(nocase));

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


commit e7f1a5ce71b437a6689c247b07e2704f363fca61
Author: Sandro Santilli <address@hidden>
Date:   Thu Sep 23 15:17:33 2010 +0200

    Add another stat for interator_find calls

diff --git a/libcore/PropertyList.cpp b/libcore/PropertyList.cpp
index 21ae855..3561af6 100644
--- a/libcore/PropertyList.cpp
+++ b/libcore/PropertyList.cpp
@@ -54,6 +54,12 @@ inline
 PropertyList::const_iterator
 iterator_find(const PropertyList::container& p, const ObjectURI& uri, VM& vm)
 {
+#ifdef GNASH_STATS_PROPERTY_LOOKUPS
+    // HINT: can add a final arg to KeyLookup ctor, like 
NSV::PROP_ON_MOUSE_MOVE
+    //       to have *that* property lookup drive dump triggers
+    static stats::KeyLookup kcl("PropertyList::iterator_find", 
vm.getStringTable(), 10000);
+    kcl.check(uri.name);
+#endif // GNASH_STATS_PROPERTY_LOOKUPS
     
     const bool caseless = vm.getSWFVersion() < 7;
 

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

Summary of changes:
 libbase/string_table.cpp |    4 ++++
 libcore/ObjectURI.h      |    9 ++++-----
 libcore/PropertyList.cpp |   12 ++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash