Changeset 286773 in webkit

Timestamp:

Dec 9, 2021, 3:23:27 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[libpas] Fix up missing header includes and build guards in unit tests
​https://bugs.webkit.org/show_bug.cgi?id=234007

Patch by Zan Dobersek <​zdobersek@igalia.com> on 2021-12-09
Reviewed by Yusuke Suzuki.

Add missing header inclusions in different libpas unit test sources
to avoid build problems.

In IsoHeapChaosTests.cpp, Mach-specific thread-related header inclusion
and usage is put inside PAS_OS(DARWIN) build guards. On Linux, the
enumerator sub-tests that utilize this thread suspension and resuming
functionality are disabled.

• libpas/src/test/ExpendableMemoryTests.cpp:
• libpas/src/test/IsoHeapChaosTests.cpp:

(std::testAllocationChaos):

• libpas/src/test/IsoHeapPageSharingTests.cpp:
• libpas/src/test/IsoHeapPartialAndBaselineTests.cpp:
• libpas/src/test/RaceTests.cpp:
• libpas/src/test/TestHarness.cpp:
• libpas/src/test/ThingyAndUtilityHeapAllocationTests.cpp:

Location:

trunk/Source/bmalloc

Files:

• ChangeLog (modified) (1 diff)
• libpas/src/test/ExpendableMemoryTests.cpp (modified) (1 diff)
• libpas/src/test/IsoHeapChaosTests.cpp (modified) (5 diffs)
• libpas/src/test/IsoHeapPageSharingTests.cpp (modified) (1 diff)
• libpas/src/test/IsoHeapPartialAndBaselineTests.cpp (modified) (1 diff)
• libpas/src/test/RaceTests.cpp (modified) (1 diff)
• libpas/src/test/TestHarness.cpp (modified) (1 diff)
• libpas/src/test/ThingyAndUtilityHeapAllocationTests.cpp (modified) (1 diff)

trunk/Source/bmalloc/ChangeLog

@@ +1 @@
+2021-12-09  Zan Dobersek  <zdobersek@igalia.com>
+
+        [libpas] Fix up missing header includes and build guards in unit tests
+        https://bugs.webkit.org/show_bug.cgi?id=234007
+
+        Reviewed by Yusuke Suzuki.
+
+        Add missing header inclusions in different libpas unit test sources
+        to avoid build problems.
+
+        In IsoHeapChaosTests.cpp, Mach-specific thread-related header inclusion
+        and usage is put inside PAS_OS(DARWIN) build guards. On Linux, the
+        enumerator sub-tests that utilize this thread suspension and resuming
+        functionality are disabled.
+
+        * libpas/src/test/ExpendableMemoryTests.cpp:
+        * libpas/src/test/IsoHeapChaosTests.cpp:
+        (std::testAllocationChaos):
+        * libpas/src/test/IsoHeapPageSharingTests.cpp:
+        * libpas/src/test/IsoHeapPartialAndBaselineTests.cpp:
+        * libpas/src/test/RaceTests.cpp:
+        * libpas/src/test/TestHarness.cpp:
+        * libpas/src/test/ThingyAndUtilityHeapAllocationTests.cpp:
+
 2021-12-08  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/bmalloc/libpas/src/test/ExpendableMemoryTests.cpp

@@ -29 +29 @@
 
 #include "bmalloc_heap.h"
+#include <condition_variable>
+#include <mutex>
 #include "pas_compact_expendable_memory.h"
 #include "pas_large_expendable_memory.h"

trunk/Source/bmalloc/libpas/src/test/IsoHeapChaosTests.cpp

@@ -41 +41 @@
 #include "jit_heap.h"
 #include "jit_heap_config.h"
-#include <mach/thread_act.h>
 #include <map>
 #include "minalign32_heap.h"
 #include "minalign32_heap_config.h"
+#include <mutex>
 #include "pagesize64k_heap.h"
 #include "pagesize64k_heap_config.h"
@@ -63 +63 @@
 #include <vector>
 #include <thread>
+
+#if PAS_OS(DARWIN)
+#include <mach/thread_act.h>
+#endif
 
 using namespace std;
@@ -611 +615 @@
             }
             
+#if PAS_OS(DARWIN)
             for (pthread_t thread : runningThreads) {
                 kern_return_t result = thread_suspend(pthread_mach_thread_np(thread));
                 PAS_ASSERT(result == KERN_SUCCESS);
             }
+#endif
 
             pageRanges.clear();
@@ -807 +813 @@
                 cout << "    Did " << numEnumerations << " enumerations.\n";
             
+#if PAS_OS(DARWIN)
             for (pthread_t thread : runningThreads) {
                 kern_return_t result = thread_resume(pthread_mach_thread_np(thread));
                 PAS_ASSERT(result == KERN_SUCCESS);
             }
+#endif
 
             lock.unlock();
@@ -928 +936 @@
 void addTheTests(unsigned multiplier, bool testEnumerator)
 {
+#if PAS_OS(LINUX)
+    // FIXME: thread suspension/resume in libpas, required for enumerator tests, is missing on Linux
+    // http://webkit.org/b/234071
+    testEnumerator = false;
+#endif
+
     ADD_TEST(testAllocationChaos(1, 0, 1000 * multiplier, 1000000 * multiplier, uniformlyRandomUpTo5000, 10000000 * multiplier, false));
     ADD_TEST(testAllocationChaos(1, 10, 1000 * multiplier, 500000 * multiplier, sometimesSmallSometimesBig, 10000000 * multiplier, false));

trunk/Source/bmalloc/libpas/src/test/IsoHeapPageSharingTests.cpp

@@ -30 +30 @@
 #include "HeapLocker.h"
 #include "LargeSharingPoolDump.h"
+#include <condition_variable>
 #include <functional>
 #include "iso_heap.h"
 #include "iso_heap_config.h"
 #include "iso_heap_innards.h"
+#include <mutex>
 #include "pas_all_heaps.h"
 #include "pas_baseline_allocator_table.h"

trunk/Source/bmalloc/libpas/src/test/IsoHeapPartialAndBaselineTests.cpp

@@ -33 +33 @@
 #include "iso_test_heap.h"
 #include "iso_test_heap_config.h"
+#include <mutex>
 #include "pas_baseline_allocator_table.h"
 #include "pas_heap.h"

trunk/Source/bmalloc/libpas/src/test/RaceTests.cpp

@@ -25 +25 @@
 
 #include "TestHarness.h"
+#include <condition_variable>
 #include <functional>
 #include "iso_heap.h"

trunk/Source/bmalloc/libpas/src/test/TestHarness.cpp

@@ -27 +27 @@
 
 #include "Verifier.h"
+#include <atomic>
 #include "iso_heap_config.h"
 #include "iso_test_heap_config.h"

trunk/Source/bmalloc/libpas/src/test/ThingyAndUtilityHeapAllocationTests.cpp

@@ -33 +33 @@
 #include <functional>
 #include <map>
+#include <mutex>
 #include "pas_all_heaps.h"
 #include "pas_baseline_allocator_table.h"