Changeset 101041 in webkit

Timestamp:

Nov 22, 2011 7:30:34 PM (12 years ago)

Author:

dbates@webkit.org

Message:

Add WTF infrastructure for the BlackBerry port
​https://bugs.webkit.org/show_bug.cgi?id=72970

Reviewed by Antonio Gomes.

• wtf/Assertions.cpp: Added BlackBerry-specific logging directive.
• wtf/MathExtras.h:

(abs): Added; stdlib doesn't contain abs() on QNX.

• wtf/Platform.h: Define WTF_PLATFORM_BLACKBERRY and enable some platform features.
• wtf/RandomNumberSeed.h:

(WTF::initializeRandomNumberGenerator): For the BlackBerry port, we initialize
the bad pseudo random number generator using time(3) before initializing the
Mersenne Twister random number generator.

• wtf/ThreadingPthreads.cpp:

(WTF::createThreadInternal): Added.

• wtf/blackberry: Added.
• wtf/blackberry/MainThreadBlackBerry.cpp: Added.

(WTF::initializeMainThreadPlatform):
(WTF::scheduleDispatchFunctionsOnMainThread):

• wtf/text/WTFString.h: Added constructor and conversion operator for

BlackBerry WebString string object.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Assertions.cpp (modified) (2 diffs)
• wtf/MathExtras.h (modified) (2 diffs)
• wtf/Platform.h (modified) (4 diffs)
• wtf/RandomNumberSeed.h (modified) (1 diff)
• wtf/ThreadingPthreads.cpp (modified) (4 diffs)
• wtf/blackberry (added)
• wtf/blackberry/MainThreadBlackBerry.cpp (added)
• wtf/text/WTFString.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-11-22  Daniel Bates  <dbates@rim.com>
+
+        Add WTF infrastructure for the BlackBerry port
+        https://bugs.webkit.org/show_bug.cgi?id=72970
+
+        Reviewed by Antonio Gomes.
+
+        * wtf/Assertions.cpp: Added BlackBerry-specific logging directive.
+        * wtf/MathExtras.h:
+        (abs): Added; stdlib doesn't contain abs() on QNX.
+        * wtf/Platform.h: Define WTF_PLATFORM_BLACKBERRY and enable some platform features.
+        * wtf/RandomNumberSeed.h:
+        (WTF::initializeRandomNumberGenerator): For the BlackBerry port, we initialize
+        the bad pseudo random number generator using time(3) before initializing the
+        Mersenne Twister random number generator.
+        * wtf/ThreadingPthreads.cpp:
+        (WTF::createThreadInternal): Added.
+        * wtf/blackberry: Added.
+        * wtf/blackberry/MainThreadBlackBerry.cpp: Added.
+        (WTF::initializeMainThreadPlatform):
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+        * wtf/text/WTFString.h: Added constructor and conversion operator for
+        BlackBerry WebString string object.
+
 2011-11-22  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/JavaScriptCore/wtf/Assertions.cpp

@@ -56 +56 @@
 #endif
 
+#if PLATFORM(BLACKBERRY)
+#include <BlackBerryPlatformMisc.h>
+#endif
+
 extern "C" {
 
@@ -78 +82 @@
         return;
     }
-
+#elif PLATFORM(BLACKBERRY)
+    BlackBerry::Platform::logV(BlackBerry::Platform::LogLevelInfo, format, args);
 #elif HAVE(ISDEBUGGERPRESENT)
     if (IsDebuggerPresent()) {

trunk/Source/JavaScriptCore/wtf/MathExtras.h

@@ -51 +51 @@
 #endif
 
+#if OS(QNX)
+// FIXME: Look into a way to have cmath import its functions into both the standard and global
+// namespace. For now, we include math.h since the QNX cmath header only imports its functions
+// into the standard namespace.
+#include <math.h>
+#endif
+
 #ifndef M_PI
 const double piDouble = 3.14159265358979323846;
@@ -132 +139 @@
 inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); }
 
+#endif
+
+#if COMPILER(GCC) && OS(QNX)
+// The stdlib on QNX doesn't contain long abs(long). See PR #104666.
+inline long long abs(long num) { return labs(num); }
 #endif
 

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -2 +2 @@
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
- * Copyright (C) Research In Motion Limited 2010. All rights reserved.
+ * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -410 +410 @@
 /* PLATFORM(WX) */
 /* PLATFORM(GTK) */
+/* PLATFORM(BLACKBERRY) */
 /* PLATFORM(MAC) */
 /* PLATFORM(WIN) */
@@ -420 +421 @@
 #elif defined(BUILDING_GTK__)
 #define WTF_PLATFORM_GTK 1
+#elif defined(BUILDING_BLACKBERRY__)
+#define WTF_PLATFORM_BLACKBERRY 1
 #elif OS(DARWIN)
 #define WTF_PLATFORM_MAC 1
@@ -469 +472 @@
 #define WTF_USE_CHROMIUM_NET 1
 #endif
+#endif
+
+#if PLATFORM(BLACKBERRY)
+#define ENABLE_DRAG_SUPPORT 0
+#define USE_SYSTEM_MALLOC 1
+#define WTF_USE_MERSENNE_TWISTER_19937 1
+#define WTF_USE_SKIA 1
 #endif
 

trunk/Source/JavaScriptCore/wtf/RandomNumberSeed.h

@@ -57 +57 @@
 #elif COMPILER(MSVC) && defined(_CRT_RAND_S)
     // On Windows we use rand_s which initialises itself
-#elif OS(UNIX)
+#elif OS(UNIX) && !PLATFORM(BLACKBERRY)
     // srandomdev is not guaranteed to exist on linux so we use this poor seed, this should be improved
     timeval time;

trunk/Source/JavaScriptCore/wtf/ThreadingPthreads.cpp

@@ -2 +2 @@
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
+ * Copyright (C) 2011 Research In Motion Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56 +57 @@
 #endif
 
+#if PLATFORM(BLACKBERRY)
+#include <BlackBerryPlatformMisc.h>
+#include <BlackBerryPlatformSettings.h>
+#endif
+
 namespace WTF {
 
@@ -147 +153 @@
 }
 
+#if PLATFORM(BLACKBERRY)
+ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char* threadName)
+{
+    pthread_attr_t attr;
+    if (pthread_attr_init(&attr)) {
+        LOG_ERROR("pthread_attr_init() failed: %d", errno);
+        return 0;
+    }
+
+    void* stackAddr;
+    size_t stackSize;
+    if (pthread_attr_getstack(&attr, &stackAddr, &stackSize))
+        LOG_ERROR("pthread_attr_getstack() failed: %d", errno);
+    else {
+        stackSize = BlackBerry::Platform::Settings::get()->secondaryThreadStackSize();
+        if (pthread_attr_setstack(&attr, stackAddr, stackSize))
+            LOG_ERROR("pthread_attr_getstack() failed: %d", errno);
+    }
+
+    pthread_t threadHandle;
+    if (pthread_create(&threadHandle, &attr, entryPoint, data)) {
+        LOG_ERROR("pthread_create() failed: %d", errno);
+        threadHandle = 0;
+    }
+    pthread_setname_np(threadHandle, threadName);
+
+    pthread_attr_destroy(&attr);
+
+    if (!threadHandle)
+        return 0;
+
+    return establishIdentifierForPthreadHandle(threadHandle);
+}
+#else
 ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*)
 {
@@ -157 +197 @@
     return establishIdentifierForPthreadHandle(threadHandle);
 }
+#endif
 
 void initializeCurrentThreadInternal(const char* threadName)

trunk/Source/JavaScriptCore/wtf/text/WTFString.h

@@ -47 +47 @@
 #endif
 
+#if PLATFORM(BLACKBERRY)
+namespace BlackBerry {
+namespace WebKit {
+    class WebString;
+}
+}
+#endif
+
 namespace WTF {
 
@@ -333 +341 @@
     WTF_EXPORT_PRIVATE String(const wxString&);
     WTF_EXPORT_PRIVATE operator wxString() const;
+#endif
+
+#if PLATFORM(BLACKBERRY)
+    String(const BlackBerry::WebKit::WebString&);
+    operator BlackBerry::WebKit::WebString() const;
 #endif