diff options
| author | Matias Elo <matias.elo@nokia.com> | 2021-11-05 10:01:02 +0200 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2021-11-11 15:08:08 +0200 |
| commit | b11d6a36c721329be26267d90d7e883f61460e94 (patch) | |
| tree | 3d74713e832a74245ff441dcb226fb2c934ca2e6 /helper | |
| parent | 90f6d799ad34d0ccad8daacc5bcc6ec982d39a77 (diff) | |
helper: test: thread: rename odp_instance variable
Rename thread helper test's global variable 'odp_instance', which clashes
with the new odp_instance() API.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/test/odpthreads.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index aa06df188..b7b4c2104 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -28,7 +28,7 @@ static void main_exit(void); /* ODP application instance */ -static odp_instance_t odp_instance; +static odp_instance_t instance; static int worker_fn(void *arg ODP_UNUSED) { @@ -91,12 +91,12 @@ int main(int argc, char *argv[]) odp_init_param_init(&init_param); init_param.mem_model = helper_options.mem_model; - if (odp_init_global(&odp_instance, &init_param, NULL)) { + if (odp_init_global(&instance, &init_param, NULL)) { ODPH_ERR("Error: ODP global init failed.\n"); exit(EXIT_FAILURE); } - if (odp_init_local(odp_instance, ODP_THREAD_CONTROL)) { + if (odp_init_local(instance, ODP_THREAD_CONTROL)) { ODPH_ERR("Error: ODP local init failed.\n"); exit(EXIT_FAILURE); } @@ -154,7 +154,7 @@ int main(int argc, char *argv[]) printf("new num worker threads: %i\n\n", num_workers); odph_thread_common_param_init(&thr_common); - thr_common.instance = odp_instance; + thr_common.instance = instance; thr_common.cpumask = &cpu_mask; thr_common.share_param = 1; @@ -213,7 +213,7 @@ static void main_exit(void) _exit(EXIT_FAILURE); } - if (odp_term_global(odp_instance)) { + if (odp_term_global(instance)) { ODPH_ERR("Error: ODP global term failed.\n"); _exit(EXIT_FAILURE); } |