Title: [129549] trunk/Source
- Revision
- 129549
- Author
- [email protected]
- Date
- 2012-09-25 13:40:30 -0700 (Tue, 25 Sep 2012)
Log Message
Remove HAVE_SBRK since we never set use_sbrk to true
https://bugs.webkit.org/show_bug.cgi?id=97525
<rdar://problem/12363601>
Reviewed by Geoffrey Garen.
Source/WebKit/blackberry:
* WebCoreSupport/AboutDataHaveFeatures.in: Remove SBRK from list.
Source/WTF:
The code under HAVE(SBRK) has not been used since 2005. We use mmap not sbrk for FastMalloc
not sbrk. We can just remove the define and move all of this code inside #ifndef
WTF_CHANGES.
* wtf/Platform.h:
* wtf/TCSystemAlloc.cpp:
(TCMalloc_SystemAlloc):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (129548 => 129549)
--- trunk/Source/WTF/ChangeLog 2012-09-25 20:18:06 UTC (rev 129548)
+++ trunk/Source/WTF/ChangeLog 2012-09-25 20:40:30 UTC (rev 129549)
@@ -1,3 +1,19 @@
+2012-09-25 Pratik Solanki <[email protected]>
+
+ Remove HAVE_SBRK since we never set use_sbrk to true
+ https://bugs.webkit.org/show_bug.cgi?id=97525
+ <rdar://problem/12363601>
+
+ Reviewed by Geoffrey Garen.
+
+ The code under HAVE(SBRK) has not been used since 2005. We use mmap not sbrk for FastMalloc
+ not sbrk. We can just remove the define and move all of this code inside #ifndef
+ WTF_CHANGES.
+
+ * wtf/Platform.h:
+ * wtf/TCSystemAlloc.cpp:
+ (TCMalloc_SystemAlloc):
+
2012-09-25 Mark Lam <[email protected]>
#undef some symbols before redefining them.
Modified: trunk/Source/WTF/wtf/Platform.h (129548 => 129549)
--- trunk/Source/WTF/wtf/Platform.h 2012-09-25 20:18:06 UTC (rev 129548)
+++ trunk/Source/WTF/wtf/Platform.h 2012-09-25 20:40:30 UTC (rev 129549)
@@ -698,7 +698,6 @@
#define HAVE_LANGINFO_H 1
#define HAVE_MMAP 1
#define HAVE_MERGESORT 1
-#define HAVE_SBRK 1
#define HAVE_STRINGS_H 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
@@ -739,7 +738,6 @@
#define HAVE_MMAP 1
#define HAVE_MADV_FREE_REUSE 1
#define HAVE_MADV_FREE 1
-#define HAVE_SBRK 1
#define HAVE_STRINGS_H 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
@@ -749,7 +747,6 @@
#define HAVE_ERRNO_H 1
#define HAVE_NMAP 1
-#define HAVE_SBRK 1
#define HAVE_STRINGS_H 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
@@ -761,7 +758,6 @@
#define HAVE_ERRNO_H 1
#define HAVE_LANGINFO_H 1
#define HAVE_MMAP 1
-#define HAVE_SBRK 1
#define HAVE_STRINGS_H 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
Modified: trunk/Source/WTF/wtf/TCSystemAlloc.cpp (129548 => 129549)
--- trunk/Source/WTF/wtf/TCSystemAlloc.cpp 2012-09-25 20:18:06 UTC (rev 129548)
+++ trunk/Source/WTF/wtf/TCSystemAlloc.cpp 2012-09-25 20:40:30 UTC (rev 129549)
@@ -75,9 +75,6 @@
// to get as much virtual memory as possible.
#ifndef WTF_CHANGES
static bool use_devmem = false;
-#endif
-
-#if HAVE(SBRK)
static bool use_sbrk = false;
#endif
@@ -107,7 +104,7 @@
static const int32_t FLAGS_malloc_devmem_limit = 0;
#endif
-#if HAVE(SBRK)
+#ifndef WTF_CHANGES
static void* TrySbrk(size_t size, size_t *actual_size, size_t alignment) {
size = ((size + alignment - 1) / alignment) * alignment;
@@ -149,7 +146,7 @@
return reinterpret_cast<void*>(ptr);
}
-#endif /* HAVE(SBRK) */
+#endif /* ifndef(WTF_CHANGES) */
#if HAVE(MMAP)
@@ -349,9 +346,7 @@
void* result = TryDevMem(size, actual_size, alignment);
if (result != NULL) return result;
}
-#endif
-#if HAVE(SBRK)
if (use_sbrk && !sbrk_failure) {
void* result = TrySbrk(size, actual_size, alignment);
if (result != NULL) return result;
Modified: trunk/Source/WebKit/blackberry/ChangeLog (129548 => 129549)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-25 20:18:06 UTC (rev 129548)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-25 20:40:30 UTC (rev 129549)
@@ -1,3 +1,13 @@
+2012-09-25 Pratik Solanki <[email protected]>
+
+ Remove HAVE_SBRK since we never set use_sbrk to true
+ https://bugs.webkit.org/show_bug.cgi?id=97525
+ <rdar://problem/12363601>
+
+ Reviewed by Geoffrey Garen.
+
+ * WebCoreSupport/AboutDataHaveFeatures.in: Remove SBRK from list.
+
2012-09-25 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=95397
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in (129548 => 129549)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in 2012-09-25 20:18:06 UTC (rev 129548)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/AboutDataHaveFeatures.in 2012-09-25 20:40:30 UTC (rev 129549)
@@ -35,7 +35,6 @@
QT5
READLINE
RUNLOOP_TIMER
-SBRK
SIGNAL_H
STDINT_H
STRING_H
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
