JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/profiler/ProfilerDatabase.h b/profiler/ProfilerDatabase.h
index 172c8eeac117815ee26e20f5ee32a376185ecd33..7d4f3cf2c94b3983d2b0386f5cd8cdce2b1fd1f7 100644 (file)
--- a/profiler/ProfilerDatabase.h
+++ b/profiler/ProfilerDatabase.h
@@ -30,11 +30,12 @@
 #include "ProfilerBytecodes.h"
 #include "ProfilerCompilation.h"
 #include "ProfilerCompilationKind.h"
 #include "ProfilerBytecodes.h"
 #include "ProfilerCompilation.h"
 #include "ProfilerCompilationKind.h"

-#include <wtf/FastAllocBase.h>
+#include <wtf/FastMalloc.h>

 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/SegmentedVector.h>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/SegmentedVector.h>

+#include <wtf/ThreadingPrimitives.h>

 #include <wtf/text/WTFString.h>
 
 namespace JSC { namespace Profiler {
 #include <wtf/text/WTFString.h>
 
 namespace JSC { namespace Profiler {


@@ -50,8 +51,7 @@ public:
     Bytecodes* ensureBytecodesFor(CodeBlock*);
     void notifyDestruction(CodeBlock*);
     
     Bytecodes* ensureBytecodesFor(CodeBlock*);
     void notifyDestruction(CodeBlock*);
     

-    PassRefPtr<Compilation> newCompilation(CodeBlock*, CompilationKind);
-    PassRefPtr<Compilation> newCompilation(Bytecodes*, CompilationKind);
+    void addCompilation(PassRefPtr<Compilation>);

     
     // Converts the database to a JavaScript object that is suitable for JSON stringification.
     // Note that it's probably a good idea to use an ExecState* associated with a global
     
     // Converts the database to a JavaScript object that is suitable for JSON stringification.
     // Note that it's probably a good idea to use an ExecState* associated with a global


@@ -70,6 +70,20 @@ public:
     void registerToSaveAtExit(const char* filename);
     
 private:
     void registerToSaveAtExit(const char* filename);
     
 private:

+    // Use a full-blown adaptive mutex because:
+    // - There is only one ProfilerDatabase per VM. The size overhead of the system's
+    //   mutex is negligible if you only have one of them.
+    // - It's locked infrequently - once per bytecode generation, compilation, and
+    //   code block collection - so the fact that the fast path still requires a
+    //   function call is neglible.
+    // - It tends to be held for a while. Currently, we hold it while generating
+    //   Profiler::Bytecodes for a CodeBlock. That's uncommon and shouldn't affect
+    //   performance, but if we did have contention, we would want a sensible,
+    //   power-aware backoff. An adaptive mutex will do this as a matter of course,
+    //   but a spinlock won't.
+    typedef Mutex Lock;
+    typedef MutexLocker Locker;
+    

 
     void addDatabaseToAtExit();
     void removeDatabaseFromAtExit();
 
     void addDatabaseToAtExit();
     void removeDatabaseFromAtExit();


@@ -81,10 +95,11 @@ private:
     VM& m_vm;
     SegmentedVector<Bytecodes> m_bytecodes;
     HashMap<CodeBlock*, Bytecodes*> m_bytecodesMap;
     VM& m_vm;
     SegmentedVector<Bytecodes> m_bytecodes;
     HashMap<CodeBlock*, Bytecodes*> m_bytecodesMap;

-    Vector<RefPtr<Compilation> > m_compilations;
+    Vector<RefPtr<Compilation>> m_compilations;

     bool m_shouldSaveAtExit;
     CString m_atExitSaveFilename;
     Database* m_nextRegisteredDatabase;
     bool m_shouldSaveAtExit;
     CString m_atExitSaveFilename;
     Database* m_nextRegisteredDatabase;

+    Lock m_lock;

 };
 
 } } // namespace JSC::Profiler
 };
 
 } } // namespace JSC::Profiler