JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / profiler / CallIdentifier.h

diff --git a/profiler/CallIdentifier.h b/profiler/CallIdentifier.h
index 6ceef13641db355faa1c89c437edcd6d5748857e..691fc625086700151c9847ba82423d5d70fe9754 100644 (file)
--- a/profiler/CallIdentifier.h
+++ b/profiler/CallIdentifier.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2014 Apple Inc. All Rights Reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -27,69 +27,86 @@
 #ifndef CallIdentifier_h
 #define CallIdentifier_h
 
 #ifndef CallIdentifier_h
 #define CallIdentifier_h
 

-#include <runtime/UString.h>
+#include <wtf/text/CString.h>
+#include <wtf/text/StringHash.h>
+#include <wtf/text/WTFString.h>

 
 namespace JSC {
 
     struct CallIdentifier {
 
 namespace JSC {
 
     struct CallIdentifier {

-        UString m_name;
-        UString m_url;
-        unsigned m_lineNumber;
-
+        WTF_MAKE_FAST_ALLOCATED;
+    public:

         CallIdentifier()
             : m_lineNumber(0)
         CallIdentifier()
             : m_lineNumber(0)

+            , m_columnNumber(0)

         {
         }
 
         {
         }
 

-        CallIdentifier(const UString& name, const UString& url, int lineNumber)
-            : m_name(name)
-            , m_url(url)
+        CallIdentifier(const String& functionName, const String& url, unsigned lineNumber, unsigned columnNumber)
+            : m_functionName(functionName)
+            , m_url(!url.isNull() ? url : "")

             , m_lineNumber(lineNumber)
             , m_lineNumber(lineNumber)

+            , m_columnNumber(columnNumber)

         {
         }
 
         {
         }
 

-        inline bool operator==(const CallIdentifier& ci) const { return ci.m_lineNumber == m_lineNumber && ci.m_name == m_name && ci.m_url == m_url; }
-        inline bool operator!=(const CallIdentifier& ci) const { return !(*this == ci); }
+        const String& functionName() const { return m_functionName; }
+
+        const String& url() const { return m_url; }
+        unsigned lineNumber() const { return m_lineNumber; }
+        unsigned columnNumber() const { return m_columnNumber; }
+
+        inline bool operator==(const CallIdentifier& other) const { return other.m_lineNumber == m_lineNumber && other.m_columnNumber == m_columnNumber && other.m_functionName == m_functionName && other.m_url == m_url; }
+        inline bool operator!=(const CallIdentifier& other) const { return !(*this == other); }
+
+        struct Hash {
+            static unsigned hash(const CallIdentifier& key)
+            {
+                unsigned hashCodes[4] = {
+                    key.m_functionName.impl()->hash(),
+                    key.m_url.impl()->hash(),
+                    key.m_lineNumber,
+                    key.m_columnNumber
+                };
+                return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
+            }
+
+            static bool equal(const CallIdentifier& a, const CallIdentifier& b) { return a == b; }
+            static const bool safeToCompareToEmptyOrDeleted = true;
+        };
+
+        unsigned hash() const { return Hash::hash(*this); }

 
 #ifndef NDEBUG
         operator const char*() const { return c_str(); }
 
 #ifndef NDEBUG
         operator const char*() const { return c_str(); }

-        const char* c_str() const { return m_name.UTF8String().c_str(); }
+        const char* c_str() const { return m_functionName.utf8().data(); }

 #endif
 #endif

-    };
-
-    struct CallIdentifierHash {
-        static unsigned hash(const CallIdentifier& key)
-        {
-            unsigned hashCodes[3] = {
-                key.m_name.rep()->hash(),
-                key.m_url.rep()->hash(),
-                key.m_lineNumber
-            };
-            return UString::Rep::computeHash(reinterpret_cast<char*>(hashCodes), sizeof(hashCodes));
-        }

 
 

-        static bool equal(const CallIdentifier& a, const CallIdentifier& b) { return a == b; }
-        static const bool safeToCompareToEmptyOrDeleted = true;
+    private:
+        String m_functionName;
+        String m_url;
+        unsigned m_lineNumber;
+        unsigned m_columnNumber;

     };
 
 } // namespace JSC
 
 namespace WTF {
 
     };
 
 } // namespace JSC
 
 namespace WTF {
 

-    template<> struct DefaultHash<JSC::CallIdentifier> { typedef JSC::CallIdentifierHash Hash; };
+    template<> struct DefaultHash<JSC::CallIdentifier> { typedef JSC::CallIdentifier::Hash Hash; };

 
     template<> struct HashTraits<JSC::CallIdentifier> : GenericHashTraits<JSC::CallIdentifier> {
         static void constructDeletedValue(JSC::CallIdentifier& slot)
         {
 
     template<> struct HashTraits<JSC::CallIdentifier> : GenericHashTraits<JSC::CallIdentifier> {
         static void constructDeletedValue(JSC::CallIdentifier& slot)
         {

-            new (&slot) JSC::CallIdentifier(JSC::UString(), JSC::UString(), std::numeric_limits<unsigned>::max());
+            new (NotNull, &slot) JSC::CallIdentifier(String(), String(), std::numeric_limits<unsigned>::max(), std::numeric_limits<unsigned>::max());

         }
         }

+

         static bool isDeletedValue(const JSC::CallIdentifier& value)
         {
         static bool isDeletedValue(const JSC::CallIdentifier& value)
         {

-            return value.m_name.isNull() && value.m_url.isNull() && value.m_lineNumber == std::numeric_limits<unsigned>::max();
+            return value.functionName().isNull() && value.url().isNull() && value.lineNumber() == std::numeric_limits<unsigned>::max() && value.columnNumber() == std::numeric_limits<unsigned>::max();

         }
     };
 
 } // namespace WTF
 
 #endif  // CallIdentifier_h
         }
     };
 
 } // namespace WTF
 
 #endif  // CallIdentifier_h

-