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
test mbuf attach
[dpdk.git]
/
lib
/
librte_stack
/
rte_stack.c
diff --git
a/lib/librte_stack/rte_stack.c
b/lib/librte_stack/rte_stack.c
index
1a4d9bd
..
8a51fba
100644
(file)
--- a/
lib/librte_stack/rte_stack.c
+++ b/
lib/librte_stack/rte_stack.c
@@
-4,6
+4,7
@@
#include <string.h>
#include <string.h>
+#include <rte_string_fns.h>
#include <rte_atomic.h>
#include <rte_eal.h>
#include <rte_eal_memconfig.h>
#include <rte_atomic.h>
#include <rte_eal.h>
#include <rte_eal_memconfig.h>
@@
-14,9
+15,7
@@
#include <rte_tailq.h>
#include "rte_stack.h"
#include <rte_tailq.h>
#include "rte_stack.h"
-#include "rte_stack_pvt.h"
-
-int stack_logtype;
+#include "stack_pvt.h"
TAILQ_HEAD(rte_stack_list, rte_tailq_entry);
TAILQ_HEAD(rte_stack_list, rte_tailq_entry);
@@
-58,6
+57,11
@@
rte_stack_create(const char *name, unsigned int count, int socket_id,
unsigned int sz;
int ret;
unsigned int sz;
int ret;
+ if (flags & ~(RTE_STACK_F_LF)) {
+ STACK_LOG_ERR("Unsupported stack flags %#x\n", flags);
+ return NULL;
+ }
+
#ifdef RTE_ARCH_64
RTE_BUILD_BUG_ON(sizeof(struct rte_stack_lf_head) != 16);
#else
#ifdef RTE_ARCH_64
RTE_BUILD_BUG_ON(sizeof(struct rte_stack_lf_head) != 16);
#else
@@
-83,13
+87,13
@@
rte_stack_create(const char *name, unsigned int count, int socket_id,
return NULL;
}
return NULL;
}
- rte_
rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_lock(
);
mz = rte_memzone_reserve_aligned(mz_name, sz, socket_id,
0, __alignof__(*s));
if (mz == NULL) {
STACK_LOG_ERR("Cannot reserve stack memzone!\n");
mz = rte_memzone_reserve_aligned(mz_name, sz, socket_id,
0, __alignof__(*s));
if (mz == NULL) {
STACK_LOG_ERR("Cannot reserve stack memzone!\n");
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
rte_free(te);
return NULL;
}
rte_free(te);
return NULL;
}
@@
-99,9
+103,9
@@
rte_stack_create(const char *name, unsigned int count, int socket_id,
rte_stack_init(s, count, flags);
/* Store the name for later lookups */
rte_stack_init(s, count, flags);
/* Store the name for later lookups */
- ret = s
nprintf(s->name, sizeof(s->name), "%s", name
);
+ ret = s
trlcpy(s->name, name, sizeof(s->name)
);
if (ret < 0 || ret >= (int)sizeof(s->name)) {
if (ret < 0 || ret >= (int)sizeof(s->name)) {
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
rte_errno = ENAMETOOLONG;
rte_free(te);
rte_errno = ENAMETOOLONG;
rte_free(te);
@@
-119,7
+123,7
@@
rte_stack_create(const char *name, unsigned int count, int socket_id,
TAILQ_INSERT_TAIL(stack_list, te, next);
TAILQ_INSERT_TAIL(stack_list, te, next);
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
return s;
}
return s;
}
@@
-134,7
+138,7
@@
rte_stack_free(struct rte_stack *s)
return;
stack_list = RTE_TAILQ_CAST(rte_stack_tailq.head, rte_stack_list);
return;
stack_list = RTE_TAILQ_CAST(rte_stack_tailq.head, rte_stack_list);
- rte_
rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_lock(
);
/* find out tailq entry */
TAILQ_FOREACH(te, stack_list, next) {
/* find out tailq entry */
TAILQ_FOREACH(te, stack_list, next) {
@@
-143,13
+147,13
@@
rte_stack_free(struct rte_stack *s)
}
if (te == NULL) {
}
if (te == NULL) {
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
return;
}
TAILQ_REMOVE(stack_list, te, next);
return;
}
TAILQ_REMOVE(stack_list, te, next);
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
rte_free(te);
rte_free(te);
@@
-170,7
+174,7
@@
rte_stack_lookup(const char *name)
stack_list = RTE_TAILQ_CAST(rte_stack_tailq.head, rte_stack_list);
stack_list = RTE_TAILQ_CAST(rte_stack_tailq.head, rte_stack_list);
- rte_
rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_read_lock(
);
TAILQ_FOREACH(te, stack_list, next) {
r = (struct rte_stack *) te->data;
TAILQ_FOREACH(te, stack_list, next) {
r = (struct rte_stack *) te->data;
@@
-178,7
+182,7
@@
rte_stack_lookup(const char *name)
break;
}
break;
}
- rte_
rwlock_read_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_read_unlock(
);
if (te == NULL) {
rte_errno = ENOENT;
if (te == NULL) {
rte_errno = ENOENT;
@@
-188,9
+192,4
@@
rte_stack_lookup(const char *name)
return r;
}
return r;
}
-RTE_INIT(librte_stack_init_log)
-{
- stack_logtype = rte_log_register("lib.stack");
- if (stack_logtype >= 0)
- rte_log_set_level(stack_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(stack_logtype, lib.stack, NOTICE);