Replace atomic_ops with std::atomic #3082
Merged
Commits on Jan 24, 2024
-
-
Switch from AO_t -> atomic_int in atomic.d
No longer need to include atomic_ops.h
-
Explicitly include assert header
Previously, it was included via atomic_ops.h.
-
Move definition of atomic_field struct to its own header
Used in both d and system directories
-
Replace atomic_ops with std::atomic in supervisor directory
We also include atomic-exports.h instead of copy/pasting its contents.
-
-
-
-
-
-
-
-
-
Don't cast to atomic_int in test(atomicField)
"load" returns an int anyway, and this was causing a fatal error on macOS: CC interrupts-tmp.c ../../../../Macaulay2/d/interrupts.d:25:100: fatal error: used type 'atomic_int' (aka '_Atomic(int)') where arithmetic or pointer type is required tmp__5 = (load_Field((*((struct atomic_field*)TS_Get_Local(interrupts_interruptedFlag_id)))) != ((atomic_int)0)); ^ ~ -
Refactor store() for atomicField/atomicFieldPointer to take an int
Otherwise, we get compile errors using clang, e.g.: CC interrupts-tmp.c ../../../../Macaulay2/d/interrupts.d:25:85: fatal error: used type 'atomic_int' (aka '_Atomic(int)') where arithmetic or pointer type is required store_Field((*((struct atomic_field*)TS_Get_Local(interrupts_exceptionFlag_id))),((atomic_int)tmp__4)); ^ ~~~~~~ ../../../../Macaulay2/d/../../include/M2/atomic-field.h:20:52: note: expanded from macro 'store_Field' #define store_Field(x,val) atomic_store(&(x).field,val) ^~~ /Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/14.0.0/include/stdatomic.h:121:66: note: expanded from macro 'atomic_store' #define atomic_store(object, desired) __c11_atomic_store(object, desired, __ATOMIC_SEQ_CST) ^~~~~~~ -
There were lots of things we were never actually using
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.