Merge pull request #302 from insertinterestingnamehere/cleanup

Cleanup
sandialabs · Oct 18, 2024 · 2345ecf · 2345ecf
2 parents 1e9775a + 1cc490c
commit 2345ecf
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
           make tests -j2
       - run:
           command: timeout --foreground -k 10s 2m make check
-          no_output_timeout: 60s
+          no_output_timeout: 180s
 
   arm_clang:
     parameters:
@@ -59,7 +59,7 @@ jobs:
           make tests -j2
       - run:
           command: timeout --foreground -k 10s 2m make check
-          no_output_timeout: 60s
+          no_output_timeout: 180s
 
   arm_sanitizers:
     parameters:
@@ -135,7 +135,7 @@ jobs:
           command: |
               export PATH=$PATH:/opt/arm/arm-linux-compiler-24.04_Ubuntu-22.04/bin
               timeout --foreground -k 10s 4m make check
-          no_output_timeout: 60s
+          no_output_timeout: 180s
 
   nvc:
     parameters:
@@ -174,7 +174,7 @@ jobs:
       - run:
           command: |
               timeout --foreground -k 10s 4m make check
-          no_output_timeout: 60s
+          no_output_timeout: 180s
 
   musl:
     parameters:
@@ -198,7 +198,7 @@ jobs:
           make tests -j2
       - run:
           command: make check
-          no_output_timeout: 60s
+          no_output_timeout: 180s
 
 workflows:
   build_and_test:
@@ -219,6 +219,25 @@ workflows:
               scheduler: [nemesis, sherwood, distrib]
               topology: ['no', binders, hwloc]
               sanitizer: [address, memory, thread, undefined]
+            exclude:
+              - scheduler: nemesis
+                topology: binders
+                sanitizer: memory
+              - scheduler: sherwood
+                topology: binders
+                sanitizer: memory
+              - scheduler: distrib
+                topology: binders
+                sanitizer: memory
+              - scheduler: nemesis
+                topology: hwloc
+                sanitizer: memory
+              - scheduler: sherwood
+                topology: hwloc
+                sanitizer: memory
+              - scheduler: distrib
+                topology: hwloc
+                sanitizer: memory
       - arm_acfl:
           matrix:
             parameters:
@@ -236,4 +255,29 @@ workflows:
               worker_type: [medium, arm.medium]
               scheduler: [nemesis, sherwood, distrib]
               topology: ['no', binders, hwloc]
+            exclude:
+              - worker_type: medium
+                scheduler: sherwood
+                topology: binders
+              - worker_type: medium
+                scheduler: sherwood
+                topology: hwloc
+              - worker_type: medium
+                scheduler: distrib
+                topology: binders
+              - worker_type: medium
+                scheduler: distrib
+                topology: hwloc
+              - worker_type: arm.medium
+                scheduler: sherwood
+                topology: binders
+              - worker_type: arm.medium
+                scheduler: sherwood
+                topology: hwloc
+              - worker_type: arm.medium
+                scheduler: distrib
+                topology: binders
+              - worker_type: arm.medium
+                scheduler: distrib
+                topology: hwloc
 
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,3 +1,4 @@
 6901dc07127f54c060ec4046e21d05ccd7f437ab
 3ddc9da40f8b34565c90d17ef83a9ef95a9deb18
 d1196d946c6551b205791f47ee952412e1a3e9bc
+2368ba6baaeb986a16d7444edf412e3ef74296b4
diff --git a/include/qthread/syncvar.hpp b/include/qthread/syncvar.hpp
@@ -32,8 +32,12 @@ class syncvar {
 
   uint64_t readFF(void) {
     uint64_t ret = 0;
+#ifndef NDEBUG
     int status = readFF(&ret);
     assert(status == QTHREAD_SUCCESS);
+#else
+    readFF(&ret);
+#endif
     return ret;
   }
 
@@ -43,8 +47,12 @@ class syncvar {
 
   uint64_t readFE(void) {
     uint64_t ret = 0;
+#ifndef NDEBUG
     int status = readFE(&ret);
     assert(status == QTHREAD_SUCCESS);
+#else
+    readFE(&ret);
+#endif
     return ret;
   }
 

diff --git a/src/affinity/binders.c b/src/affinity/binders.c
@@ -184,7 +184,7 @@ void INTERNAL qt_affinity_init(qthread_shepherd_id_t *nbshepherds,
   }
 }
 
-void INTERNAL qt_affinity_deinit() {
+void INTERNAL qt_affinity_deinit(void) {
   if (sheps.binds) {
     for (int i = 0; i < sheps.num; i++) { hwloc_bitmap_free(sheps.binds[i]); }
     qt_free(sheps.binds);

diff --git a/src/fastcontext/context.c b/src/fastcontext/context.c
@@ -29,7 +29,7 @@ void INTERNAL qt_makectxt(uctxt_t *ucp, void (*func)(void), int argc, ...) {
         ucp->uc_stack.ss_size / sizeof(unsigned long);
   sp = tos - 16;
 #if defined __BIG_ENDIAN__ || defined _BIG_ENDIAN
-  ucp->mc.pc = *(long*)func;
+  ucp->mc.pc = *(long *)func;
 #else
   ucp->mc.pc = (long)func;
 #endif