michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: make flag modification atomic

Browse source 
Add Z_SHELL_SET_FLAG_ATOMIC macro to use technique from
shell_process() to atomically set and return the previous
value.

Change all void z_flag_*_set() functions to bool z_flag_*_set()
and use macro to return previous value after setting.

Modify shell_process() to use this modified z_flag_processing_set()
function.

Reorder flags to keep last_nl on byte boundary.

Add public setters for insert_mode, echo, and mode_delete for
completeness.

Signed-off-by: Pete Skeggs <peter.skeggs@nordicsemi.no>
This commit is contained in:
Pete Skeggs 2021-03-10 15:56:32 -08:00 • committed by Anas Nashif
commit 75a74bfad2
3 changed files with 149 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

52
subsys/shell/shell.c
View file

@ -1377,13 +1377,8 @@ void shell_process(const struct shell *shell)
__ASSERT_NO_MSG(shell);
__ASSERT_NO_MSG(shell->ctx);
union shell_internal internal;
internal.value = 0U;
internal.flags.processing = 1U;
(void)atomic_or((atomic_t *)&shell->ctx->internal.value,
internal.value);
/* atomically set the processing flag */
z_flag_processing_set(shell, true);
switch (shell->ctx->state) {
case SHELL_STATE_UNINITIALIZED:
@ -1398,10 +1393,8 @@ void shell_process(const struct shell *shell)
break;
}
internal.value = 0xFFFFFFFF;
internal.flags.processing = 0U;
(void)atomic_and((atomic_t *)&shell->ctx->internal.value,
internal.value);
/* atomically clear the processing flag */
z_flag_processing_set(shell, false);
}
/* This function mustn't be used from shell context to avoid deadlock.
@ -1560,26 +1553,49 @@ int shell_execute_cmd(const struct shell *shell, const char *cmd)
return ret_val;
}
int shell_use_colors_set(const struct shell *shell, bool use_colors)
int shell_insert_mode_set(const struct shell *shell, bool val)
{
if (shell == NULL) {
return -EINVAL;
}
z_flag_use_colors_set(shell, use_colors);
return 0;
return (int)z_flag_insert_mode_set(shell, val);
}
int shell_obscure_set(const struct shell *shell, bool obscure)
int shell_use_colors_set(const struct shell *shell, bool val)
{
if (shell == NULL) {
return -EINVAL;
}
z_flag_obscure_set(shell, obscure);
return (int)z_flag_use_colors_set(shell, val);
}
return 0;
int shell_echo_set(const struct shell *shell, bool val)
{
if (shell == NULL) {
return -EINVAL;
}
return (int)z_flag_echo_set(shell, val);
}
int shell_obscure_set(const struct shell *shell, bool val)
{
if (shell == NULL) {
return -EINVAL;
}
return (int)z_flag_obscure_set(shell, val);
}
int shell_mode_delete_set(const struct shell *shell, bool val)
{
if (shell == NULL) {
return -EINVAL;
}
return (int)z_flag_mode_delete_set(shell, val);
}
static int cmd_help(const struct shell *shell, size_t argc, char **argv)