Skip to content

Commit

Permalink
Merge pull request #2331 from elBoberido/iox-2329-add-iox-atomic
Browse files Browse the repository at this point in the history
iox-#2329 Add iox::Atomic
  • Loading branch information
elBoberido committed Aug 21, 2024
2 parents 912931a + 74caf49 commit 8a2a18f
Show file tree
Hide file tree
Showing 8 changed files with 1,310 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .clang-tidy-diff-scans.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
./iceoryx_platform/generic/include/iceoryx_platform/atomic.hpp

./iceoryx_hoofs/**/*

./iceoryx_posh/experimental/include/iox/**/*
Expand Down
1 change: 1 addition & 0 deletions doc/website/release-notes/iceoryx-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
- Add an `iox1` prefix to all resources created by `iceoryx_posh` and `RouDi` [#2185](https://github.com/eclipse-iceoryx/iceoryx/issues/2185)
- Make iceoryx resource prefix a compile time option [#2272](https://github.com/eclipse-iceoryx/iceoryx/issues/2272)
- Improve introspection-client interface by adding the number of ports in parentheses [#2299](https://github.com/eclipse-iceoryx/iceoryx/issues/2299)
- Add std::atomic abstraction [#2329](https://github.com/eclipse-iceoryx/iceoryx/issues/2329)

**Bugfixes:**

Expand Down
22 changes: 22 additions & 0 deletions iceoryx_hoofs/concurrent/sync/include/iox/atomic.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright (c) 2024 by ekxide IO GmbH. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// SPDX-License-Identifier: Apache-2.0

#ifndef IOX_HOOFS_CONCURRENT_SYNC_ATOMIC_HPP
#define IOX_HOOFS_CONCURRENT_SYNC_ATOMIC_HPP

#include "iceoryx_platform/atomic.hpp"

#endif // IOX_HOOFS_CONCURRENT_SYNC_ATOMIC_HPP
1 change: 1 addition & 0 deletions iceoryx_platform/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ cc_library(
],
linkopts = select({
":linux": [
"-latomic",
"-lpthread",
"-lrt",
],
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_platform/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ iox_add_library(
PROJECT_PREFIX ${PREFIX}
EXPORT_INCLUDE_DIRS generic/include/
${ICEORYX_PLATFORM}/include/
PUBLIC_LIBS_LINUX rt pthread
PUBLIC_LIBS_LINUX atomic rt pthread
PUBLIC_LIBS_UNIX rt pthread
PRIVATE_LIBS_QNX socket
PUBLIC_LIBS_FREERTOS freertos_sdk::FreeRTOS_POSIX
Expand Down
Loading

0 comments on commit 8a2a18f

Please sign in to comment.