Skip to content

[PATCH v2] test/dyn_workers: fix teardown order #2336

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

Merged
MatiasElo merged 1 commit into from
Apr 15, 2026
Merged

[PATCH v2] test/dyn_workers: fix teardown order #2336

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
29 changes: 16 additions & 13 deletions test/miscellaneous/odp_dyn_workers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,26 +1227,29 @@ static odp_bool_t run_global(global_config_t *config)
dump_result(prog->socket, prog->pid);
}

for (uint32_t i = 0U; i < config->num_progs; ++i) {
/* Tear down in reverse order so secondaries call odp_term_local
* before the primary's odp_term_global frees shared resources. */
for (uint32_t i = config->num_progs; i-- > 0;) {
prog = &config->progs[i];

if (prog->state == UP) {
for (uint32_t j = 0U; j < MAX_WORKERS; ++j) {
ret = send_command(prog->socket, encode_cmd(REM_WORKER, j));
if (prog->state != UP)
continue;

if (ret == CONN_ERR || ret == PEER_ERR)
break;
for (uint32_t j = 0U; j < MAX_WORKERS; ++j) {
ret = send_command(prog->socket, encode_cmd(REM_WORKER, j));

if (ret != CMD_SUMMARY)
continue;
if (ret == CONN_ERR || ret == PEER_ERR)
break;

if (recv_summary(prog->socket, &prog->summary))
dump_summary(prog->pid, &prog->summary);
}
if (ret != CMD_SUMMARY)
continue;

(void)send_command(prog->socket, encode_cmd(EXIT_PROG, 0));
(void)TEMP_FAILURE_RETRY(waitpid(prog->pid, NULL, 0));
if (recv_summary(prog->socket, &prog->summary))
dump_summary(prog->pid, &prog->summary);
}

(void)send_command(prog->socket, encode_cmd(EXIT_PROG, 0));
(void)TEMP_FAILURE_RETRY(waitpid(prog->pid, NULL, 0));
}

return func_ret;
Expand Down