Changeset 100037 in webkit

Timestamp:

Nov 11, 2011 3:43:00 PM (12 years ago)

Author:

barraclough@apple.com

Message:

Update iOS port's configuration setting, particularly in Platform.h
​https://bugs.webkit.org/show_bug.cgi?id=72187

Reviewed by David Kilzer.

• interpreter/Interpreter.h:
  • Lower the reentry depth.
• runtime/DatePrototype.cpp:
  • iOS also uses CF.
• wtf/FastMalloc.cpp:

(WTF::TCMalloc_PageHeap::IncrementalScavenge):

• Update fastmalloc configuration for iOS.

• wtf/OSAllocatorPosix.cpp:

(WTF::OSAllocator::reserveAndCommit):

• Added flag.

• wtf/Platform.h:
  • Update platform configuration for iOS.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.h (modified) (1 diff)
• runtime/DatePrototype.cpp (modified) (4 diffs)
• wtf/FastMalloc.cpp (modified) (5 diffs)
• wtf/OSAllocatorPosix.cpp (modified) (1 diff)
• wtf/Platform.h (modified) (6 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-11-11  Gavin Barraclough  <barraclough@apple.com>
+
+        Update iOS port's configuration setting, particularly in Platform.h
+        https://bugs.webkit.org/show_bug.cgi?id=72187
+        
+        Reviewed by David Kilzer.
+
+        * interpreter/Interpreter.h:
+            - Lower the reentry depth.
+        * runtime/DatePrototype.cpp:
+            - iOS also uses CF.
+        * wtf/FastMalloc.cpp:
+        (WTF::TCMalloc_PageHeap::IncrementalScavenge):
+            - Update fastmalloc configuration for iOS.
+        * wtf/OSAllocatorPosix.cpp:
+        (WTF::OSAllocator::reserveAndCommit):
+            - Added flag.
+        * wtf/Platform.h:
+            - Update platform configuration for iOS.
+
 2011-11-11  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -81 +81 @@
     };
 
+#if PLATFORM(IOS)
+    // We use a smaller reentrancy limit on iPhone because of the high amount of
+    // stack space required on the web thread.
+    enum { MaxLargeThreadReentryDepth = 93, MaxSmallThreadReentryDepth = 32 };
+#else
     enum { MaxLargeThreadReentryDepth = 256, MaxSmallThreadReentryDepth = 32 };
+#endif // PLATFORM(IOS)
 
     class Interpreter {

trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp

@@ -61 +61 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(IOS)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
@@ -129 +129 @@
 enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
  
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(IOS)
 
 // FIXME: Since this is superior to the strftime-based version, why limit this to PLATFORM(MAC)?
@@ -196 +196 @@
 }
 
-#else // !PLATFORM(MAC)
+#else // !PLATFORM(MAC) && !PLATFORM(IOS)
 
 static JSCell* formatLocaleDate(ExecState* exec, const GregorianDateTime& gdt, LocaleDateTimeFormat format)
@@ -283 +283 @@
 }
 
-#endif // !PLATFORM(MAC)
+#endif // !PLATFORM(MAC) && !PLATFORM(IOS)
 
 // Converts a list of arguments sent to a Date member function into milliseconds, updating

trunk/Source/JavaScriptCore/wtf/FastMalloc.cpp

@@ -101 +101 @@
 
 // Use a background thread to periodically scavenge memory to release back to the system
+#if PLATFORM(IOS)
+#define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 0
+#else
 #define USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY 1
+#endif
 
 #ifndef NDEBUG
@@ -639 +643 @@
 // Lower and upper bounds on the per-thread cache sizes
 static const size_t kMinThreadCacheSize = kMaxSize * 2;
+#if PLATFORM(IOS)
+static const size_t kMaxThreadCacheSize = 512 * 1024;
+#else
 static const size_t kMaxThreadCacheSize = 2 << 20;
+#endif
 
 // Default bound on the total amount of thread caches
@@ -1941 +1949 @@
   if (scavenge_counter_ >= 0) return;  // Not yet time to scavenge
 
+#if PLATFORM(IOS)
+  static const size_t kDefaultReleaseDelay = 64;
+#else
   // If there is nothing to release, wait for so many pages before
   // scavenging again.  With 4K pages, this comes to 16MB of memory.
   static const size_t kDefaultReleaseDelay = 1 << 8;
+#endif
 
   // Find index of free list to scavenge
@@ -1959 +1971 @@
       DLL_Prepend(&slist->returned, s);
 
+#if PLATFORM(IOS)
+      scavenge_counter_ = std::max<size_t>(16UL, std::min<size_t>(kDefaultReleaseDelay, kDefaultReleaseDelay - (free_pages_ / kDefaultReleaseDelay)));
+#else
       scavenge_counter_ = std::max<size_t>(64UL, std::min<size_t>(kDefaultReleaseDelay, kDefaultReleaseDelay - (free_pages_ / kDefaultReleaseDelay)));
+#endif
 
       if (index == kMaxPages && !DLL_IsEmpty(&slist->normal))
@@ -4648 +4664 @@
     &FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics
 
-#ifndef BUILDING_ON_LEOPARD
+#if !defined(BUILDING_ON_LEOPARD) || OS(IOS)
     , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher.
 #endif
-#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) || OS(IOS)
     , 0, 0, 0, 0 // These members will not be used unless the zone advertises itself as version seven or higher.
 #endif

trunk/Source/JavaScriptCore/wtf/OSAllocatorPosix.cpp

@@ -55 +55 @@
 
     int flags = MAP_PRIVATE | MAP_ANON;
+#if defined MAP_JIT
+    if (executable)
+        flags |= MAP_JIT;
+#endif
 
 #if OS(LINUX)

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -548 +548 @@
 #endif
 
+#if PLATFORM(IOS)
+#define DONT_FINALIZE_ON_MAIN_THREAD 1
+#endif
+
 #if PLATFORM(QT) && OS(DARWIN)
 #define WTF_USE_CF 1
@@ -563 +567 @@
 #define ENABLE_GEOLOCATION 1
 #define ENABLE_ICONDATABASE 0
-#define ENABLE_INSPECTOR 0
+#define ENABLE_INSPECTOR 1
 #define ENABLE_JAVA_BRIDGE 0
 #define ENABLE_NETSCAPE_PLUGIN_API 0
 #define ENABLE_ORIENTATION_EVENTS 1
 #define ENABLE_REPAINT_THROTTLING 1
+#define ENABLE_WEB_ARCHIVE 1
+#define HAVE_NETWORK_CFDATA_ARRAY_CALLBACK 1
+#define HAVE_PTHREAD_RWLOCK 1
 #define HAVE_READLINE 1
+#define HAVE_RUNLOOP_TIMER 0
 #define WTF_USE_CF 1
+#define WTF_USE_CFNETWORK 1
 #define WTF_USE_PTHREADS 1
-#define HAVE_PTHREAD_RWLOCK 1
-#define ENABLE_WEB_ARCHIVE 1
+
+#if PLATFORM(IOS_SIMULATOR)
+    #define ENABLE_INTERPRETER 1
+    #define ENABLE_JIT 0
+    #define ENABLE_YARR 0
+    #define ENABLE_YARR_JIT 0
+#else
+    #define ENABLE_INTERPRETER 1
+    #define ENABLE_JIT 1
+    #define ENABLE_YARR 1
+    #define ENABLE_YARR_JIT 1
+#endif
+
 #endif
 
@@ -584 +604 @@
 #endif
 
-#if USE(CFNETWORK) || PLATFORM(MAC)
+#if USE(CFNETWORK) || PLATFORM(MAC) || PLATFORM(IOS)
 #define WTF_USE_CFURLCACHE 1
 #define WTF_USE_CFURLSTORAGESESSIONS 1
@@ -675 +695 @@
 #if PLATFORM(IOS)
 #define HAVE_MADV_FREE 1
+#define HAVE_PTHREAD_SETNAME_NP 1
 #endif
 
@@ -968 +989 @@
 #define ENABLE_ASSEMBLER 1
 #endif
-/* Setting this flag prevents the assembler from using RWX memory; this may improve
-   security but currectly comes at a significant performance cost. */
-#if PLATFORM(IOS)
-#define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
-#endif
 
 /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
    On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */
 #if ENABLE(ASSEMBLER)
-#if CPU(X86_64)
+#if CPU(X86_64) || PLATFORM(IOS)
 #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1
 #else
@@ -1041 +1057 @@
 
 /* FIXME: Eventually we should enable this for all platforms and get rid of the define. */
-#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(QT)
+#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(QT)
 #define WTF_USE_PLATFORM_STRATEGIES 1
 #endif