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
eal/windows: support more common files
[dpdk.git]
/
lib
/
librte_efd
/
rte_efd.c
diff --git
a/lib/librte_efd/rte_efd.c
b/lib/librte_efd/rte_efd.c
index
1a97ece
..
4deeb17
100644
(file)
--- a/
lib/librte_efd/rte_efd.c
+++ b/
lib/librte_efd/rte_efd.c
@@
-9,6
+9,7
@@
#include <stdarg.h>
#include <sys/queue.h>
#include <stdarg.h>
#include <sys/queue.h>
+#include <rte_string_fns.h>
#include <rte_log.h>
#include <rte_eal_memconfig.h>
#include <rte_errno.h>
#include <rte_log.h>
#include <rte_eal_memconfig.h>
#include <rte_errno.h>
@@
-19,6
+20,7
@@
#include <rte_ring.h>
#include <rte_jhash.h>
#include <rte_hash_crc.h>
#include <rte_ring.h>
#include <rte_jhash.h>
#include <rte_hash_crc.h>
+#include <rte_tailq.h>
#include "rte_efd.h"
#if defined(RTE_ARCH_X86)
#include "rte_efd.h"
#if defined(RTE_ARCH_X86)
@@
-179,7
+181,7
@@
struct efd_offline_group_rules {
/**< Array with all values of the keys of the group. */
uint8_t bin_id[EFD_MAX_GROUP_NUM_RULES];
/**< Array with all values of the keys of the group. */
uint8_t bin_id[EFD_MAX_GROUP_NUM_RULES];
- /**< Stores the bin for each corresp
e
nding key to
+ /**< Stores the bin for each corresp
o
nding key to
* avoid having to recompute it
*/
};
* avoid having to recompute it
*/
};
@@
-531,7
+533,7
@@
rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
num_chunks_shift = rte_bsf32(num_chunks);
num_chunks_shift = rte_bsf32(num_chunks);
- rte_
rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_lock(
);
/*
* Guarantee there's no existing: this is normally already checked
/*
* Guarantee there's no existing: this is normally already checked
@@
-591,7
+593,7
@@
rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
goto error_unlock_exit;
}
table->keys = key_array;
goto error_unlock_exit;
}
table->keys = key_array;
- s
nprintf(table->name, sizeof(table->name), "%s", name
);
+ s
trlcpy(table->name, name, sizeof(table->name)
);
RTE_LOG(DEBUG, EFD, "Creating an EFD table with %u chunks,"
" which potentially supports %u entries\n",
RTE_LOG(DEBUG, EFD, "Creating an EFD table with %u chunks,"
" which potentially supports %u entries\n",
@@
-684,7
+686,7
@@
rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
te->data = (void *) table;
TAILQ_INSERT_TAIL(efd_list, te, next);
te->data = (void *) table;
TAILQ_INSERT_TAIL(efd_list, te, next);
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
snprintf(ring_name, sizeof(ring_name), "HT_%s", table->name);
/* Create ring (Dummy slot index is not enqueued) */
snprintf(ring_name, sizeof(ring_name), "HT_%s", table->name);
/* Create ring (Dummy slot index is not enqueued) */
@@
-704,7
+706,7
@@
rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
return table;
error_unlock_exit:
return table;
error_unlock_exit:
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
rte_efd_free(table);
return NULL;
rte_efd_free(table);
return NULL;
@@
-719,7
+721,7
@@
rte_efd_find_existing(const char *name)
efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
- rte_
rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_read_lock(
);
TAILQ_FOREACH(te, efd_list, next)
{
TAILQ_FOREACH(te, efd_list, next)
{
@@
-727,7
+729,7
@@
rte_efd_find_existing(const char *name)
if (strncmp(name, table->name, RTE_EFD_NAMESIZE) == 0)
break;
}
if (strncmp(name, table->name, RTE_EFD_NAMESIZE) == 0)
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;
@@
-750,7
+752,7
@@
rte_efd_free(struct rte_efd_table *table)
rte_free(table->chunks[socket_id]);
efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
rte_free(table->chunks[socket_id]);
efd_list = RTE_TAILQ_CAST(rte_efd_tailq.head, rte_efd_list);
- rte_
rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_lock(
);
TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
if (te->data == (void *) table) {
TAILQ_FOREACH_SAFE(te, efd_list, next, temp) {
if (te->data == (void *) table) {
@@
-760,7
+762,7
@@
rte_efd_free(struct rte_efd_table *table)
}
}
}
}
- rte_
rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK
);
+ rte_
mcfg_tailq_write_unlock(
);
rte_ring_free(table->free_slots);
rte_free(table->offline_chunks);
rte_free(table->keys);
rte_ring_free(table->free_slots);
rte_free(table->offline_chunks);
rte_free(table->keys);