Changeset 34661 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 19, 2008, 11:18:30 AM (17 years ago)

Author:

[email protected]

Message:

Build fix.

• kjs/collector.cpp: (KJS::Heap::Heap): (KJS::allocateBlock):
• kjs/collector.h: No, #if PLATFORM(UNIX) was not right. I've just moved the unsafe initialization back for now, as the platforms that use that code path do not use multiple threads yet.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (2 diffs)
• kjs/collector.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-19  Alexey Proskuryakov  <[email protected]>
+
+        Build fix.
+
+        * kjs/collector.cpp:
+        (KJS::Heap::Heap):
+        (KJS::allocateBlock):
+        * kjs/collector.h:
+        No, #if PLATFORM(UNIX) was not right. I've just moved the unsafe initialization back for now,
+        as the platforms that use that code path do not use multiple threads yet.
+
 2008-06-19  Alexey Proskuryakov  <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -91 +91 @@
     : mainThreadOnlyObjectCount(0)
     , m_markListSet(0)
-#if PLATFORM(UNIX)
-    , m_pagesize(getpagesize())
-#endif
 {
     memset(&primaryHeap, 0, sizeof(CollectorHeap));
@@ -112 +109 @@
     memset(address, 0, BLOCK_SIZE);
 #else
-    
+
+#if USE(MULTIPLE_THREADS)
+#error Need to initialize pagesize safely.
+#endif
+    static size_t pagesize = getpagesize();
+
     size_t extra = 0;
-    if (BLOCK_SIZE > m_pagesize)
-        extra = BLOCK_SIZE - m_pagesize;
+    if (BLOCK_SIZE > pagesize)
+        extra = BLOCK_SIZE - pagesize;
 
     void* mmapResult = mmap(NULL, BLOCK_SIZE + extra, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);

trunk/JavaScriptCore/kjs/collector.h

@@ -126 +126 @@
         ProtectCountSet protectedValues;
         HashSet<ArgList*>* m_markListSet;
-
-#if PLATFORM(UNIX)
-        const size_t m_pagesize;
-#endif
     };