[libcxx-commits] [libcxxabi] 77054f3 - [libc++abi][NFC] Run clang-format on a test that I am about to modify

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Fri Sep 8 06:47:58 PDT 2023


Author: Louis Dionne
Date: 2023-09-08T09:47:49-04:00
New Revision: 77054f3946161ea43b67a623f33d4647e5c850fc

URL: https://github.com/llvm/llvm-project/commit/77054f3946161ea43b67a623f33d4647e5c850fc
DIFF: https://github.com/llvm/llvm-project/commit/77054f3946161ea43b67a623f33d4647e5c850fc.diff

LOG: [libc++abi][NFC] Run clang-format on a test that I am about to modify

https://reviews.llvm.org/D138460 touches that test a bunch, so we might
as well clang-format it first.

Added: 
    

Modified: 
    libcxxabi/test/test_exception_storage.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxxabi/test/test_exception_storage.pass.cpp b/libcxxabi/test/test_exception_storage.pass.cpp
index f1cfe6e934f61f9..4e8079a6eff8404 100644
--- a/libcxxabi/test/test_exception_storage.pass.cpp
+++ b/libcxxabi/test/test_exception_storage.pass.cpp
@@ -16,61 +16,61 @@
 
 #include "test_macros.h"
 
-typedef __cxxabiv1::__cxa_eh_globals globals_t ;
+typedef __cxxabiv1::__cxa_eh_globals globals_t;
 
-void *thread_code (void *parm) {
-    size_t *result = (size_t *) parm;
-    globals_t *glob1, *glob2;
+void* thread_code(void* parm) {
+  size_t* result = (size_t*)parm;
+  globals_t *glob1, *glob2;
 
-    glob1 = __cxxabiv1::__cxa_get_globals ();
-    if ( NULL == glob1 )
-        std::printf("Got null result from __cxa_get_globals\n");
+  glob1 = __cxxabiv1::__cxa_get_globals();
+  if (NULL == glob1)
+    std::printf("Got null result from __cxa_get_globals\n");
 
-    glob2 = __cxxabiv1::__cxa_get_globals_fast ();
-    if ( glob1 != glob2 )
-        std::printf("Got 
diff erent globals!\n");
+  glob2 = __cxxabiv1::__cxa_get_globals_fast();
+  if (glob1 != glob2)
+    std::printf("Got 
diff erent globals!\n");
 
-    *result = (size_t) glob1;
+  *result = (size_t)glob1;
 #ifndef TEST_HAS_NO_THREADS
-    sleep ( 1 );
+  sleep(1);
 #endif
-    return parm;
+  return parm;
 }
 
 #ifndef TEST_HAS_NO_THREADS
-#define NUMTHREADS  10
-size_t                 thread_globals [ NUMTHREADS ] = { 0 };
-std::__libcpp_thread_t   threads        [ NUMTHREADS ];
+#  define NUMTHREADS 10
+size_t thread_globals[NUMTHREADS] = {0};
+std::__libcpp_thread_t threads[NUMTHREADS];
 #endif
 
 int main() {
 #ifndef TEST_HAS_NO_THREADS
-//  Make the threads, let them run, and wait for them to finish
-    for ( int i = 0; i < NUMTHREADS; ++i )
-        std::__libcpp_thread_create ( threads + i, thread_code, (void *) (thread_globals + i));
-    for ( int i = 0; i < NUMTHREADS; ++i )
-        std::__libcpp_thread_join ( &threads [ i ] );
+  //  Make the threads, let them run, and wait for them to finish
+  for (int i = 0; i < NUMTHREADS; ++i)
+    std::__libcpp_thread_create(threads + i, thread_code, (void*)(thread_globals + i));
+  for (int i = 0; i < NUMTHREADS; ++i)
+    std::__libcpp_thread_join(&threads[i]);
 
-    int retVal = 0;
-    for ( int i = 0; i < NUMTHREADS; ++i ) {
-        if ( 0 == thread_globals [ i ] ) {
-            std::printf("Thread #%d had a zero global\n", i);
-            retVal = 1;
-        }
+  int retVal = 0;
+  for (int i = 0; i < NUMTHREADS; ++i) {
+    if (0 == thread_globals[i]) {
+      std::printf("Thread #%d had a zero global\n", i);
+      retVal = 1;
     }
+  }
 
-    std::sort ( thread_globals, thread_globals + NUMTHREADS );
-    for ( int i = 1; i < NUMTHREADS; ++i ) {
-        if ( thread_globals [ i - 1 ] == thread_globals [ i ] ) {
-            std::printf("Duplicate thread globals (%d and %d)\n", i-1, i);
-            retVal = 2;
-        }
+  std::sort(thread_globals, thread_globals + NUMTHREADS);
+  for (int i = 1; i < NUMTHREADS; ++i) {
+    if (thread_globals[i - 1] == thread_globals[i]) {
+      std::printf("Duplicate thread globals (%d and %d)\n", i - 1, i);
+      retVal = 2;
     }
-    return retVal;
-#else // TEST_HAS_NO_THREADS
-    size_t thread_globals;
-    thread_code(&thread_globals);
-    // Check that __cxa_get_globals() is not NULL.
-    return (thread_globals == 0) ? 1 : 0;
+  }
+  return retVal;
+#else  // TEST_HAS_NO_THREADS
+  size_t thread_globals;
+  thread_code(&thread_globals);
+  // Check that __cxa_get_globals() is not NULL.
+  return (thread_globals == 0) ? 1 : 0;
 #endif // !TEST_HAS_NO_THREADS
 }


        


More information about the libcxx-commits mailing list