Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup #302

Merged
merged 9 commits into from
Oct 18, 2024
Merged

Cleanup #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f0766a7
Skip msan builds with hwloc because hwloc causes a bunch false positi…
insertinterestingnamehere Oct 17, 2024
1880c47
Fix an unused variable warning in release builds. Fixes #299.
insertinterestingnamehere Oct 17, 2024
2368ba6
Formatting fix.
insertinterestingnamehere Oct 17, 2024
348c53e
Add most recent formatting fix to blame ignore list.
insertinterestingnamehere Oct 17, 2024
d2caf37
Increase time limit for arm gcc and clang builds to avoid timeouts.
insertinterestingnamehere Oct 18, 2024
c3c5cd9
Increase timeout for MUSL CI builds.
insertinterestingnamehere Oct 18, 2024
925ba14
Increase timeout for acfl and nvc builds as well.
insertinterestingnamehere Oct 18, 2024
e4a0868
Disable failing MUSL CI builds. As best I can tell it's a topology de…
insertinterestingnamehere Oct 18, 2024
1cc490c
Fix strict prototype warning from recent binders topology fix.
insertinterestingnamehere Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 49 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
- run:
command: |
timeout --foreground -k 10s 4m make check
no_output_timeout: 60s
no_output_timeout: 180s

musl:
parameters:
Expand All @@ -198,7 +198,7 @@ jobs:
make tests -j2
- run:
command: make check
no_output_timeout: 60s
no_output_timeout: 180s

workflows:
build_and_test:
Expand All @@ -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:
Expand All @@ -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

1 change: 1 addition & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
6901dc07127f54c060ec4046e21d05ccd7f437ab
3ddc9da40f8b34565c90d17ef83a9ef95a9deb18
d1196d946c6551b205791f47ee952412e1a3e9bc
2368ba6baaeb986a16d7444edf412e3ef74296b4
8 changes: 8 additions & 0 deletions include/qthread/syncvar.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/affinity/binders.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/fastcontext/context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading