Skip to content

Remove using namespace from headers #446

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.

Sign up for GitHub

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

Open
arkybruh7 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Remove using namespace from headers #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48a5bbe
Remove using namespace from headers
arkybruh7 Aug 10, 2026
92e7665
Fix missing qualification of IComponentController in safe_process_map…
arkybruh7 Aug 10, 2026
00b1615
Fix missing IComponent visibility in process_info_node.cpp
arkybruh7 Aug 10, 2026
894cf40
Fix missing qualification of ComponentEvent and ComponentTask in grap…
arkybruh7 Aug 10, 2026
eb6f702
Fix missing qualification
arkybruh7 Aug 11, 2026
518b4dd
Fix missing qualification
arkybruh7 Aug 11, 2026
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
2 changes: 1 addition & 1 deletion score/launch_manager/src/alive/src/details/AliveImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ AliveImpl::AliveImpl(

void AliveImpl::ReportCheckpoint(std::uint32_t f_checkpointId) const noexcept(true)
{
(void)ipcClient->sendEmplace(score::lcm::saf::timers::OsClock::getMonotonicSystemClock(), f_checkpointId);
(void)ipcClient->sendEmplace(score::mw::lifecycle::saf::timers::OsClock::getMonotonicSystemClock(), f_checkpointId);
}

void AliveImpl::connectToPhmDaemon(void) noexcept(false)
Expand Down
6 changes: 3 additions & 3 deletions score/launch_manager/src/alive/src/details/AliveImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ class AliveImpl
{
public:
/// @brief The element that is sent via IPC
using CheckpointBufferElement = score::lcm::saf::ifappl::CheckpointBufferElement;
using CheckpointBufferElement = score::mw::lifecycle::saf::ifappl::CheckpointBufferElement;
/// @brief The IPC Connection type
using CheckpointIpcClient = score::lcm::saf::ipc::
IpcClient<CheckpointBufferElement, score::lcm::saf::ifappl::k_maxCheckpointBufferElements>;
using CheckpointIpcClient = score::mw::lifecycle::saf::ipc::
IpcClient<CheckpointBufferElement, score::mw::lifecycle::saf::ifappl::k_maxCheckpointBufferElements>;

/// @brief Non-parametric constructor is not supported
AliveImpl() = delete;
Expand Down
8 changes: 4 additions & 4 deletions score/launch_manager/src/control_client/src/control_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ score::concurrency::InterruptibleFuture<void> GetErrorFuture(ExecErrc errType) n

ControlClient::ControlClient() noexcept
{
static std::function<void(const score::lcm::ExecutionErrorEvent&)> undefinedStateCallback =
[]([[maybe_unused]] const score::lcm::ExecutionErrorEvent& event) {
static std::function<void(const score::mw::lifecycle::ExecutionErrorEvent&)> undefinedStateCallback =
[]([[maybe_unused]] const score::mw::lifecycle::ExecutionErrorEvent& event) {
};

try
Expand Down Expand Up @@ -70,8 +70,8 @@ score::concurrency::InterruptibleFuture<void> ControlClient::ActivateRunTarget(

if (control_client_impl_ != nullptr)
{
static score::lcm::IdentifierHash pg_name{"MainPG"};
score::lcm::IdentifierHash pg_state{"MainPG/" + std::string(runTargetName)};
static score::mw::lifecycle::IdentifierHash pg_name{"MainPG"};
score::mw::lifecycle::IdentifierHash pg_state{"MainPG/" + std::string(runTargetName)};
retVal_ = control_client_impl_->SetState(pg_name, pg_state);
}
else
Expand Down
102 changes: 51 additions & 51 deletions score/launch_manager/src/control_client/src/details/control_client_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
// This approach is used to avoid using switch-case statements
// RULECHECKER_comment(1, 2, check_static_object_dynamic_initialization, "Map doesn't rely on any other static so this
// is fine", false)
static std::map<score::lcm::internal::ControlClientCode, score::mw::lifecycle::ExecErrc> scErrorMap = {
{score::lcm::internal::ControlClientCode::kSetStateInvalidArguments,
static std::map<score::mw::lifecycle::internal::ControlClientCode, score::mw::lifecycle::ExecErrc> scErrorMap = {
{score::mw::lifecycle::internal::ControlClientCode::kSetStateInvalidArguments,
score::mw::lifecycle::ExecErrc::kInvalidArguments},
{score::lcm::internal::ControlClientCode::kSetStateCancelled, score::mw::lifecycle::ExecErrc::kCancelled},
{score::lcm::internal::ControlClientCode::kSetStateFailed, score::mw::lifecycle::ExecErrc::kFailed},
{score::lcm::internal::ControlClientCode::kSetStateAlreadyInState, score::mw::lifecycle::ExecErrc::kAlreadyInState},
{score::lcm::internal::ControlClientCode::kSetStateTransitionToSameState,
{score::mw::lifecycle::internal::ControlClientCode::kSetStateCancelled, score::mw::lifecycle::ExecErrc::kCancelled},
{score::mw::lifecycle::internal::ControlClientCode::kSetStateFailed, score::mw::lifecycle::ExecErrc::kFailed},
{score::mw::lifecycle::internal::ControlClientCode::kSetStateAlreadyInState, score::mw::lifecycle::ExecErrc::kAlreadyInState},
{score::mw::lifecycle::internal::ControlClientCode::kSetStateTransitionToSameState,
score::mw::lifecycle::ExecErrc::kInTransitionToSameState},
{score::lcm::internal::ControlClientCode::kFailedUnexpectedTerminationOnEnter,
{score::mw::lifecycle::internal::ControlClientCode::kFailedUnexpectedTerminationOnEnter,
score::mw::lifecycle::ExecErrc::kFailedUnexpectedTerminationOnEnter}};

namespace score::mw::lifecycle
Expand All @@ -59,7 +59,7 @@ bool ControlClientImpl::instance_created_{false};
std::mutex ControlClientImpl::instance_creation_mutex_{};

ControlClientImpl::ControlClientImpl(
std::function<void(const score::lcm::ExecutionErrorEvent&)> undefinedStateCallback) noexcept
std::function<void(const score::mw::lifecycle::ExecutionErrorEvent&)> undefinedStateCallback) noexcept
: undefined_state_callback_{undefinedStateCallback},
control_client_requests_{},
ipc_request_semaphore_{},
Expand All @@ -80,10 +80,10 @@ ControlClientImpl::ControlClientImpl(
}

struct stat stats;
const auto fstat_ret = fstat(score::lcm::internal::osal::IpcCommsSync::sync_fd, &stats);
const auto fstat_ret = fstat(score::mw::lifecycle::internal::osal::IpcCommsSync::sync_fd, &stats);
// Check size we have access of to avoid a crash if fd is not pointing to correct data
const auto needed_size =
sizeof(score::lcm::internal::osal::IpcCommsSync) + sizeof(score::lcm::internal::ControlClientChannel);
sizeof(score::mw::lifecycle::internal::osal::IpcCommsSync) + sizeof(score::mw::lifecycle::internal::ControlClientChannel);
if (fstat_ret == -1 || stats.st_size != static_cast<off_t>(needed_size))
{
LM_LOG_ERROR() << "Control client channel at sync_fd is not valid!";
Expand All @@ -101,11 +101,11 @@ ControlClientImpl::ControlClientImpl(
control_client_requests_[i].initial_machine_state_transition_request_ = false;
}

ipc_channel_ = score::lcm::internal::ControlClientChannel::initializeControlClientChannel();
ipc_channel_ = score::mw::lifecycle::internal::ControlClientChannel::initializeControlClientChannel();

const auto init_result = ipc_request_semaphore_.init(1U, false);
SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
score::lcm::internal::osal::OsalReturnType::kSuccess == init_result,
score::mw::lifecycle::internal::osal::OsalReturnType::kSuccess == init_result,
"ControlClient semaphore initialization failed");
ipc_response_thread_ = std::make_unique<std::thread>(&ControlClientImpl::run, this);
}
Expand All @@ -128,7 +128,7 @@ void ControlClientImpl::run()
{
// creating a instance called msg for ControlClientMessage that will handle all the communication between LCM and
// ControlClientImpl
score::lcm::internal::ControlClientMessage msg;
score::mw::lifecycle::internal::ControlClientMessage msg;

// This lambda function will be used to set the error of the promise.
// This lamdba funcitons are used to avoid code duplication.
Expand All @@ -146,7 +146,7 @@ void ControlClientImpl::run()

// This lambda function will be used to set the error of the promise at unexpected termination.
auto funcUtermination = [&]() {
score::lcm::ExecutionErrorEvent tmp{
score::mw::lifecycle::ExecutionErrorEvent tmp{
msg.execution_error_code_, // executionError
msg.process_group_state_.pg_name_}; // processGroup

Expand Down Expand Up @@ -186,7 +186,7 @@ void ControlClientImpl::run()

// This lambda function will be used to set the error of the promise at default error for ControlClientCode kNotSet.
std::function<void()> funcDefaultError = [&]() {
if (msg.request_or_response_ != score::lcm::internal::ControlClientCode::kNotSet)
if (msg.request_or_response_ != score::mw::lifecycle::internal::ControlClientCode::kNotSet)
{
LM_LOG_WARN() << "ControlClient error. Undefined message from Launch Manager:"
<< static_cast<int>(msg.request_or_response_);
Expand All @@ -203,52 +203,52 @@ void ControlClientImpl::run()
{
switch (msg.request_or_response_)
{
case score::lcm::internal::ControlClientCode::kSetStateInvalidArguments:
case score::lcm::internal::ControlClientCode::kSetStateCancelled:
case score::lcm::internal::ControlClientCode::kSetStateFailed:
case score::lcm::internal::ControlClientCode::kSetStateAlreadyInState:
case score::lcm::internal::ControlClientCode::kSetStateTransitionToSameState:
case score::lcm::internal::ControlClientCode::kFailedUnexpectedTerminationOnEnter:
case score::mw::lifecycle::internal::ControlClientCode::kSetStateInvalidArguments:
case score::mw::lifecycle::internal::ControlClientCode::kSetStateCancelled:
case score::mw::lifecycle::internal::ControlClientCode::kSetStateFailed:
case score::mw::lifecycle::internal::ControlClientCode::kSetStateAlreadyInState:
case score::mw::lifecycle::internal::ControlClientCode::kSetStateTransitionToSameState:
case score::mw::lifecycle::internal::ControlClientCode::kFailedUnexpectedTerminationOnEnter:
funcSetError();
break;

case score::lcm::internal::ControlClientCode::kSetStateSuccess:
case score::mw::lifecycle::internal::ControlClientCode::kSetStateSuccess:
funcSetValue();
break;

case score::lcm::internal::ControlClientCode::kFailedUnexpectedTermination:
case score::mw::lifecycle::internal::ControlClientCode::kFailedUnexpectedTermination:
funcUtermination();
break;

case score::lcm::internal::ControlClientCode::kInitialMachineStateNotSet:
case score::lcm::internal::ControlClientCode::kInitialMachineStateFailed:
case score::mw::lifecycle::internal::ControlClientCode::kInitialMachineStateNotSet:
case score::mw::lifecycle::internal::ControlClientCode::kInitialMachineStateFailed:
funcMcStateWrong();
break;

case score::lcm::internal::ControlClientCode::kInitialMachineStateSuccess:
case score::mw::lifecycle::internal::ControlClientCode::kInitialMachineStateSuccess:
funcMcStateSuccess();
break;

default:
// score::lcm::internal::ControlClientCode::kNotSet is just an initialization value
// score::mw::lifecycle::internal::ControlClientCode::kNotSet is just an initialization value
// not an error
funcDefaultError();
break;
}
}

std::this_thread::sleep_for(score::lcm::internal::kControlClientBgThreadSleepTime);
std::this_thread::sleep_for(score::mw::lifecycle::internal::kControlClientBgThreadSleepTime);
}
}
}

score::concurrency::InterruptibleFuture<void> ControlClientImpl::SendIpcMessage(
score::lcm::internal::ControlClientMessage& msg) noexcept
score::mw::lifecycle::internal::ControlClientMessage& msg) noexcept
{
score::concurrency::InterruptibleFuture<void> retVal_{};

if (score::lcm::internal::osal::OsalReturnType::kSuccess ==
ipc_request_semaphore_.timedWait(score::lcm::internal::kControlClientMaxIpcDelay))
if (score::mw::lifecycle::internal::osal::OsalReturnType::kSuccess ==
ipc_request_semaphore_.timedWait(score::mw::lifecycle::internal::kControlClientMaxIpcDelay))
{
// first we need to check if we have empty space in control_client_requests_ array
uint16_t i = 0U;
Expand All @@ -268,7 +268,7 @@ score::concurrency::InterruptibleFuture<void> ControlClientImpl::SendIpcMessage(
// 1) claim the slot and create a fresh promise for this request
control_client_requests_[i].promise_ = score::concurrency::InterruptiblePromise<void>{};

if (score::lcm::internal::ControlClientCode::kGetInitialMachineStateRequest == msg.request_or_response_)
if (score::mw::lifecycle::internal::ControlClientCode::kGetInitialMachineStateRequest == msg.request_or_response_)
{
// the GetInitialMachineStateTransitionResult request is a bit special
// and will need special treatment in bg thread servicing response_ link
Expand Down Expand Up @@ -300,7 +300,7 @@ score::concurrency::InterruptibleFuture<void> ControlClientImpl::SendIpcMessage(

// we definitely shouldn't forget to release semaphore
const auto post_result = ipc_request_semaphore_.post();
if (score::lcm::internal::osal::OsalReturnType::kSuccess != post_result)
if (score::mw::lifecycle::internal::osal::OsalReturnType::kSuccess != post_result)
{
// Invalid semaphore usage is a logic error and should be asserted.
SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
Expand All @@ -326,16 +326,16 @@ score::concurrency::InterruptibleFuture<void> ControlClientImpl::SendIpcMessage(
}

score::concurrency::InterruptibleFuture<void> ControlClientImpl::SetState(
const score::lcm::IdentifierHash& pg_name,
const score::lcm::IdentifierHash& pg_state) noexcept
const score::mw::lifecycle::IdentifierHash& pg_name,
const score::mw::lifecycle::IdentifierHash& pg_state) noexcept
{
score::concurrency::InterruptibleFuture<void> retVal_{};

if (nullptr != ipc_channel_)
{
score::lcm::internal::ControlClientMessage msg;
score::mw::lifecycle::internal::ControlClientMessage msg;

msg.request_or_response_ = score::lcm::internal::ControlClientCode::kSetStateRequest;
msg.request_or_response_ = score::mw::lifecycle::internal::ControlClientCode::kSetStateRequest;
msg.process_group_state_.pg_name_ = pg_name;
msg.process_group_state_.pg_state_name_ = pg_state;

Expand All @@ -355,9 +355,9 @@ score::concurrency::InterruptibleFuture<void> ControlClientImpl::GetInitialMachi

if (nullptr != ipc_channel_)
{
score::lcm::internal::ControlClientMessage msg;
score::mw::lifecycle::internal::ControlClientMessage msg;

msg.request_or_response_ = score::lcm::internal::ControlClientCode::kGetInitialMachineStateRequest;
msg.request_or_response_ = score::mw::lifecycle::internal::ControlClientCode::kGetInitialMachineStateRequest;
// pg_name_ is not used by this request
// pg_state_name_ is not used by this request

Expand All @@ -371,23 +371,23 @@ score::concurrency::InterruptibleFuture<void> ControlClientImpl::GetInitialMachi
return retVal_;
}

score::Result<score::lcm::ExecutionErrorEvent> ControlClientImpl::GetExecutionError(
const score::lcm::IdentifierHash& processGroup) noexcept
score::Result<score::mw::lifecycle::ExecutionErrorEvent> ControlClientImpl::GetExecutionError(
const score::mw::lifecycle::IdentifierHash& processGroup) noexcept
{
// default error (just in case)
score::Result<score::lcm::ExecutionErrorEvent> retVal_{
score::Result<score::mw::lifecycle::ExecutionErrorEvent> retVal_{
score::MakeUnexpected(score::mw::lifecycle::ExecErrc::kCommunicationError)};

if (nullptr != ipc_channel_)
{
if (score::lcm::internal::osal::OsalReturnType::kSuccess ==
ipc_request_semaphore_.timedWait(score::lcm::internal::kControlClientMaxIpcDelay))
if (score::mw::lifecycle::internal::osal::OsalReturnType::kSuccess ==
ipc_request_semaphore_.timedWait(score::mw::lifecycle::internal::kControlClientMaxIpcDelay))
{
// 1) prepare message for LCM
score::lcm::internal::ControlClientMessage msg;
score::mw::lifecycle::internal::ControlClientMessage msg;

// future_id_ is not used by this request
msg.request_or_response_ = score::lcm::internal::ControlClientCode::kGetExecutionErrorRequest;
msg.request_or_response_ = score::mw::lifecycle::internal::ControlClientCode::kGetExecutionErrorRequest;
msg.process_group_state_.pg_name_ = processGroup;
// pg_state_name_ is not used by this request

Expand All @@ -398,14 +398,14 @@ score::Result<score::lcm::ExecutionErrorEvent> ControlClientImpl::GetExecutionEr
switch (msg.request_or_response_)
{
// GetExecutionError
case score::lcm::internal::ControlClientCode::kExecutionErrorInvalidArguments:
case score::lcm::internal::ControlClientCode::kExecutionErrorRequestFailed:
case score::mw::lifecycle::internal::ControlClientCode::kExecutionErrorInvalidArguments:
case score::mw::lifecycle::internal::ControlClientCode::kExecutionErrorRequestFailed:
retVal_ = score::MakeUnexpected(score::mw::lifecycle::ExecErrc::kFailed);
break;

case score::lcm::internal::ControlClientCode::kExecutionErrorRequestSuccess:
case score::mw::lifecycle::internal::ControlClientCode::kExecutionErrorRequestSuccess:
{
score::lcm::ExecutionErrorEvent tmp{
score::mw::lifecycle::ExecutionErrorEvent tmp{
msg.execution_error_code_, // executionError
msg.process_group_state_.pg_name_}; // processGroup
retVal_.emplace(std::move(tmp));
Expand All @@ -421,7 +421,7 @@ score::Result<score::lcm::ExecutionErrorEvent> ControlClientImpl::GetExecutionEr

// we definitely shouldn't forget to release semaphore
const auto post_result = ipc_request_semaphore_.post();
if (score::lcm::internal::osal::OsalReturnType::kSuccess != post_result)
if (score::mw::lifecycle::internal::osal::OsalReturnType::kSuccess != post_result)
{
// Invalid semaphore usage is a logic error and should be asserted.
SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
Expand Down
Loading
Loading