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.

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

Jump to bottom

Set disable loan to on by default. (backport #1110) #1116

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Set disable loan to on by default. (backport #1110) #1116

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd54fe3
Set disable loan to on by default. (#1110)
clalancette Nov 2, 2023
35998e4
Fix conflicts.
clalancette Nov 9, 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
22 changes: 19 additions & 3 deletions rcl/src/rcl/subscription.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ extern "C"

#include "rcl/error_handling.h"
#include "rcl/node.h"
#include "rcutils/env.h"
#include "rcutils/logging_macros.h"
#include "rcutils/strdup.h"
#include "rcutils/types/string_array.h"
Expand Down Expand Up @@ -736,9 +737,24 @@ rcl_subscription_can_loan_messages(const rcl_subscription_t * subscription)
return false; // error message already set
}

bool disable_loaned_message = false;
rcl_ret_t ret = rcl_get_disable_loaned_message(&disable_loaned_message);
if (ret == RCL_RET_OK && disable_loaned_message) {
// Load disable flag to LoanedMessage via environmental variable.
// TODO(clalancette): This is kind of a copy of rcl_get_disable_loaned_message(), but we need
// more information than that function provides.
bool disable_loaned_message = true;

const char * env_val = NULL;
const char * env_error_str = rcutils_get_env(RCL_DISABLE_LOANED_MESSAGES_ENV_VAR, &env_val);
if (NULL != env_error_str) {
RCUTILS_SAFE_FWRITE_TO_STDERR("Failed to get disable_loaned_message: ");
RCUTILS_SAFE_FWRITE_TO_STDERR_WITH_FORMAT_STRING(
"Error getting env var: '" RCUTILS_STRINGIFY(RCL_DISABLE_LOANED_MESSAGES_ENV_VAR) "': %s\n",
env_error_str);
return RCL_RET_ERROR;
} else {
disable_loaned_message = !(strcmp(env_val, "0") == 0);
}

if (disable_loaned_message) {
return false;
}

Expand Down