Skip to content

Commit

Permalink
[eclipse-iceoryx#2] Rename iceoryx2-pal-settings into iceoryx2-pal-co…
Browse files Browse the repository at this point in the history
…nfiguration
  • Loading branch information
elfenpiff committed Dec 13, 2023
1 parent 86376c3 commit f0ef902
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ members = [
"iceoryx2",
"iceoryx2-pal/concurrency-primitives",
"iceoryx2-pal/posix/",
"iceoryx2-pal/settings/",
"iceoryx2-pal/configuration/",

"examples",

Expand Down Expand Up @@ -47,7 +47,7 @@ iceoryx2-bb-testing = { version = "0.0.1", path = "iceoryx2-bb/testing/" }

iceoryx2-pal-concurrency-primitives = { version = "0.0.1", path = "iceoryx2-pal/concurrency-primitives/" }
iceoryx2-pal-posix = { version = "0.0.1", path = "iceoryx2-pal/posix/" }
iceoryx2-pal-settings = { version = "0.0.1", path = "iceoryx2-pal/settings/" }
iceoryx2-pal-configuration = { version = "0.0.1", path = "iceoryx2-pal/configuration/" }

iceoryx2-cal = { version = "0.0.1", path = "iceoryx2-cal" }

Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/posix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ iceoryx2-bb-system-types = { workspace = true }
iceoryx2-bb-elementary = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2-pal-posix = { workspace = true }
iceoryx2-pal-settings = { workspace = true }
iceoryx2-pal-configuration = { workspace = true }

lazy_static = { workspace = true }
bitflags = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions iceoryx2-bb/posix/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ pub const ADAPTIVE_WAIT_FINAL_WAITING_TIME: Duration = Duration::from_millis(10)

// directories
pub const TEMP_DIRECTORY: Path =
unsafe { Path::new_unchecked(iceoryx2_pal_settings::TEMP_DIRECTORY) };
unsafe { Path::new_unchecked(iceoryx2_pal_configuration::TEMP_DIRECTORY) };
pub const TEST_DIRECTORY: Path =
unsafe { Path::new_unchecked(iceoryx2_pal_settings::TEST_DIRECTORY) };
unsafe { Path::new_unchecked(iceoryx2_pal_configuration::TEST_DIRECTORY) };
pub const SHARED_MEMORY_DIRECTORY: Path =
unsafe { Path::new_unchecked(iceoryx2_pal_settings::SHARED_MEMORY_DIRECTORY) };
unsafe { Path::new_unchecked(iceoryx2_pal_configuration::SHARED_MEMORY_DIRECTORY) };

// TODO unable to verify?
pub const ACL_LIST_CAPACITY: u32 = 25;
Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/posix/src/directory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ use iceoryx2_bb_container::semantic_string::SemanticStringAccessor;
use iceoryx2_bb_elementary::enum_gen;
use iceoryx2_bb_log::{error, fail, fatal_panic, trace};
use iceoryx2_bb_system_types::{file_name::FileName, file_path::FilePath, path::Path};
use iceoryx2_pal_configuration::PATH_SEPARATOR;
use iceoryx2_pal_posix::posix::Struct;
use iceoryx2_pal_posix::*;
use iceoryx2_pal_posix::{posix::errno::Errno, posix::S_IFDIR};
use iceoryx2_pal_settings::PATH_SEPARATOR;

use crate::file::{File, FileRemoveError};
use crate::file_type::FileType;
Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/posix/src/shared_memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ use iceoryx2_bb_log::{error, fail, fatal_panic, trace};
use iceoryx2_bb_system_types::file_name::*;
use iceoryx2_bb_system_types::file_path::*;
use iceoryx2_bb_system_types::path::*;
use iceoryx2_pal_configuration::PATH_SEPARATOR;
use iceoryx2_pal_posix::posix::errno::Errno;
use iceoryx2_pal_posix::posix::POSIX_SUPPORT_ADVANCED_SIGNAL_HANDLING;
use iceoryx2_pal_posix::posix::POSIX_SUPPORT_PERSISTENT_SHARED_MEMORY;
use iceoryx2_pal_posix::*;
use iceoryx2_pal_settings::PATH_SEPARATOR;

use std::ptr::NonNull;

Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/posix/tests/directory_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use iceoryx2_bb_system_types::file_name::FileName;
use iceoryx2_bb_system_types::file_path::FilePath;
use iceoryx2_bb_system_types::path::Path;
use iceoryx2_bb_testing::assert_that;
use iceoryx2_pal_settings::PATH_SEPARATOR;
use iceoryx2_pal_configuration::PATH_SEPARATOR;

struct TestFixture {
files: Vec<FilePath>,
Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/system-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version = { workspace = true }
[dependencies]
iceoryx2-bb-container = { workspace = true }
iceoryx2-bb-log = { workspace = true }
iceoryx2-pal-settings = { workspace = true }
iceoryx2-pal-configuration = { workspace = true }
serde = { workspace = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/system-types/src/file_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
//! ```

use iceoryx2_bb_container::semantic_string;
use iceoryx2_pal_settings::FILENAME_LENGTH;
use iceoryx2_pal_configuration::FILENAME_LENGTH;

semantic_string! {
/// Represents a file name. The restriction are choosen in a way that it is platform independent.
Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/system-types/src/file_path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use iceoryx2_bb_container::byte_string::FixedSizeByteString;
use iceoryx2_bb_container::semantic_string;
use iceoryx2_bb_container::semantic_string::SemanticStringError;
use iceoryx2_bb_log::fail;
use iceoryx2_pal_settings::{PATH_LENGTH, PATH_SEPARATOR};
use iceoryx2_pal_configuration::{PATH_LENGTH, PATH_SEPARATOR};

semantic_string! {
/// Represents a file path. The restriction are choosen in a way that it is platform independent.
Expand Down
8 changes: 4 additions & 4 deletions iceoryx2-bb/system-types/src/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ use iceoryx2_bb_container::byte_string::FixedSizeByteString;
use iceoryx2_bb_container::semantic_string;

use iceoryx2_bb_log::fail;
use iceoryx2_pal_settings::{FILENAME_LENGTH, PATH_SEPARATOR, ROOT};
use iceoryx2_pal_configuration::{FILENAME_LENGTH, PATH_SEPARATOR, ROOT};

use crate::file_path::FilePath;
use iceoryx2_bb_container::semantic_string::*;

const PATH_LENGTH: usize = iceoryx2_pal_settings::PATH_LENGTH;
const PATH_LENGTH: usize = iceoryx2_pal_configuration::PATH_LENGTH;

semantic_string! {
name: Path,
Expand Down Expand Up @@ -88,9 +88,9 @@ impl Path {
let msg = format!("Unable to add entry \"{}\" to path since it would exceed the maximum supported path length of {} or the entry contains invalid symbols.",
entry, PATH_LENGTH);
if !self.is_empty()
&& self.as_bytes()[self.len() - 1] != iceoryx2_pal_settings::PATH_SEPARATOR
&& self.as_bytes()[self.len() - 1] != iceoryx2_pal_configuration::PATH_SEPARATOR
{
fail!(from self, when self.push(iceoryx2_pal_settings::PATH_SEPARATOR),
fail!(from self, when self.push(iceoryx2_pal_configuration::PATH_SEPARATOR),
"{}", msg);
}

Expand Down
2 changes: 1 addition & 1 deletion iceoryx2-bb/testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ rust-version = { workspace = true }
version = { workspace = true }

[dependencies]
iceoryx2-pal-settings = { workspace = true }
iceoryx2-pal-configuration = { workspace = true }
3 changes: 2 additions & 1 deletion iceoryx2-bb/testing/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ macro_rules! test_requires {
}
}

pub const AT_LEAST_TIMING_VARIANCE: f32 = iceoryx2_pal_settings::settings::AT_LEAST_TIMING_VARIANCE;
pub const AT_LEAST_TIMING_VARIANCE: f32 =
iceoryx2_pal_configuration::settings::AT_LEAST_TIMING_VARIANCE;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "iceoryx2-pal-settings"
name = "iceoryx2-pal-configuration"
description = "Iceoryx2: [internal] platform specific settings"
categories = { workspace = true }
edition = { workspace = true }
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion iceoryx2-pal/posix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bindgen = { workspace = true }

[dependencies]
iceoryx2-pal-concurrency-primitives = { workspace = true }
iceoryx2-pal-settings = { workspace = true }
iceoryx2-pal-configuration = { workspace = true }
lazy_static = { workspace = true }

[target.'cfg(windows)'.dependencies]
Expand Down

0 comments on commit f0ef902

Please sign in to comment.