Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 115 insertions, 0 deletions

diff --git a/Source/JavaScriptCore/heap/CodeBlockSet.h b/Source/JavaScriptCore/heap/CodeBlockSet.h
new file mode 100644
index 000000000..56507c052
--- /dev/null
+++ b/Source/JavaScriptCore/heap/CodeBlockSet.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2013, 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
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef CodeBlockSet_h
+#define CodeBlockSet_h
+
+#include "GCSegmentedArray.h"
+#include "HeapOperation.h"
+#include <wtf/HashSet.h>
+#include <wtf/Lock.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/PrintStream.h>
+#include <wtf/RefPtr.h>
+
+namespace JSC {
+
+class CodeBlock;
+class Heap;
+class JSCell;
+class SlotVisitor;
+
+// CodeBlockSet tracks all CodeBlocks. Every CodeBlock starts out with one
+// reference coming in from GC. The GC is responsible for freeing CodeBlocks
+// once they hasOneRef() and nobody is running code from that CodeBlock.
+
+class CodeBlockSet {
+    WTF_MAKE_NONCOPYABLE(CodeBlockSet);
+
+public:
+    CodeBlockSet();
+    ~CodeBlockSet();
+
+    void lastChanceToFinalize();
+    
+    // Add a CodeBlock. This is only called by CodeBlock constructors.
+    void add(CodeBlock*);
+    
+    // Clear all mark bits for all CodeBlocks.
+    void clearMarksForFullCollection();
+
+    // Mark a pointer that may be a CodeBlock that belongs to the set of DFG
+    // blocks. This is defined in CodeBlock.h.
+private:
+    void mark(const LockHolder&, CodeBlock* candidateCodeBlock);
+public:
+    void mark(const LockHolder&, void* candidateCodeBlock);
+    
+    // Delete all code blocks that are only referenced by this set (i.e. owned
+    // by this set), and that have not been marked.
+    void deleteUnmarkedAndUnreferenced(HeapOperation);
+    
+    // Add all currently executing CodeBlocks to the remembered set to be 
+    // re-scanned during the next collection.
+    void writeBarrierCurrentlyExecutingCodeBlocks(Heap*);
+
+    bool contains(const LockHolder&, void* candidateCodeBlock);
+    Lock& getLock() { return m_lock; }
+
+    // Visits each CodeBlock in the heap until the visitor function returns true
+    // to indicate that it is done iterating, or until every CodeBlock has been
+    // visited.
+    template<typename Functor> void iterate(Functor& functor)
+    {
+        LockHolder locker(m_lock);
+        for (auto& codeBlock : m_oldCodeBlocks) {
+            bool done = functor(codeBlock);
+            if (done)
+                return;
+        }
+
+        for (auto& codeBlock : m_newCodeBlocks) {
+            bool done = functor(codeBlock);
+            if (done)
+                return;
+        }
+    }
+    
+    void dump(PrintStream&) const;
+
+private:
+    void promoteYoungCodeBlocks(const LockHolder&);
+
+    HashSet<CodeBlock*> m_oldCodeBlocks;
+    HashSet<CodeBlock*> m_newCodeBlocks;
+    HashSet<CodeBlock*> m_currentlyExecuting;
+    Lock m_lock;
+};
+
+} // namespace JSC
+
+#endif // CodeBlockSet_h
+