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

iox-#2130 Merge 'iceoryx_dust' back to 'iceoryx_hoofs' #2133

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fa58f6e
iox-#2130 Move 'vocabulary' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 11, 2023
d5eaa65
iox-#2130 Update README
elBoberido Dec 11, 2023
ba3942b
iox-#2130 Move 'container' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 12, 2023
ff5e7f2
iox-#2130 Scan all files in the 'container' module
elBoberido Dec 12, 2023
08967a7
iox-#2130 Move 'filesystem' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 12, 2023
4e69337
iox-#2130 Move 'utility' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 12, 2023
d63ec9d
iox-#2130 Move 'memory' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 12, 2023
28908d6
iox-#2130 Move 'ipc' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 12, 2023
726128f
iox-#2130 Move 'sync' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 12, 2023
c3677c0
iox-#2130 Move 'cli' types from 'iceoryx_dust' to 'iceoryx_hoofs'
elBoberido Dec 12, 2023
b323a66
iox-#2130 Remove 'iceoryx_dust'
elBoberido Dec 12, 2023
ab5f47d
iox-#2130 Revert from 'function_ref' to 'function'
elBoberido Dec 12, 2023
8c04f2b
iox-#2130 Add missing include
elBoberido Dec 12, 2023
10d4de6
iox-#2130 Remove dust test from cirrus-ci
elBoberido Dec 12, 2023
c3d6a1c
iox-#2130 Use 'std::abort' instead of 'std::quick_exit'
elBoberido Dec 12, 2023
0f5b264
iox-#2130 Fix bazel build
elBoberido Dec 12, 2023
9ff9597
iox-#2130 Pin bazel to a fixed version
elBoberido Dec 12, 2023
7095220
iox-#2130 Remove debug code
elBoberido Dec 12, 2023
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
Prev Previous commit
Next Next commit
iox-#2130 Remove 'iceoryx_dust'
  • Loading branch information
elBoberido committed Dec 12, 2023
commit b323a66fcebf94919a096ca61bf8de86b3153765
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ Please see the [Quality Declaration](./QUALITY_DECLARATION.md) for details of th
|-----------------------|:-------------:|:-----------------:|:---------------------------------------:|
| iceoryx_hoofs | 2 | 1+ | 1 |
| iceoryx_posh | 2 | 1+, 2 | 1 |
| iceoryx_dust | 2 | 2 | 2 |
| iceoryx_binding_c | 2 | 2 | 2 |
| iceoryx_examples | 5 | 4 | 4 |
| iceoryx_introspection | 5 | 4 | 4 |
Expand Down
14 changes: 0 additions & 14 deletions doc/design/diagrams/iceoryx_components_diagram_v3_0_0.puml
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,6 @@ package iceoryx_hoofs {
}
}

' DUST: Deemed Useful Software Thingies
' Library containing modern C++ STL constructs with quality level 2
package iceoryx_dust {
frame "dust library" {
component "Containers" <<module>> as additional_containers
component "Filesystem" <<module>> as additional_filesystem
component "Buffers" <<module>> as additional_buffers
component "Inter-process communication" <<module>> as additional_ipc
}
}

' POSH: POSIX SHared memory
' Publish/subscribe IPC communication infrastructure based on shared memory
package iceoryx_posh {
Expand Down Expand Up @@ -128,10 +117,7 @@ package iceoryx_introspection {
}

iceoryx_hoofs ..> iceoryx_platform : use
iceoryx_dust ..> iceoryx_platform : use
iceoryx_posh ..> iceoryx_hoofs : use
iceoryx_dust ..> iceoryx_hoofs : use
iceoryx_posh ..> iceoryx_dust : use
iceoryx_dds ..> iceoryx_posh : use
iceoryx_rs ..> iceoryx_posh : use
automotive_soa ..> iceoryx_posh : use
Expand Down
9 changes: 2 additions & 7 deletions doc/design/diagrams/iceoryx_software_layers_v3_0_0.puml
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,19 @@ skinparam frame {
}

[iceoryx_platform]
[iceoryx_dust]
[iceoryx_hoofs]
[iceoryx_posh]
[iceoryx_binding_c]
[C user app]
[C++ user app]

note right of iceoryx_platform : Basic platform support library with quality level 1+
note top of iceoryx_hoofs : Basic building block library with quality level 1+
note top of iceoryx_dust : Basic building block library with quality level 2
note right of iceoryx_platform : Basic platform support library
note top of iceoryx_hoofs : Basic building block library
note top of iceoryx_posh : Shared memory transport (POsix SHared memory)
note right of iceoryx_binding_c : C API for iceoryx_posh

[iceoryx_hoofs] ..> [iceoryx_platform]
[iceoryx_dust] ..> [iceoryx_platform]
[iceoryx_posh] ..> [iceoryx_hoofs]
[iceoryx_dust] ..> [iceoryx_hoofs]
[iceoryx_posh] ..> [iceoryx_dust]
[iceoryx_binding_c] ..> [iceoryx_posh]
[C user app] ..> [iceoryx_binding_c]
[C++ user app] ..> [iceoryx_posh]
Expand Down
2 changes: 1 addition & 1 deletion doc/design/move_and_copy_helper.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,4 @@ void Test::copy_and_move_impl(RhsType&& rhs)

For more examples, see

- `iceoryx_dust/container/detail/fixed_position_container.inl`
- `iceoryx_hoofs/container/detail/fixed_position_container.inl`
400 changes: 69 additions & 331 deletions doc/website/images/iceoryx_components_diagram_v3_0_0.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 12 additions & 16 deletions doc/website/images/iceoryx_software_layers_v3_0_0.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 11 additions & 4 deletions doc/website/release-notes/iceoryx-unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@
- `SignalHandler` returns an `iox::expected` in `registerSignalHandler` [\#1196](https://github.com/eclipse-iceoryx/iceoryx/issues/1196)
- Remove the unused `PosixRights` struct [\#1556](https://github.com/eclipse-iceoryx/iceoryx/issues/1556)
- Move quality level 2 classes to new package `iceoryx_dust` [\#590](https://github.com/eclipse-iceoryx/iceoryx/issues/590)
- moved back to `hoofs`
- Remove unused classes from `iceoryx_hoofs` [\#590](https://github.com/eclipse-iceoryx/iceoryx/issues/590)
- `cxx::PoorMansHeap`
- Other `internal` classes
Expand All @@ -168,25 +169,31 @@
- Replace uses of `std::cout`, `std::cerr` with the iceoryx logger [\#1756](https://github.com/eclipse-iceoryx/iceoryx/issues/1756)
- Move `IOX_NO_DISCARD`, `IOX_FALLTHROUGH` and `IOX_MAYBE_UNUSED` to `iceoryx_platform` [\#1726](https://github.com/eclipse-iceoryx/iceoryx/issues/1726)
- Move `cxx::static_storage` from `iceoryx_hoofs` to `iceoryx_dust` [\#1732](https://github.com/eclipse-iceoryx/iceoryx/issues/1732)
- moved back to `hoofs`
- Remove `algorithm::uniqueMergeSortedContainers` from `algorithm.hpp`
- Move `std::string` conversion function to `iceoryx_dust` [\#1612](https://github.com/eclipse-iceoryx/iceoryx/issues/1612)
- moved back to `hoofs`
- The posix call `unlink` is directly used in `UnixDomainSocket` [\#1622](https://github.com/eclipse-iceoryx/iceoryx/issues/1622)
- Wrap all C calls in posixCall in IntrospectionApp [\#1692](https://github.com/eclipse-iceoryx/iceoryx/issues/1692)
- Move `std::chrono` dependency to `iceoryx_dust` [\#536](https://github.com/eclipse-iceoryx/iceoryx/issues/536)
- moved back to `hoofs`
- Move `std::string` dependency from `iox::string` to `std_string_support.hpp` in `iceoryx_dust` [\#1612](https://github.com/eclipse-iceoryx/iceoryx/issues/1612)
- moved back to `hoofs`
- Better align `iox::expected` with `std::expected` [\#1969](https://github.com/eclipse-iceoryx/iceoryx/issues/1969)
- Use logger for "RouDi is ready for clients" message [\#1994](https://github.com/eclipse-iceoryx/iceoryx/issues/1994)
- Speed up posh tests [#1030](https://github.com/eclipse-iceoryx/iceoryx/issues/1030)
- Roudi Environment independent from Googletest [#1533](https://github.com/eclipse-iceoryx/iceoryx/issues/1533)
- Move test class for ctor and assignment operators to hoofs testing [#2041](https://github.com/eclipse-iceoryx/iceoryx/issues/2041)
- Refactor `FixedPositionContainer` and move to `dust` [#2044](https://github.com/eclipse-iceoryx/iceoryx/issues/2044)
- final location is `hoofs`
- Cleanup or Remove ObjectPool [#66](https://github.com/eclipse-iceoryx/iceoryx/issues/66)
- Improve process is alive detection [#1361](https://github.com/eclipse-iceoryx/iceoryx/issues/1361)
- only partially
- IPC call is replaced with heartbeat via shared memory
- Removed IOX_INTERNAL_MAX_NUMBER_OF_NOTIFIERS and made IOX_MAX_NUMBER_OF_NOTIFIERS configurable again [#2083](https://github.com/eclipse-iceoryx/iceoryx/issues/2083)
- Setting IOX_NO_DISCARD in QNX [#638](https://github.com/eclipse-iceoryx/iceoryx/issues/638)
- Replace `iox::byte_t` with std::byte [#1900](https://github.com/eclipse-iceoryx/iceoryx/issues/1900)
- Merge `iceoryx_dust` back to `iceoryx_hoofs` [#2130](https://github.com/eclipse-iceoryx/iceoryx/issues/2130)

**Workflow:**

Expand Down Expand Up @@ -958,7 +965,7 @@

```

42. Move multiple classes from `iceoryx_hoofs` to `iceoryx_dust`
42. ~~Move multiple classes from `iceoryx_hoofs` to `iceoryx_dust`~~ They are still in `iceoryx_hoofs` but the include path changed nevertheless

```cpp
// before
Expand Down Expand Up @@ -997,7 +1004,7 @@
#include "iceoryx_hoofs/internal/objectpool/objectpool.hpp"

// after
#include "iceoryx_dust/cxx/objectpool.hpp"
// fully removed
```

```cpp
Expand Down Expand Up @@ -1048,7 +1055,7 @@
#include "iox/detail/convert.hpp"
```

43. Move the conversions functions for `std::string` to `iceoryx_dust`:
43. ~~Move the conversions functions for `std::string` to `iceoryx_dust`:~~ They are still in `iceoryx_hoofs` but the include path changed nevertheless

```cpp
// before
Expand Down Expand Up @@ -1135,7 +1142,7 @@
std::byte m_size;
```

48. Move conversion methods from `duration.hpp` to `iceoryx_dust`
48. ~~Move conversion methods from `duration.hpp` to `iceoryx_dust`~~ They are still in `iceoryx_hoofs` but the include path changed nevertheless

```cpp
// before
Expand Down
31 changes: 0 additions & 31 deletions iceoryx_dust/BUILD.bazel

This file was deleted.

57 changes: 0 additions & 57 deletions iceoryx_dust/CMakeLists.txt

This file was deleted.

13 changes: 0 additions & 13 deletions iceoryx_dust/README.md

This file was deleted.

26 changes: 0 additions & 26 deletions iceoryx_dust/cmake/Config.cmake.in

This file was deleted.

25 changes: 0 additions & 25 deletions iceoryx_dust/cmake/iceoryx_dustConfig.cmake

This file was deleted.

24 changes: 0 additions & 24 deletions iceoryx_dust/cmake/iceoryx_dust_testingConfig.cmake

This file was deleted.

25 changes: 0 additions & 25 deletions iceoryx_dust/package.xml

This file was deleted.

44 changes: 0 additions & 44 deletions iceoryx_dust/test/BUILD.bazel

This file was deleted.

Loading
Loading