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.

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

Add atomic fallback for CXX without std::atomic #319

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ set(FRAG_MAX_SIZE 0 CACHE STRING "Use this to override the maximum size for frag
set(BATCH_UNICAST_SIZE 0 CACHE STRING "Use this to override the maximum unicast batch size")
set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
if(CMAKE_EXPORT_COMPILE_COMMANDS)
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES
${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
endif()

Expand Down Expand Up @@ -62,6 +62,19 @@ endif()
set(CMAKE_C_STANDARD_REQUIRED TRUE)
add_definition(ZENOH_C_STANDARD=${CMAKE_C_STANDARD})

check_cxx_source_compiles("
#include <atomic>

int main() {
std::atomic<int> u{5};
return u;
}" HAVE_CXX_STD_ATOMIC)

if (NOT HAVE_CXX_STD_ATOMIC)
message(STATUS "Did not find std::atomic support, using fallback mechanism")
add_definition(ZENOH_CXX_ATOMIC_FALLBACK)
endif()

# while in development, use timestamp for patch version:
string(TIMESTAMP PROJECT_VERSION_PATCH "%Y%m%ddev")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
Expand Down Expand Up @@ -452,4 +465,4 @@ if(PACKAGING)
include(CPack)
endif()

endif()
endif()
4 changes: 2 additions & 2 deletions include/zenoh-pico/api/macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#if ZENOH_C_STANDARD != 99

#ifndef __cplusplus
#if !defined(__cplusplus) || ZENOH_CXX_ATOMIC_FALLBACK

Check warning

Code scanning / Cppcheck (reported by Codacy)

misra violation 2009 with no text in the supplied rule-texts-file Warning

misra violation 2009 with no text in the supplied rule-texts-file

// clang-format off

Expand Down Expand Up @@ -322,7 +322,7 @@
inline bool z_check(const z_owned_hello_t& v) { return z_hello_check(&v); }
inline bool z_check(const z_owned_str_t& v) { return z_str_check(&v); }

inline void z_call(const z_owned_closure_sample_t &closure, const z_sample_t *sample)
inline void z_call(const z_owned_closure_sample_t &closure, const z_sample_t *sample)
{ z_closure_sample_call(&closure, sample); }
inline void z_call(const z_owned_closure_query_t &closure, const z_query_t *query)
{ z_closure_query_call(&closure, query); }
Expand Down
32 changes: 32 additions & 0 deletions include/zenoh-pico/collections/pointer.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,37 @@
#define _z_memory_order_release memory_order_release
#define _z_memory_order_relaxed memory_order_relaxed
#else

#ifdef ZENOH_CXX_ATOMIC_FALLBACK /* Useful for CXX platforms that don't provide std::atomic */
typedef enum
{
memory_order_relaxed = __ATOMIC_RELAXED,
memory_order_consume = __ATOMIC_CONSUME,
memory_order_acquire = __ATOMIC_ACQUIRE,
memory_order_release = __ATOMIC_RELEASE,
memory_order_acq_rel = __ATOMIC_ACQ_REL,
memory_order_seq_cst = __ATOMIC_SEQ_CST
} memory_order;

extern void atomic_thread_fence (memory_order);
#define atomic_thread_fence(MO) __atomic_thread_fence (MO)
#if ULONG_MAX == 4294967295UL
#define _z_atomic(T) unsigned int
#define _z_atomic_store_explicit __atomic_store_4
#define _z_atomic_fetch_add_explicit __atomic_fetch_add_4
#define _z_atomic_fetch_sub_explicit __atomic_fetch_sub_4
#elif ULONG_MAX == 18446744073709551615UL
#define _z_atomic(T) unsigned int
#define _z_atomic_store_explicit __atomic_store_8
#define _z_atomic_fetch_add_explicit __atomic_fetch_add_8
#define _z_atomic_fetch_sub_explicit __atomic_fetch_sub_8
#else
#error "Can't determine size of unsigned int"
#endif
#define _z_memory_order_acquire memory_order_acquire
#define _z_memory_order_release memory_order_release
#define _z_memory_order_relaxed memory_order_relaxed
#else
#include <atomic>
#define _z_atomic(X) std::atomic<X>
#define _z_atomic_store_explicit std::atomic_store_explicit
Expand All @@ -38,6 +69,7 @@
#define _z_memory_order_acquire std::memory_order_acquire
#define _z_memory_order_release std::memory_order_release
#define _z_memory_order_relaxed std::memory_order_relaxed
#endif
#endif // __cplusplus

/*------------------ Internal Array Macros ------------------*/
Expand Down
Loading