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
crypto/libcrypto: add driver for OpenSSL library
[dpdk.git]
/
lib
/
librte_timer
/
rte_timer.h
diff --git
a/lib/librte_timer/rte_timer.h
b/lib/librte_timer/rte_timer.h
old mode 100755
(executable)
new mode 100644
(file)
index
4907cf5
..
a276a73
--- a/
lib/librte_timer/rte_timer.h
+++ b/
lib/librte_timer/rte_timer.h
@@
-66,6
+66,7
@@
#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
+#include <rte_common.h>
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
@@
-76,7
+77,7
@@
extern "C" {
#define RTE_TIMER_RUNNING 2 /**< State: timer function is running. */
#define RTE_TIMER_CONFIG 3 /**< State: timer is being configured. */
#define RTE_TIMER_RUNNING 2 /**< State: timer function is running. */
#define RTE_TIMER_CONFIG 3 /**< State: timer is being configured. */
-#define RTE_TIMER_NO_OWNER -
1
/**< Timer has no owner. */
+#define RTE_TIMER_NO_OWNER -
2
/**< Timer has no owner. */
/**
* Timer type: Periodic or single (one-shot).
/**
* Timer type: Periodic or single (one-shot).
@@
-91,6
+92,7
@@
enum rte_timer_type {
* config) and an owner (the id of the lcore that owns the timer).
*/
union rte_timer_status {
* config) and an owner (the id of the lcore that owns the timer).
*/
union rte_timer_status {
+ RTE_STD_C11
struct {
uint16_t state; /**< Stop, pending, running, config. */
int16_t owner; /**< The lcore that owns the timer. */
struct {
uint16_t state; /**< Stop, pending, running, config. */
int16_t owner; /**< The lcore that owns the timer. */
@@
-115,7
+117,7
@@
struct rte_timer;
/**
* Callback function type for timer expiry.
*/
/**
* Callback function type for timer expiry.
*/
-typedef void (rte_timer_cb_t)(struct rte_timer *, void *);
+typedef void (
*
rte_timer_cb_t)(struct rte_timer *, void *);
#define MAX_SKIPLIST_DEPTH 10
#define MAX_SKIPLIST_DEPTH 10
@@
-128,7
+130,7
@@
struct rte_timer
struct rte_timer *sl_next[MAX_SKIPLIST_DEPTH];
volatile union rte_timer_status status; /**< Status of timer. */
uint64_t period; /**< Period of timer (0 if not periodic). */
struct rte_timer *sl_next[MAX_SKIPLIST_DEPTH];
volatile union rte_timer_status status; /**< Status of timer. */
uint64_t period; /**< Period of timer (0 if not periodic). */
- rte_timer_cb_t
*f;
/**< Callback function. */
+ rte_timer_cb_t
f;
/**< Callback function. */
void *arg; /**< Argument to callback function. */
};
void *arg; /**< Argument to callback function. */
};
@@
-310,7
+312,7
@@
int rte_timer_pending(struct rte_timer *tim);
/**
* Manage the timer list and execute callback functions.
*
/**
* Manage the timer list and execute callback functions.
*
- * This function must be called periodically from
all
cores
+ * This function must be called periodically from
EAL l
cores
* main_loop(). It browses the list of pending timers and runs all
* timers that are expired.
*
* main_loop(). It browses the list of pending timers and runs all
* timers that are expired.
*