This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via e30d10a42db4083b53c5a85ee91d3bcda1bb80db (commit) via 8dcebe1c93786641649b1a1957fa4b54cf1e4d55 (commit) via 3cbc1462e8c79f7c0ce21c33ffa0365538f672e5 (commit) from dda80b5e5e143ff05ed0f8b0ce0f502be71eaa8b (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit e30d10a42db4083b53c5a85ee91d3bcda1bb80db Author: Matias Elo matias.elo@nokia.com Date: Mon Oct 21 16:28:52 2019 +0300
linux-gen: timer: add placeholder functions for local init/term
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 853ef1064..7a6a8bcaa 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -61,7 +61,9 @@ int _odp_comp_init_global(void); int _odp_comp_term_global(void);
int _odp_timer_init_global(const odp_init_t *params); +int _odp_timer_init_local(void); int _odp_timer_term_global(void); +int _odp_timer_term_local(void);
int _odp_time_init_global(void); int _odp_time_term_global(void); diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index e09b2879c..8a5b884b5 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -487,6 +487,13 @@ static int term_local(enum init_stage stage) } /* Fall through */
+ case TIMER_INIT: + if (_odp_timer_term_local()) { + ODP_ERR("ODP timer local term failed.\n"); + rc = -1; + } + /* Fall through */ + case THREAD_INIT: rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { @@ -539,6 +546,12 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = PKTIO_INIT;
+ if (_odp_timer_init_local()) { + ODP_ERR("ODP timer local init failed.\n"); + goto init_fail; + } + stage = TIMER_INIT; + if (_odp_random_init_local()) { ODP_ERR("ODP random local init failed.\n"); goto init_fail; diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index 6966726e4..1ca61e179 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1542,3 +1542,13 @@ int _odp_timer_term_global(void)
return 0; } + +int _odp_timer_init_local(void) +{ + return 0; +} + +int _odp_timer_term_local(void) +{ + return 0; +}
commit 8dcebe1c93786641649b1a1957fa4b54cf1e4d55 Author: Matias Elo matias.elo@nokia.com Date: Mon Oct 21 16:26:35 2019 +0300
linux-gen: init: fix local terminate function call order
Local terminate functions should be called in reverse order compared to local init functions.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 8e0994734..e09b2879c 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -466,6 +466,13 @@ static int term_local(enum init_stage stage) } /* Fall through */
+ case POOL_INIT: + if (_odp_pool_term_local()) { + ODP_ERR("ODP buffer pool local term failed.\n"); + rc = -1; + } + /* Fall through */ + case CRYPTO_INIT: if (_odp_crypto_term_local()) { ODP_ERR("ODP crypto local term failed.\n"); @@ -480,13 +487,6 @@ static int term_local(enum init_stage stage) } /* Fall through */
- case POOL_INIT: - if (_odp_pool_term_local()) { - ODP_ERR("ODP buffer pool local term failed.\n"); - rc = -1; - } - /* Fall through */ - case THREAD_INIT: rc_thd = _odp_thread_term_local(); if (rc_thd < 0) {
commit 3cbc1462e8c79f7c0ce21c33ffa0365538f672e5 Author: Matias Elo matias.elo@nokia.com Date: Mon Oct 21 15:44:46 2019 +0300
linux-gen: init: prefix internal init/term functions with underscore
Prefix internal init/term functions with underscore to improve code readability.
Unused odp_timer_disarm_all() function declaration is removed.
Signed-off-by: Matias Elo matias.elo@nokia.com Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
diff --git a/platform/linux-generic/include/odp_init_internal.h b/platform/linux-generic/include/odp_init_internal.h index 204f44838..853ef1064 100644 --- a/platform/linux-generic/include/odp_init_internal.h +++ b/platform/linux-generic/include/odp_init_internal.h @@ -14,24 +14,24 @@ extern "C" { #include <odp/api/init.h> #include <odp/api/thread.h>
-int odp_cpumask_init_global(const odp_init_t *params); -int odp_cpumask_term_global(void); +int _odp_cpumask_init_global(const odp_init_t *params); +int _odp_cpumask_term_global(void);
-int odp_system_info_init(void); -int odp_system_info_term(void); +int _odp_system_info_init(void); +int _odp_system_info_term(void);
-int odp_thread_init_global(void); -int odp_thread_init_local(odp_thread_type_t type); -int odp_thread_term_local(void); -int odp_thread_term_global(void); +int _odp_thread_init_global(void); +int _odp_thread_init_local(odp_thread_type_t type); +int _odp_thread_term_local(void); +int _odp_thread_term_global(void);
int _odp_pcapng_init_global(void); int _odp_pcapng_term_global(void);
-int odp_pool_init_global(void); -int odp_pool_init_local(void); -int odp_pool_term_global(void); -int odp_pool_term_local(void); +int _odp_pool_init_global(void); +int _odp_pool_init_local(void); +int _odp_pool_term_global(void); +int _odp_pool_term_local(void);
int _odp_queue_init_global(void); int _odp_queue_term_global(void); @@ -39,36 +39,35 @@ int _odp_queue_term_global(void); int _odp_schedule_init_global(void); int _odp_schedule_term_global(void);
-int odp_pktio_init_global(void); -int odp_pktio_term_global(void); -int odp_pktio_init_local(void); +int _odp_pktio_init_global(void); +int _odp_pktio_term_global(void); +int _odp_pktio_init_local(void);
-int odp_classification_init_global(void); -int odp_classification_term_global(void); +int _odp_classification_init_global(void); +int _odp_classification_term_global(void);
-int odp_queue_init_global(void); -int odp_queue_term_global(void); +int _odp_queue_init_global(void); +int _odp_queue_term_global(void);
int _odp_random_init_local(void); int _odp_random_term_local(void);
-int odp_crypto_init_global(void); -int odp_crypto_term_global(void); +int _odp_crypto_init_global(void); +int _odp_crypto_term_global(void); int _odp_crypto_init_local(void); int _odp_crypto_term_local(void);
int _odp_comp_init_global(void); int _odp_comp_term_global(void);
-int odp_timer_init_global(const odp_init_t *params); -int odp_timer_term_global(void); -int odp_timer_disarm_all(void); +int _odp_timer_init_global(const odp_init_t *params); +int _odp_timer_term_global(void);
-int odp_time_init_global(void); -int odp_time_term_global(void); +int _odp_time_init_global(void); +int _odp_time_term_global(void);
-int odp_tm_init_global(void); -int odp_tm_term_global(void); +int _odp_tm_init_global(void); +int _odp_tm_term_global(void);
int _odp_int_name_tbl_init_global(void); int _odp_int_name_tbl_term_global(void); diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c index 9a299f51b..b3d91b3fe 100644 --- a/platform/linux-generic/odp_classification.c +++ b/platform/linux-generic/odp_classification.c @@ -86,7 +86,7 @@ pmr_t *get_pmr_entry_internal(odp_pmr_t pmr) return &pmr_tbl->pmr[_odp_pmr_to_ndx(pmr)]; }
-int odp_classification_init_global(void) +int _odp_classification_init_global(void) { odp_shm_t shm; int i; @@ -119,7 +119,7 @@ int odp_classification_init_global(void) return 0; }
-int odp_classification_term_global(void) +int _odp_classification_term_global(void) { if (cls_global && odp_shm_free(cls_global->shm)) { ODP_ERR("shm free failed\n"); diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c index b8b9f325c..193e1a252 100644 --- a/platform/linux-generic/odp_cpumask.c +++ b/platform/linux-generic/odp_cpumask.c @@ -382,7 +382,7 @@ static void init_default_worker_cpumask(int control_cpus_default) * It also allows the default cpumasks to be overridden by * externally specified cpumasks passed in as initialization parameters. */ -int odp_cpumask_init_global(const odp_init_t *params) +int _odp_cpumask_init_global(const odp_init_t *params) { odp_cpumask_t *control_mask = &odp_global_ro.control_cpus; odp_cpumask_t *worker_mask = &odp_global_ro.worker_cpus; @@ -451,7 +451,7 @@ int odp_cpumask_init_global(const odp_init_t *params) } }
-int odp_cpumask_term_global(void) +int _odp_cpumask_term_global(void) { return 0; } diff --git a/platform/linux-generic/odp_crypto_null.c b/platform/linux-generic/odp_crypto_null.c index c19cb6824..633cf4751 100644 --- a/platform/linux-generic/odp_crypto_null.c +++ b/platform/linux-generic/odp_crypto_null.c @@ -304,7 +304,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, }
int -odp_crypto_init_global(void) +_odp_crypto_init_global(void) { size_t mem_size; odp_shm_t shm; @@ -337,7 +337,7 @@ odp_crypto_init_global(void) return 0; }
-int odp_crypto_term_global(void) +int _odp_crypto_term_global(void) { int rc = 0; int ret; diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c index 3911b8f4a..29cd22c2f 100644 --- a/platform/linux-generic/odp_crypto_openssl.c +++ b/platform/linux-generic/odp_crypto_openssl.c @@ -2487,8 +2487,7 @@ static void ODP_UNUSED openssl_lock(int mode, int n, } #endif
-int -odp_crypto_init_global(void) +int _odp_crypto_init_global(void) { size_t mem_size; odp_shm_t shm; @@ -2533,7 +2532,7 @@ odp_crypto_init_global(void) return 0; }
-int odp_crypto_term_global(void) +int _odp_crypto_term_global(void) { int rc = 0; int ret; diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c index 7d2477b0b..8e0994734 100644 --- a/platform/linux-generic/odp_init.c +++ b/platform/linux-generic/odp_init.c @@ -125,14 +125,14 @@ static int term_global(enum init_stage stage) /* Fall through */
case TRAFFIC_MNGR_INIT: - if (odp_tm_term_global()) { + if (_odp_tm_term_global()) { ODP_ERR("TM term failed.\n"); rc = -1; } /* Fall through */
case CLASSIFICATION_INIT: - if (odp_classification_term_global()) { + if (_odp_classification_term_global()) { ODP_ERR("ODP classification term failed.\n"); rc = -1; } @@ -146,7 +146,7 @@ static int term_global(enum init_stage stage) /* Fall through */
case CRYPTO_INIT: - if (odp_crypto_term_global()) { + if (_odp_crypto_term_global()) { ODP_ERR("ODP crypto term failed.\n"); rc = -1; } @@ -156,14 +156,14 @@ static int term_global(enum init_stage stage) /* Fall through */
case TIMER_INIT: - if (odp_timer_term_global()) { + if (_odp_timer_term_global()) { ODP_ERR("ODP timer term failed.\n"); rc = -1; } /* Fall through */
case PKTIO_INIT: - if (odp_pktio_term_global()) { + if (_odp_pktio_term_global()) { ODP_ERR("ODP pktio term failed.\n"); rc = -1; } @@ -184,14 +184,14 @@ static int term_global(enum init_stage stage) /* Fall through */
case POOL_INIT: - if (odp_pool_term_global()) { + if (_odp_pool_term_global()) { ODP_ERR("ODP buffer pool term failed.\n"); rc = -1; } /* Fall through */
case THREAD_INIT: - if (odp_thread_term_global()) { + if (_odp_thread_term_global()) { ODP_ERR("ODP thread term failed.\n"); rc = -1; } @@ -226,14 +226,14 @@ static int term_global(enum init_stage stage) /* Fall through */
case SYSINFO_INIT: - if (odp_system_info_term()) { + if (_odp_system_info_term()) { ODP_ERR("ODP system info term failed.\n"); rc = -1; } /* Fall through */
case TIME_INIT: - if (odp_time_term_global()) { + if (_odp_time_term_global()) { ODP_ERR("ODP time term failed.\n"); rc = -1; } @@ -242,7 +242,7 @@ static int term_global(enum init_stage stage) case CPU_CYCLES_INIT: /* Fall through */ case CPUMASK_INIT: - if (odp_cpumask_term_global()) { + if (_odp_cpumask_term_global()) { ODP_ERR("ODP cpumask term failed.\n"); rc = -1; } @@ -291,7 +291,7 @@ int odp_init_global(odp_instance_t *instance, } stage = LIBCONFIG_INIT;
- if (odp_cpumask_init_global(params)) { + if (_odp_cpumask_init_global(params)) { ODP_ERR("ODP cpumask init failed.\n"); goto init_failed; } @@ -303,13 +303,13 @@ int odp_init_global(odp_instance_t *instance, } stage = CPU_CYCLES_INIT;
- if (odp_time_init_global()) { + if (_odp_time_init_global()) { ODP_ERR("ODP time init failed.\n"); goto init_failed; } stage = TIME_INIT;
- if (odp_system_info_init()) { + if (_odp_system_info_init()) { ODP_ERR("ODP system_info init failed.\n"); goto init_failed; } @@ -339,13 +339,13 @@ int odp_init_global(odp_instance_t *instance, } stage = HASH_INIT;
- if (odp_thread_init_global()) { + if (_odp_thread_init_global()) { ODP_ERR("ODP thread init failed.\n"); goto init_failed; } stage = THREAD_INIT;
- if (odp_pool_init_global()) { + if (_odp_pool_init_global()) { ODP_ERR("ODP pool init failed.\n"); goto init_failed; } @@ -363,13 +363,13 @@ int odp_init_global(odp_instance_t *instance, } stage = SCHED_INIT;
- if (odp_pktio_init_global()) { + if (_odp_pktio_init_global()) { ODP_ERR("ODP packet io init failed.\n"); goto init_failed; } stage = PKTIO_INIT;
- if (odp_timer_init_global(params)) { + if (_odp_timer_init_global(params)) { ODP_ERR("ODP timer init failed.\n"); goto init_failed; } @@ -378,7 +378,7 @@ int odp_init_global(odp_instance_t *instance, /* No init neeeded */ stage = RANDOM_INIT;
- if (odp_crypto_init_global()) { + if (_odp_crypto_init_global()) { ODP_ERR("ODP crypto init failed.\n"); goto init_failed; } @@ -390,13 +390,13 @@ int odp_init_global(odp_instance_t *instance, } stage = COMP_INIT;
- if (odp_classification_init_global()) { + if (_odp_classification_init_global()) { ODP_ERR("ODP classification init failed.\n"); goto init_failed; } stage = CLASSIFICATION_INIT;
- if (odp_tm_init_global()) { + if (_odp_tm_init_global()) { ODP_ERR("ODP traffic manager init failed\n"); goto init_failed; } @@ -481,14 +481,14 @@ static int term_local(enum init_stage stage) /* Fall through */
case POOL_INIT: - if (odp_pool_term_local()) { + if (_odp_pool_term_local()) { ODP_ERR("ODP buffer pool local term failed.\n"); rc = -1; } /* Fall through */
case THREAD_INIT: - rc_thd = odp_thread_term_local(); + rc_thd = _odp_thread_term_local(); if (rc_thd < 0) { ODP_ERR("ODP thread local term failed.\n"); rc = -1; @@ -527,13 +527,13 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = ISHM_INIT;
- if (odp_thread_init_local(thr_type)) { + if (_odp_thread_init_local(thr_type)) { ODP_ERR("ODP thread local init failed.\n"); goto init_fail; } stage = THREAD_INIT;
- if (odp_pktio_init_local()) { + if (_odp_pktio_init_local()) { ODP_ERR("ODP packet io local init failed.\n"); goto init_fail; } @@ -551,7 +551,7 @@ int odp_init_local(odp_instance_t instance, odp_thread_type_t thr_type) } stage = CRYPTO_INIT;
- if (odp_pool_init_local()) { + if (_odp_pool_init_local()) { ODP_ERR("ODP pool local init failed.\n"); goto init_fail; } diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 22e9c1b21..6e4f36569 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -58,7 +58,7 @@ static inline pktio_entry_t *pktio_entry_by_index(int index) return pktio_entry_ptr[index]; }
-int odp_pktio_init_global(void) +int _odp_pktio_init_global(void) { pktio_entry_t *pktio_entry; int i; @@ -107,7 +107,7 @@ int odp_pktio_init_global(void) return 0; }
-int odp_pktio_init_local(void) +int _odp_pktio_init_local(void) { int pktio_if;
@@ -1311,7 +1311,7 @@ void odp_pktio_print(odp_pktio_t hdl) ODP_PRINT("\n"); }
-int odp_pktio_term_global(void) +int _odp_pktio_term_global(void) { int ret = 0; int i; diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index 67b1e7fb9..17504a2a7 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -208,7 +208,7 @@ static int read_config_file(pool_table_t *pool_tbl) return 0; }
-int odp_pool_init_global(void) +int _odp_pool_init_global(void) { uint32_t i; odp_shm_t shm; @@ -246,7 +246,7 @@ int odp_pool_init_global(void) return 0; }
-int odp_pool_term_global(void) +int _odp_pool_term_global(void) { int i; pool_t *pool; @@ -273,7 +273,7 @@ int odp_pool_term_global(void) return rc; }
-int odp_pool_init_local(void) +int _odp_pool_init_local(void) { pool_t *pool; int i; @@ -291,7 +291,7 @@ int odp_pool_init_local(void) return 0; }
-int odp_pool_term_local(void) +int _odp_pool_term_local(void) { int i;
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 028ef8668..599e21db2 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -334,7 +334,7 @@ static int system_hp(hugepage_info_t *hugeinfo) /* * System info initialisation */ -int odp_system_info_init(void) +int _odp_system_info_init(void) { int i; FILE *file; @@ -374,7 +374,7 @@ int odp_system_info_init(void) /* * System info termination */ -int odp_system_info_term(void) +int _odp_system_info_term(void) { free(odp_global_ro.hugepage_info.default_huge_page_dir);
diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c index 0ff0dc821..d88e6da5c 100644 --- a/platform/linux-generic/odp_thread.c +++ b/platform/linux-generic/odp_thread.c @@ -48,7 +48,7 @@ __thread _odp_thread_state_t *_odp_this_thread;
#include <odp/visibility_end.h>
-int odp_thread_init_global(void) +int _odp_thread_init_global(void) { odp_shm_t shm;
@@ -67,7 +67,7 @@ int odp_thread_init_global(void) return 0; }
-int odp_thread_term_global(void) +int _odp_thread_term_global(void) { int ret;
@@ -130,7 +130,7 @@ static int free_id(int thr) return thread_globals->num; }
-int odp_thread_init_local(odp_thread_type_t type) +int _odp_thread_init_local(odp_thread_type_t type) { int id; int cpu; @@ -183,7 +183,7 @@ int odp_thread_init_local(odp_thread_type_t type) return 0; }
-int odp_thread_term_local(void) +int _odp_thread_term_local(void) { int num; int group_all, group_worker, group_control; diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 87ee6adc9..b033a733c 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -223,7 +223,7 @@ void odp_time_wait_until(odp_time_t time) return time_wait_until(time); }
-int odp_time_init_global(void) +int _odp_time_init_global(void) { struct timespec *timespec; int ret = 0; @@ -254,7 +254,7 @@ int odp_time_init_global(void) return ret; }
-int odp_time_term_global(void) +int _odp_time_term_global(void) { return 0; } diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c index bd35e5b42..6966726e4 100644 --- a/platform/linux-generic/odp_timer.c +++ b/platform/linux-generic/odp_timer.c @@ -1464,7 +1464,7 @@ void odp_timeout_free(odp_timeout_t tmo) odp_buffer_free(odp_buffer_from_event(ev)); }
-int odp_timer_init_global(const odp_init_t *params) +int _odp_timer_init_global(const odp_init_t *params) { odp_shm_t shm; const char *conf_str; @@ -1533,7 +1533,7 @@ int odp_timer_init_global(const odp_init_t *params) return 0; }
-int odp_timer_term_global(void) +int _odp_timer_term_global(void) { if (timer_global && odp_shm_free(timer_global->shm)) { ODP_ERR("Shm free failed for odp_timer\n"); diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c index 9d19ac3c2..9a40d0716 100644 --- a/platform/linux-generic/odp_traffic_mngr.c +++ b/platform/linux-generic/odp_traffic_mngr.c @@ -4720,7 +4720,7 @@ void odp_tm_stats_print(odp_tm_t odp_tm) } }
-int odp_tm_init_global(void) +int _odp_tm_init_global(void) { odp_shm_t shm;
@@ -4756,7 +4756,7 @@ int odp_tm_init_global(void) return 0; }
-int odp_tm_term_global(void) +int _odp_tm_term_global(void) { if (odp_global_ro.init_param.not_used.feat.tm) return 0;
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/include/odp_init_internal.h | 57 +++++++++--------- platform/linux-generic/odp_classification.c | 4 +- platform/linux-generic/odp_cpumask.c | 4 +- platform/linux-generic/odp_crypto_null.c | 4 +- platform/linux-generic/odp_crypto_openssl.c | 5 +- platform/linux-generic/odp_init.c | 67 +++++++++++++--------- platform/linux-generic/odp_packet_io.c | 6 +- platform/linux-generic/odp_pool.c | 8 +-- platform/linux-generic/odp_system_info.c | 4 +- platform/linux-generic/odp_thread.c | 8 +-- platform/linux-generic/odp_time.c | 4 +- platform/linux-generic/odp_timer.c | 14 ++++- platform/linux-generic/odp_traffic_mngr.c | 4 +- 13 files changed, 106 insertions(+), 83 deletions(-)
hooks/post-receive