From 814ef86c4c874c5f7cf0b96c9cb6cd1ba71c41b6 Mon Sep 17 00:00:00 2001 From: Tuomas Taipale Date: Fri, 28 Aug 2026 10:31:23 +0000 Subject: [PATCH] helper: linux: remove deprecated functions Remove previously deprecated `odph_linux_*()` functions and related types, tests and configuration references. Signed-off-by: Tuomas Taipale Reviewed-by: Janne Peltonen --- Makefile.am | 3 +- configure.ac | 2 - helper/Makefile.am | 15 -- helper/include/odp/helper/linux.h | 18 -- helper/include/odp/helper/linux/process.h | 91 -------- helper/include/odp/helper/linux/pthread.h | 70 ------- helper/include/odp/helper/threads.h | 24 --- helper/linux/thread.c | 239 ---------------------- helper/m4/configure.m4 | 9 - helper/test/Makefile.am | 9 - helper/test/linux/process.c | 104 ---------- helper/test/linux/pthread.c | 88 -------- scripts/ci/coverage.sh | 2 +- 13 files changed, 2 insertions(+), 672 deletions(-) delete mode 100644 helper/include/odp/helper/linux.h delete mode 100644 helper/include/odp/helper/linux/process.h delete mode 100644 helper/include/odp/helper/linux/pthread.h delete mode 100644 helper/linux/thread.c delete mode 100644 helper/test/linux/process.c delete mode 100644 helper/test/linux/pthread.c diff --git a/Makefile.am b/Makefile.am index 8b65244c18a..e62ab04106c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,5 @@ ACLOCAL_AMFLAGS=-I m4 -AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides \ - --enable-helper-linux +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-user-guides if PLATFORM_IS_LINUX_GENERIC PLATFORM_DIR = platform/linux-generic diff --git a/configure.ac b/configure.ac index 3a0f68ed02f..4a617b34971 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,6 @@ AM_CONDITIONAL([test_installdir], [test "x$testdir" != "xno"]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "x${DOXYGEN}" = "xdoxygen"]) AM_CONDITIONAL([user_guide], [test "x${user_guides}" = "xyes" ]) AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) -AM_CONDITIONAL([helper_linux], [test x$helper_linux = xyes ]) AM_CONDITIONAL([helper_cli], [test x$helper_cli = xyes ]) AM_CONDITIONAL([ARCH_IS_ARM], [test "x${ARCH_DIR}" = "xarm"]) AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"]) @@ -468,7 +467,6 @@ AC_MSG_RESULT([ ARCH_DIR ${ARCH_DIR} ARCH_ABI ${ARCH_ABI} with_platform: ${with_platform} - helper_linux: ${helper_linux} helper_cli: ${helper_cli} prefix: ${prefix} sysconfdir: ${sysconfdir} diff --git a/helper/Makefile.am b/helper/Makefile.am index a44d7c95825..906a531a101 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -34,16 +34,6 @@ helperinclude_HEADERS = \ include/odp/helper/udp.h \ include/odp/helper/version.h -if helper_linux -helperinclude_HEADERS += \ - include/odp/helper/linux.h - -helperlinuxincludedir = $(includedir)/odp/helper/linux -helperlinuxinclude_HEADERS = \ - include/odp/helper/linux/pthread.h \ - include/odp/helper/linux/process.h -endif - if helper_cli helperinclude_HEADERS += \ include/odp/helper/cli.h @@ -57,11 +47,6 @@ __LIB__libodphelper_la_SOURCES = \ threads.c \ version.c -if helper_linux -__LIB__libodphelper_la_SOURCES += \ - linux/thread.c -endif - if helper_cli __LIB__libodphelper_la_SOURCES += \ cli.c diff --git a/helper/include/odp/helper/linux.h b/helper/include/odp/helper/linux.h deleted file mode 100644 index c20d8b5350f..00000000000 --- a/helper/include/odp/helper/linux.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright (c) 2017-2018 Linaro Limited - */ - -/** - * @file - * - * All ODP Linux helpers - * - */ - -#ifndef ODP_HELPER_LINUX_H_ -#define ODP_HELPER_LINUX_H_ - -#include -#include - -#endif diff --git a/helper/include/odp/helper/linux/process.h b/helper/include/odp/helper/linux/process.h deleted file mode 100644 index 6224093fc7b..00000000000 --- a/helper/include/odp/helper/linux/process.h +++ /dev/null @@ -1,91 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright (c) 2017-2018 Linaro Limited - */ - -/** - * @file - * - * ODP Linux helper for processes - * - * This file is not part of ODP APIs, but can be optionally used to ease common - * setups in a Linux system. User is free to implement the same setups in - * other ways (not via this file). - */ - -#ifndef ODPH_LINUX_PROCESS_H_ -#define ODPH_LINUX_PROCESS_H_ - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @addtogroup odph_thread - * @{ - */ - -/** - * Fork a process - * - * Forks and sets CPU affinity for the child process. Ignores 'start' and 'arg' - * thread parameters. - * - * @param[out] proc Pointer to process state info (for output) - * @param cpu Destination CPU for the child process - * @param thr_params Linux helper thread parameters - * - * @return On success: 1 for the parent, 0 for the child - * On failure: -1 for the parent, -2 for the child - * - * @deprecated Use odph_thread_create() instead. - */ -int ODPH_DEPRECATE(odph_linux_process_fork)(odph_linux_process_t *proc, int cpu, - const odph_linux_thr_params_t *thr_params); - -/** - * Fork a number of processes - * - * Forks and sets CPU affinity for child processes. Ignores 'start' and 'arg' - * thread parameters. - * - * @param[out] proc_tbl Process state info table (for output) - * @param mask CPU mask of processes to create - * @param thr_params Linux helper thread parameters - * - * @return On success: 1 for the parent, 0 for the child - * On failure: -1 for the parent, -2 for the child - * - * @deprecated Use odph_thread_create() instead. - */ -int ODPH_DEPRECATE(odph_linux_process_fork_n)(odph_linux_process_t *proc_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params); - -/** - * Wait for a number of processes - * - * Waits for a number of child processes to terminate. Records process state - * change status into the process state info structure. - * - * @param proc_tbl Process state info table (previously filled by fork) - * @param num Number of processes to wait - * - * @return 0 on success, -1 on failure - * - * @deprecated Use odph_thread_join() instead. - */ -int ODPH_DEPRECATE(odph_linux_process_wait_n)(odph_linux_process_t *proc_tbl, int num); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/helper/include/odp/helper/linux/pthread.h b/helper/include/odp/helper/linux/pthread.h deleted file mode 100644 index 756a9fbacad..00000000000 --- a/helper/include/odp/helper/linux/pthread.h +++ /dev/null @@ -1,70 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright (c) 2017-2018 Linaro Limited - */ - -/** - * @file - * - * ODP Linux helper for pthreads - * - * This file is not part of ODP APIs, but can be optionally used to ease common - * setups in a Linux system. User is free to implement the same setups in - * other ways (not via this file). - */ - -#ifndef ODPH_LINUX_PTHREAD_H_ -#define ODPH_LINUX_PTHREAD_H_ - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @addtogroup odph_thread - * @{ - */ - -/** - * Creates and launches pthreads - * - * Creates, pins and launches threads to separate CPU's based on the cpumask. - * - * @param[out] pthread_tbl Table of pthread state information records. Table - * must have at least as many entries as there are - * CPUs in the CPU mask. - * @param mask CPU mask - * @param thr_params Linux helper thread parameters - * - * @return Number of threads created - * - * @deprecated Use odph_thread_create() instead. - */ -int ODPH_DEPRECATE(odph_linux_pthread_create)(odph_linux_pthread_t *pthread_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params); - -/** - * Waits pthreads to exit - * - * Returns when all threads have been exit. - * - * @param thread_tbl Thread table - * @param num Number of threads to create - * - * @deprecated Use odph_thread_join() instead. - */ -void ODPH_DEPRECATE(odph_linux_pthread_join)(odph_linux_pthread_t *thread_tbl, int num); - -/** - * @} - */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/helper/include/odp/helper/threads.h b/helper/include/odp/helper/threads.h index bf398501593..0450b0df93d 100644 --- a/helper/include/odp/helper/threads.h +++ b/helper/include/odp/helper/threads.h @@ -34,30 +34,6 @@ extern "C" { * @{ */ -/** Thread parameter for Linux pthreads and processes */ -typedef struct { - void *(*start)(void *); /**< Thread entry point function */ - void *arg; /**< Argument for the function */ - odp_thread_type_t thr_type; /**< ODP thread type */ - odp_instance_t instance; /**< ODP instance handle */ -} odph_linux_thr_params_t; - -/** Linux pthread state information */ -typedef struct { - pthread_t thread; /**< Pthread ID */ - pthread_attr_t attr; /**< Pthread attributes */ - int cpu; /**< CPU ID */ - /** Copy of thread params */ - odph_linux_thr_params_t thr_params; -} odph_linux_pthread_t; - -/** Linux process state information */ -typedef struct { - pid_t pid; /**< Process ID */ - int cpu; /**< CPU ID */ - int status; /**< Process state change status */ -} odph_linux_process_t; - /** Thread parameters (pthreads and processes) */ typedef struct { /** Thread entry point function */ diff --git a/helper/linux/thread.c b/helper/linux/thread.c deleted file mode 100644 index 27e11422eb7..00000000000 --- a/helper/linux/thread.c +++ /dev/null @@ -1,239 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright (c) 2016-2018 Linaro Limited - */ - -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -static void *_odph_run_start_routine(void *arg) -{ - odph_linux_thr_params_t *thr_params = arg; - - /* ODP thread local init */ - if (odp_init_local(thr_params->instance, thr_params->thr_type)) { - ODPH_ERR("Local init failed\n"); - return NULL; - } - - void *ret_ptr = thr_params->start(thr_params->arg); - int ret = odp_term_local(); - - if (ret < 0) - ODPH_ERR("Local term failed\n"); - - return ret_ptr; -} - -int ODPH_DEPRECATE(odph_linux_pthread_create)(odph_linux_pthread_t *pthread_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params) -{ - int i; - int num; - int cpu_count; - int cpu; - int ret; - - num = odp_cpumask_count(mask); - - memset(pthread_tbl, 0, num * sizeof(odph_linux_pthread_t)); - - cpu_count = odp_cpu_count(); - - if (num < 1 || num > cpu_count) { - ODPH_ERR("Invalid number of threads:%d (%d cores available)\n", - num, cpu_count); - return 0; - } - - cpu = odp_cpumask_first(mask); - for (i = 0; i < num; i++) { - cpu_set_t cpu_set; - - CPU_ZERO(&cpu_set); - CPU_SET(cpu, &cpu_set); - - pthread_attr_init(&pthread_tbl[i].attr); - - pthread_tbl[i].cpu = cpu; - - pthread_attr_setaffinity_np(&pthread_tbl[i].attr, - sizeof(cpu_set_t), &cpu_set); - - pthread_tbl[i].thr_params.start = thr_params->start; - pthread_tbl[i].thr_params.arg = thr_params->arg; - pthread_tbl[i].thr_params.thr_type = thr_params->thr_type; - pthread_tbl[i].thr_params.instance = thr_params->instance; - - ret = pthread_create(&pthread_tbl[i].thread, - &pthread_tbl[i].attr, - _odph_run_start_routine, - &pthread_tbl[i].thr_params); - if (ret != 0) { - ODPH_ERR("Failed to start thread on CPU #%d: %d\n", cpu, - ret); - break; - } - - cpu = odp_cpumask_next(mask, cpu); - } - - return i; -} - -void ODPH_DEPRECATE(odph_linux_pthread_join)(odph_linux_pthread_t *thread_tbl, int num) -{ - int i; - int ret; - - for (i = 0; i < num; i++) { - /* Wait thread to exit */ - ret = pthread_join(thread_tbl[i].thread, NULL); - if (ret != 0) { - ODPH_ERR("Failed to join thread from cpu #%d\n", - thread_tbl[i].cpu); - } - pthread_attr_destroy(&thread_tbl[i].attr); - } -} - -int ODPH_DEPRECATE(odph_linux_process_fork_n)(odph_linux_process_t *proc_tbl, - const odp_cpumask_t *mask, - const odph_linux_thr_params_t *thr_params) -{ - pid_t pid; - int num; - int cpu_count; - int cpu; - int i; - - num = odp_cpumask_count(mask); - - memset(proc_tbl, 0, num * sizeof(odph_linux_process_t)); - - cpu_count = odp_cpu_count(); - - if (num < 1 || num > cpu_count) { - ODPH_ERR("Bad num\n"); - return -1; - } - - cpu = odp_cpumask_first(mask); - for (i = 0; i < num; i++) { - cpu_set_t cpu_set; - - CPU_ZERO(&cpu_set); - CPU_SET(cpu, &cpu_set); - - pid = fork(); - - if (pid < 0) { - ODPH_ERR("fork() failed\n"); - return -1; - } - - /* Parent continues to fork */ - if (pid > 0) { - proc_tbl[i].pid = pid; - proc_tbl[i].cpu = cpu; - - cpu = odp_cpumask_next(mask, cpu); - continue; - } - - /* Child process */ - - /* Request SIGTERM if parent dies */ - prctl(PR_SET_PDEATHSIG, SIGTERM); - /* Parent died already? */ - if (getppid() == 1) - kill(getpid(), SIGTERM); - - if (sched_setaffinity(0, sizeof(cpu_set_t), &cpu_set)) { - ODPH_ERR("sched_setaffinity() failed\n"); - return -2; - } - - if (odp_init_local(thr_params->instance, - thr_params->thr_type)) { - ODPH_ERR("Local init failed\n"); - return -2; - } - - return 0; - } - - return 1; -} - -int ODPH_DEPRECATE(odph_linux_process_fork)(odph_linux_process_t *proc, int cpu, - const odph_linux_thr_params_t *thr_params) -{ - odp_cpumask_t mask; - - odp_cpumask_zero(&mask); - odp_cpumask_set(&mask, cpu); - return ODPH_DEPRECATE(odph_linux_process_fork_n)(proc, &mask, thr_params); -} - -int ODPH_DEPRECATE(odph_linux_process_wait_n)(odph_linux_process_t *proc_tbl, int num) -{ - pid_t pid; - int i, j; - int status = 0; - - for (i = 0; i < num; i++) { - pid = wait(&status); - - if (pid < 0) { - ODPH_ERR("wait() failed\n"); - return -1; - } - - for (j = 0; j < num; j++) { - if (proc_tbl[j].pid == pid) { - proc_tbl[j].status = status; - break; - } - } - - if (j == num) { - ODPH_ERR("Bad pid:%d\n", (int)pid); - return -1; - } - - /* Examine the child process' termination status */ - if (WIFEXITED(status) && WEXITSTATUS(status) != EXIT_SUCCESS) { - ODPH_ERR("Child exit status:%d (pid:%d)\n", - WEXITSTATUS(status), (int)pid); - return -1; - } - if (WIFSIGNALED(status)) { - int signo = WTERMSIG(status); - - ODPH_ERR("Child term signo:%d - %s (pid:%d)\n", - signo, strsignal(signo), (int)pid); - return -1; - } - } - - return 0; -} diff --git a/helper/m4/configure.m4 b/helper/m4/configure.m4 index 89c7ee82fce..2fb0d1dd4f5 100644 --- a/helper/m4/configure.m4 +++ b/helper/m4/configure.m4 @@ -17,15 +17,6 @@ AC_ARG_ENABLE([test-helper], [test_helper=yes]) AM_CONDITIONAL([test_helper], [test x$test_helper = xyes ]) -########################################################################## -# Enable/disable Linux helpers -########################################################################## -AC_ARG_ENABLE([helper-linux], - [AS_HELP_STRING([--disable-helper-linux], - [disable Linux helpers [default=enabled]])], - [helper_linux=$enableval], - [helper_linux=yes]) - ########################################################################## # Enable/disable ODPH_DEBUG ########################################################################## diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index ce3358a4c7c..2ec2e851b77 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -11,15 +11,6 @@ EXECUTABLES = odph_version \ #They are a convenience to app writers who have chosen to #restrict their application to Linux. -if helper_linux -if helper_deprecated -EXECUTABLES += linux/odph_pthread \ - linux/odph_process -linux_odph_pthread_SOURCES = linux/pthread.c -linux_odph_process_SOURCES = linux/process.c -endif -endif - if helper_cli EXECUTABLES += odph_cli odph_cli_SOURCES = cli.c diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c deleted file mode 100644 index 54614a69560..00000000000 --- a/helper/test/linux/process.c +++ /dev/null @@ -1,104 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright (c) 2015-2018 Linaro Limited - */ - -#include -#include -#include -#include - -#include - -#define NUMBER_WORKERS 16 /* 0 = max */ - -static void *worker_fn(void *arg ODP_UNUSED) -{ - /* depend on the odp helper to call odp_init_local */ - printf("Worker thread on CPU %d\n", odp_cpu_id()); - - return 0; -} - -/* Create additional dataplane processes */ -int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) -{ - odp_cpumask_t cpu_mask; - int num_workers; - int cpu; - char cpumaskstr[ODP_CPUMASK_STR_SIZE]; - int ret; - odph_linux_process_t proc[NUMBER_WORKERS]; - odp_instance_t instance; - odph_linux_thr_params_t thr_params; - - if (odp_init_global(&instance, NULL, NULL)) { - ODPH_ERR("Error: ODP global init failed.\n"); - exit(EXIT_FAILURE); - } - - if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - ODPH_ERR("Error: ODP local init failed.\n"); - exit(EXIT_FAILURE); - } - - /* discover how many processes this system can support */ - num_workers = odp_cpumask_default_worker(&cpu_mask, NUMBER_WORKERS); - if (num_workers < NUMBER_WORKERS) { - printf("System can only support %d processes and not the %d requested\n", - num_workers, NUMBER_WORKERS); - } - - /* generate a summary for the user */ - (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr, sizeof(cpumaskstr)); - printf("default cpu mask: %s\n", cpumaskstr); - printf("default num worker processes: %i\n", num_workers); - - cpu = odp_cpumask_first(&cpu_mask); - printf("the first CPU: %i\n", cpu); - - /* If possible, remove CPU 0 from the default mask to reserve it for the - * control plane. */ - if (num_workers > 1) - odp_cpumask_clr(&cpu_mask, 0); - num_workers = odp_cpumask_count(&cpu_mask); - (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr, sizeof(cpumaskstr)); - printf("new cpu mask: %s\n", cpumaskstr); - printf("new num worker processes: %i\n\n", num_workers); - - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; - - /* Fork worker processes */ - ret = odph_linux_process_fork_n(proc, &cpu_mask, &thr_params); - - if (ret < 0) { - ODPH_ERR("Fork workers failed %i\n", ret); - return -1; - } - - if (ret == 0) { - /* Child process */ - worker_fn(NULL); - - if (odp_term_local() < 0) { - ODPH_ERR("Error: ODP local term failed.\n"); - exit(EXIT_FAILURE); - } - } else { - /* Parent process */ - odph_linux_process_wait_n(proc, num_workers); - - if (odp_term_local()) { - ODPH_ERR("Error: ODP local term failed.\n"); - exit(EXIT_FAILURE); - } - - if (odp_term_global(instance)) { - ODPH_ERR("Error: ODP global term failed.\n"); - exit(EXIT_FAILURE); - } - } - - return 0; -} diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c deleted file mode 100644 index f6c624df7f5..00000000000 --- a/helper/test/linux/pthread.c +++ /dev/null @@ -1,88 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright (c) 2015-2018 Linaro Limited - */ - -#include -#include -#include - -#include - -#define NUMBER_WORKERS 16 -static void *worker_fn(void *arg ODP_UNUSED) -{ - /* depend on the odp helper to call odp_init_local */ - - printf("Worker thread on CPU %d\n", odp_cpu_id()); - - /* depend on the odp helper to call odp_term_local */ - - return NULL; -} - -/* Create additional dataplane threads */ -int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED) -{ - odph_linux_pthread_t thread_tbl[NUMBER_WORKERS]; - odp_cpumask_t cpu_mask; - int num_workers; - int cpu; - char cpumaskstr[ODP_CPUMASK_STR_SIZE]; - odp_instance_t instance; - odph_linux_thr_params_t thr_params; - - if (odp_init_global(&instance, NULL, NULL)) { - ODPH_ERR("Error: ODP global init failed.\n"); - exit(EXIT_FAILURE); - } - - if (odp_init_local(instance, ODP_THREAD_CONTROL)) { - ODPH_ERR("Error: ODP local init failed.\n"); - exit(EXIT_FAILURE); - } - - /* discover how many threads this system can support */ - num_workers = odp_cpumask_default_worker(&cpu_mask, NUMBER_WORKERS); - if (num_workers < NUMBER_WORKERS) { - printf("System can only support %d threads and not the %d requested\n", - num_workers, NUMBER_WORKERS); - } - - /* generate a summary for the user */ - (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr, sizeof(cpumaskstr)); - printf("default cpu mask: %s\n", cpumaskstr); - printf("default num worker threads: %i\n", num_workers); - - cpu = odp_cpumask_first(&cpu_mask); - printf("the first CPU: %i\n", cpu); - - /* If possible, remove CPU 0 from the default mask to reserve it for the - * control plane. */ - if (num_workers > 1) - odp_cpumask_clr(&cpu_mask, 0); - num_workers = odp_cpumask_count(&cpu_mask); - (void)odp_cpumask_to_str(&cpu_mask, cpumaskstr, sizeof(cpumaskstr)); - printf("new cpu mask: %s\n", cpumaskstr); - printf("new num worker threads: %i\n\n", num_workers); - - memset(&thr_params, 0, sizeof(thr_params)); - thr_params.start = worker_fn; - thr_params.arg = NULL; - thr_params.thr_type = ODP_THREAD_WORKER; - thr_params.instance = instance; - - odph_linux_pthread_create(&thread_tbl[0], &cpu_mask, &thr_params); - odph_linux_pthread_join(thread_tbl, num_workers); - - if (odp_term_local()) { - ODPH_ERR("Error: ODP local term failed.\n"); - exit(EXIT_FAILURE); - } - - if (odp_term_global(instance)) { - ODPH_ERR("Error: ODP global term failed.\n"); - exit(EXIT_FAILURE); - } - - return 0; -} diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh index caa3fe8b581..67205d2f96d 100755 --- a/scripts/ci/coverage.sh +++ b/scripts/ci/coverage.sh @@ -13,7 +13,7 @@ cd "$(dirname "$0")"/../.. ./bootstrap ./configure \ CFLAGS="-O0 -coverage $CFLAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \ - --enable-debug=full --enable-helper-linux --enable-dpdk + --enable-debug=full --enable-dpdk export CCACHE_DISABLE=1 make -j $(nproc)