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

[console] support background command execution #404

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[console] support background command execution #404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 34 additions & 1 deletion lib/console/console.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,23 @@ static void convert_args(int argc, console_cmd_args *argv) {
}
}

typedef struct background_cmd_args {
const console_cmd *command;
int argc;
console_cmd_args *args;
} background_cmd_args;

static int background_command_exec(void *arg)
{
background_cmd_args *bg_args = (background_cmd_args *)arg;
int ret = bg_args->command->cmd_callback(bg_args->argc, bg_args->args);
for (int i = 0; i < bg_args->argc; i++) {
free((void *)bg_args->args[i].str);
}
free((void *)bg_args->args);
free((void *)bg_args);
return ret;
}

static status_t command_loop(console_t *con, int (*get_line)(const char **, void *), void *get_line_cookie, bool showprompt, bool locked) {
bool exit;
Expand Down Expand Up @@ -637,7 +654,23 @@ static status_t command_loop(console_t *con, int (*get_line)(const char **, void
mutex_acquire(&con->lock);

con->abort_script = false;
con->lastresult = command->cmd_callback(argc, args);
if (strcmp(args[argc - 1].str, "&") == 0) { // background execution
background_cmd_args *bg_args =
(background_cmd_args *)malloc(sizeof(background_cmd_args));
bg_args->command = command;
bg_args->argc = argc - 1;
bg_args->args = (console_cmd_args *)malloc(argc * sizeof(console_cmd_args));
for (int i = 0; i < argc; i++) {
memcpy(&bg_args->args[i], &args[i], sizeof(console_cmd_args));
bg_args->args[i].str = strdup(args[i].str);
}
thread_t *thr = thread_create("background_command_exec", background_command_exec,
bg_args, DEFAULT_PRIORITY,
DEFAULT_STACK_SIZE);
con->lastresult = thread_resume(thr);
} else {
con->lastresult = command->cmd_callback(argc, args);
}

#if WITH_LIB_ENV
bool report_result;
Expand Down