X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_timer%2Frte_timer.c;h=eaeafd74fb00ef5de8d861655008e6d6d7d41b28;hb=284ea1cc38b4d7cdfae660e217a809582030b1a9;hp=eb460098b6bf86bfefc07ade4ee4605bc4c4bea5;hpb=50247fe03fe0476746b1ecdb540d44e24a28cece;p=dpdk.git diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c index eb460098b6..eaeafd74fb 100644 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "rte_timer.h" @@ -91,7 +92,7 @@ timer_data_valid(uint32_t id) timer_data = &rte_timer_data_arr[id]; \ } while (0) -int __rte_experimental +int rte_timer_data_alloc(uint32_t *id_ptr) { int i; @@ -115,7 +116,7 @@ rte_timer_data_alloc(uint32_t *id_ptr) return -ENOSPC; } -int __rte_experimental +int rte_timer_data_dealloc(uint32_t id) { struct rte_timer_data *timer_data; @@ -155,40 +156,41 @@ rte_timer_subsystem_init_v1905(void) struct rte_timer_data *data; int i, lcore_id; static const char *mz_name = "rte_timer_mz"; + const size_t data_arr_size = + RTE_MAX_DATA_ELS * sizeof(*rte_timer_data_arr); + bool do_full_init = true; if (rte_timer_subsystem_initialized) return -EALREADY; - if (rte_eal_process_type() != RTE_PROC_PRIMARY) { - mz = rte_memzone_lookup(mz_name); - if (mz == NULL) - return -EEXIST; - - rte_timer_data_arr = mz->addr; - - rte_timer_data_arr[default_data_id].internal_flags |= - FL_ALLOCATED; - - rte_timer_subsystem_initialized = 1; - - return 0; +reserve: + rte_errno = 0; + mz = rte_memzone_reserve_aligned(mz_name, data_arr_size, SOCKET_ID_ANY, + 0, RTE_CACHE_LINE_SIZE); + if (mz == NULL) { + if (rte_errno == EEXIST) { + mz = rte_memzone_lookup(mz_name); + if (mz == NULL) + goto reserve; + + do_full_init = false; + } else + return -ENOMEM; } - mz = rte_memzone_reserve_aligned(mz_name, - RTE_MAX_DATA_ELS * sizeof(*rte_timer_data_arr), - SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE); - if (mz == NULL) - return -ENOMEM; - rte_timer_data_arr = mz->addr; - for (i = 0; i < RTE_MAX_DATA_ELS; i++) { - data = &rte_timer_data_arr[i]; + if (do_full_init) { + for (i = 0; i < RTE_MAX_DATA_ELS; i++) { + data = &rte_timer_data_arr[i]; - for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - rte_spinlock_init( - &data->priv_timer[lcore_id].list_lock); - data->priv_timer[lcore_id].prev_lcore = lcore_id; + for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; + lcore_id++) { + rte_spinlock_init( + &data->priv_timer[lcore_id].list_lock); + data->priv_timer[lcore_id].prev_lcore = + lcore_id; + } } } @@ -202,11 +204,11 @@ MAP_STATIC_SYMBOL(int rte_timer_subsystem_init(void), rte_timer_subsystem_init_v1905); BIND_DEFAULT_SYMBOL(rte_timer_subsystem_init, _v1905, 19.05); -void __rte_experimental +void rte_timer_subsystem_finalize(void) { - if (rte_timer_data_arr) - rte_free(rte_timer_data_arr); + if (!rte_timer_subsystem_initialized) + return; rte_timer_subsystem_initialized = 0; } @@ -571,7 +573,7 @@ MAP_STATIC_SYMBOL(int rte_timer_reset(struct rte_timer *tim, uint64_t ticks, rte_timer_reset_v1905); BIND_DEFAULT_SYMBOL(rte_timer_reset, _v1905, 19.05); -int __rte_experimental +int rte_timer_alt_reset(uint32_t timer_data_id, struct rte_timer *tim, uint64_t ticks, enum rte_timer_type type, unsigned int tim_lcore, rte_timer_cb_t fct, void *arg) @@ -655,7 +657,7 @@ MAP_STATIC_SYMBOL(int rte_timer_stop(struct rte_timer *tim), rte_timer_stop_v1905); BIND_DEFAULT_SYMBOL(rte_timer_stop, _v1905, 19.05); -int __rte_experimental +int rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim) { struct rte_timer_data *timer_data; @@ -820,16 +822,16 @@ rte_timer_manage_v1905(void) MAP_STATIC_SYMBOL(int rte_timer_manage(void), rte_timer_manage_v1905); BIND_DEFAULT_SYMBOL(rte_timer_manage, _v1905, 19.05); -int __rte_experimental +int rte_timer_alt_manage(uint32_t timer_data_id, unsigned int *poll_lcores, int nb_poll_lcores, rte_timer_alt_manage_cb_t f) { + unsigned int default_poll_lcores[] = {rte_lcore_id()}; union rte_timer_status status; struct rte_timer *tim, *next_tim, **pprev; struct rte_timer *run_first_tims[RTE_MAX_LCORE]; - unsigned int runlist_lcore_ids[RTE_MAX_LCORE]; unsigned int this_lcore = rte_lcore_id(); struct rte_timer *prev[MAX_SKIPLIST_DEPTH + 1]; uint64_t cur_time; @@ -847,8 +849,8 @@ rte_timer_alt_manage(uint32_t timer_data_id, __TIMER_STAT_ADD(data->priv_timer, manage, 1); if (poll_lcores == NULL) { - poll_lcores = (unsigned int []){rte_lcore_id()}; - nb_poll_lcores = 1; + poll_lcores = default_poll_lcores; + nb_poll_lcores = RTE_DIM(default_poll_lcores); } for (i = 0; i < nb_poll_lcores; i++) { @@ -898,7 +900,6 @@ rte_timer_alt_manage(uint32_t timer_data_id, /* transition run-list from PENDING to RUNNING */ run_first_tims[nb_runlists] = tim; - runlist_lcore_ids[nb_runlists] = poll_lcore; pprev = &run_first_tims[nb_runlists]; nb_runlists++; @@ -945,25 +946,24 @@ rte_timer_alt_manage(uint32_t timer_data_id, break; tim = run_first_tims[min_idx]; - privp = &data->priv_timer[runlist_lcore_ids[min_idx]]; /* Move down the runlist from which we picked a timer to * execute */ run_first_tims[min_idx] = run_first_tims[min_idx]->sl_next[0]; - privp->updated = 0; - privp->running_tim = tim; + data->priv_timer[this_lcore].updated = 0; + data->priv_timer[this_lcore].running_tim = tim; /* Call the provided callback function */ f(tim); - __TIMER_STAT_ADD(privp, pending, -1); + __TIMER_STAT_ADD(data->priv_timer, pending, -1); /* the timer was stopped or reloaded by the callback * function, we have nothing to do here */ - if (privp->updated == 1) + if (data->priv_timer[this_lcore].updated == 1) continue; if (tim->period == 0) { @@ -988,14 +988,14 @@ rte_timer_alt_manage(uint32_t timer_data_id, &data->priv_timer[this_lcore].list_lock); } - privp->running_tim = NULL; + data->priv_timer[this_lcore].running_tim = NULL; } return 0; } /* Walk pending lists, stopping timers and calling user-specified function */ -int __rte_experimental +int rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores, int nb_walk_lcores, rte_timer_stop_all_cb_t f, void *f_arg) @@ -1074,7 +1074,7 @@ MAP_STATIC_SYMBOL(int rte_timer_dump_stats(FILE *f), rte_timer_dump_stats_v1905); BIND_DEFAULT_SYMBOL(rte_timer_dump_stats, _v1905, 19.05); -int __rte_experimental +int rte_timer_alt_dump_stats(uint32_t timer_data_id __rte_unused, FILE *f) { struct rte_timer_data *timer_data;