git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ci: add 32-bit travis builds
[dpdk.git]
/
lib
/
librte_timer
/
rte_timer.c
diff --git
a/lib/librte_timer/rte_timer.c
b/lib/librte_timer/rte_timer.c
index
eaeafd7
..
381a9f4
100644
(file)
--- a/
lib/librte_timer/rte_timer.c
+++ b/
lib/librte_timer/rte_timer.c
@@
-13,6
+13,7
@@
#include <rte_atomic.h>
#include <rte_common.h>
#include <rte_cycles.h>
#include <rte_atomic.h>
#include <rte_common.h>
#include <rte_cycles.h>
+#include <rte_eal_memconfig.h>
#include <rte_per_lcore.h>
#include <rte_memory.h>
#include <rte_launch.h>
#include <rte_per_lcore.h>
#include <rte_memory.h>
#include <rte_launch.h>
@@
-24,8
+25,8
@@
#include <rte_pause.h>
#include <rte_memzone.h>
#include <rte_malloc.h>
#include <rte_pause.h>
#include <rte_memzone.h>
#include <rte_malloc.h>
-#include <rte_compat.h>
#include <rte_errno.h>
#include <rte_errno.h>
+#include <rte_function_versioning.h>
#include "rte_timer.h"
#include "rte_timer.h"
@@
-61,6
+62,8
@@
struct rte_timer_data {
};
#define RTE_MAX_DATA_ELS 64
};
#define RTE_MAX_DATA_ELS 64
+static const struct rte_memzone *rte_timer_data_mz;
+static int *volatile rte_timer_mz_refcnt;
static struct rte_timer_data *rte_timer_data_arr;
static const uint32_t default_data_id;
static uint32_t rte_timer_subsystem_initialized;
static struct rte_timer_data *rte_timer_data_arr;
static const uint32_t default_data_id;
static uint32_t rte_timer_subsystem_initialized;
@@
-82,7
+85,8
@@
static struct rte_timer_data default_timer_data;
static inline int
timer_data_valid(uint32_t id)
{
static inline int
timer_data_valid(uint32_t id)
{
- return !!(rte_timer_data_arr[id].internal_flags & FL_ALLOCATED);
+ return rte_timer_data_arr &&
+ (rte_timer_data_arr[id].internal_flags & FL_ALLOCATED);
}
/* validate ID and retrieve timer data pointer, or return error value */
}
/* validate ID and retrieve timer data pointer, or return error value */
@@
-127,7
+131,7
@@
rte_timer_data_dealloc(uint32_t id)
return 0;
}
return 0;
}
-void
+void
__vsym
rte_timer_subsystem_init_v20(void)
{
unsigned lcore_id;
rte_timer_subsystem_init_v20(void)
{
unsigned lcore_id;
@@
-149,7
+153,7
@@
VERSION_SYMBOL(rte_timer_subsystem_init, _v20, 2.0);
* secondary processes should be empty, the zeroth entry can be shared by
* multiple processes.
*/
* secondary processes should be empty, the zeroth entry can be shared by
* multiple processes.
*/
-int
+int
__vsym
rte_timer_subsystem_init_v1905(void)
{
const struct rte_memzone *mz;
rte_timer_subsystem_init_v1905(void)
{
const struct rte_memzone *mz;
@@
-157,28
+161,30
@@
rte_timer_subsystem_init_v1905(void)
int i, lcore_id;
static const char *mz_name = "rte_timer_mz";
const size_t data_arr_size =
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);
+ RTE_MAX_DATA_ELS * sizeof(*rte_timer_data_arr);
+ const size_t mem_size = data_arr_size + sizeof(*rte_timer_mz_refcnt);
bool do_full_init = true;
if (rte_timer_subsystem_initialized)
return -EALREADY;
bool do_full_init = true;
if (rte_timer_subsystem_initialized)
return -EALREADY;
-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;
+ rte_mcfg_timer_lock();
- do_full_init = false;
- } else
+ mz = rte_memzone_lookup(mz_name);
+ if (mz == NULL) {
+ mz = rte_memzone_reserve_aligned(mz_name, mem_size,
+ SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
+ if (mz == NULL) {
+ rte_mcfg_timer_unlock();
return -ENOMEM;
return -ENOMEM;
- }
+ }
+ do_full_init = true;
+ } else
+ do_full_init = false;
+ rte_timer_data_mz = mz;
rte_timer_data_arr = mz->addr;
rte_timer_data_arr = mz->addr;
+ rte_timer_mz_refcnt = (void *)((char *)mz->addr + data_arr_size);
if (do_full_init) {
for (i = 0; i < RTE_MAX_DATA_ELS; i++) {
if (do_full_init) {
for (i = 0; i < RTE_MAX_DATA_ELS; i++) {
@@
-195,6
+201,9
@@
reserve:
}
rte_timer_data_arr[default_data_id].internal_flags |= FL_ALLOCATED;
}
rte_timer_data_arr[default_data_id].internal_flags |= FL_ALLOCATED;
+ (*rte_timer_mz_refcnt)++;
+
+ rte_mcfg_timer_unlock();
rte_timer_subsystem_initialized = 1;
rte_timer_subsystem_initialized = 1;
@@
-210,6
+219,13
@@
rte_timer_subsystem_finalize(void)
if (!rte_timer_subsystem_initialized)
return;
if (!rte_timer_subsystem_initialized)
return;
+ rte_mcfg_timer_lock();
+
+ if (--(*rte_timer_mz_refcnt) == 0)
+ rte_memzone_free(rte_timer_data_mz);
+
+ rte_mcfg_timer_unlock();
+
rte_timer_subsystem_initialized = 0;
}
rte_timer_subsystem_initialized = 0;
}
@@
-535,7
+551,7
@@
__rte_timer_reset(struct rte_timer *tim, uint64_t expire,
}
/* Reset and start the timer associated with the timer handle tim */
}
/* Reset and start the timer associated with the timer handle tim */
-int
+int
__vsym
rte_timer_reset_v20(struct rte_timer *tim, uint64_t ticks,
enum rte_timer_type type, unsigned int tim_lcore,
rte_timer_cb_t fct, void *arg)
rte_timer_reset_v20(struct rte_timer *tim, uint64_t ticks,
enum rte_timer_type type, unsigned int tim_lcore,
rte_timer_cb_t fct, void *arg)
@@
-558,7
+574,7
@@
rte_timer_reset_v20(struct rte_timer *tim, uint64_t ticks,
}
VERSION_SYMBOL(rte_timer_reset, _v20, 2.0);
}
VERSION_SYMBOL(rte_timer_reset, _v20, 2.0);
-int
+int
__vsym
rte_timer_reset_v1905(struct rte_timer *tim, uint64_t ticks,
enum rte_timer_type type, unsigned int tim_lcore,
rte_timer_cb_t fct, void *arg)
rte_timer_reset_v1905(struct rte_timer *tim, uint64_t ticks,
enum rte_timer_type type, unsigned int tim_lcore,
rte_timer_cb_t fct, void *arg)
@@
-641,14
+657,14
@@
__rte_timer_stop(struct rte_timer *tim, int local_is_locked,
}
/* Stop the timer associated with the timer handle tim */
}
/* Stop the timer associated with the timer handle tim */
-int
+int
__vsym
rte_timer_stop_v20(struct rte_timer *tim)
{
return __rte_timer_stop(tim, 0, &default_timer_data);
}
VERSION_SYMBOL(rte_timer_stop, _v20, 2.0);
rte_timer_stop_v20(struct rte_timer *tim)
{
return __rte_timer_stop(tim, 0, &default_timer_data);
}
VERSION_SYMBOL(rte_timer_stop, _v20, 2.0);
-int
+int
__vsym
rte_timer_stop_v1905(struct rte_timer *tim)
{
return rte_timer_alt_stop(default_data_id, tim);
rte_timer_stop_v1905(struct rte_timer *tim)
{
return rte_timer_alt_stop(default_data_id, tim);
@@
-801,14
+817,14
@@
__rte_timer_manage(struct rte_timer_data *timer_data)
priv_timer[lcore_id].running_tim = NULL;
}
priv_timer[lcore_id].running_tim = NULL;
}
-void
+void
__vsym
rte_timer_manage_v20(void)
{
__rte_timer_manage(&default_timer_data);
}
VERSION_SYMBOL(rte_timer_manage, _v20, 2.0);
rte_timer_manage_v20(void)
{
__rte_timer_manage(&default_timer_data);
}
VERSION_SYMBOL(rte_timer_manage, _v20, 2.0);
-int
+int
__vsym
rte_timer_manage_v1905(void)
{
struct rte_timer_data *timer_data;
rte_timer_manage_v1905(void)
{
struct rte_timer_data *timer_data;
@@
-1058,14
+1074,14
@@
__rte_timer_dump_stats(struct rte_timer_data *timer_data __rte_unused, FILE *f)
#endif
}
#endif
}
-void
+void
__vsym
rte_timer_dump_stats_v20(FILE *f)
{
__rte_timer_dump_stats(&default_timer_data, f);
}
VERSION_SYMBOL(rte_timer_dump_stats, _v20, 2.0);
rte_timer_dump_stats_v20(FILE *f)
{
__rte_timer_dump_stats(&default_timer_data, f);
}
VERSION_SYMBOL(rte_timer_dump_stats, _v20, 2.0);
-int
+int
__vsym
rte_timer_dump_stats_v1905(FILE *f)
{
return rte_timer_alt_dump_stats(default_data_id, f);
rte_timer_dump_stats_v1905(FILE *f)
{
return rte_timer_alt_dump_stats(default_data_id, f);