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
bonding: do not activate slave twice
[dpdk.git]
/
app
/
test
/
test_table_combined.c
diff --git
a/app/test/test_table_combined.c
b/app/test/test_table_combined.c
index
3380ff1
..
acb4f4d
100644
(file)
--- a/
app/test/test_table_combined.c
+++ b/
app/test/test_table_combined.c
@@
-31,7
+31,6
@@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef RTE_LIBRTE_TABLE
#include <string.h>
#include "test_table_combined.h"
#include "test_table.h"
#include <string.h>
#include "test_table_combined.h"
#include "test_table.h"
@@
-294,9
+293,12
@@
test_table_lpm_combined(void)
/* Traffic flow */
struct rte_table_lpm_params lpm_params = {
/* Traffic flow */
struct rte_table_lpm_params lpm_params = {
+ .name = "LPM",
.n_rules = 1 << 16,
.n_rules = 1 << 16,
+ .number_tbl8s = 1 << 8,
+ .flags = 0,
.entry_unique_size = 8,
.entry_unique_size = 8,
- .offset =
0
,
+ .offset =
APP_METADATA_OFFSET(0)
,
};
struct rte_table_lpm_key lpm_key = {
};
struct rte_table_lpm_key lpm_key = {
@@
-353,10
+355,11
@@
test_table_lpm_ipv6_combined(void)
/* Traffic flow */
struct rte_table_lpm_ipv6_params lpm_ipv6_params = {
/* Traffic flow */
struct rte_table_lpm_ipv6_params lpm_ipv6_params = {
+ .name = "LPM",
.n_rules = 1 << 16,
.number_tbl8s = 1 << 13,
.entry_unique_size = 8,
.n_rules = 1 << 16,
.number_tbl8s = 1 << 13,
.entry_unique_size = 8,
- .offset =
32
,
+ .offset =
APP_METADATA_OFFSET(32)
,
};
struct rte_table_lpm_ipv6_key lpm_ipv6_key = {
};
struct rte_table_lpm_ipv6_key lpm_ipv6_key = {
@@
-417,9
+420,9
@@
test_table_hash8lru(void)
struct rte_table_hash_key8_lru_params key8lru_params = {
.n_entries = 1<<24,
.f_hash = pipeline_test_hash,
struct rte_table_hash_key8_lru_params key8lru_params = {
.n_entries = 1<<24,
.f_hash = pipeline_test_hash,
- .s
eed = 0
,
- .
signature_offset = 0
,
- .key_
offset = 32
,
+ .s
ignature_offset = APP_METADATA_OFFSET(0)
,
+ .
key_offset = APP_METADATA_OFFSET(32)
,
+ .key_
mask = NULL
,
};
uint8_t key8lru[8];
};
uint8_t key8lru[8];
@@
-476,8
+479,9
@@
test_table_hash16lru(void)
.n_entries = 1<<16,
.f_hash = pipeline_test_hash,
.seed = 0,
.n_entries = 1<<16,
.f_hash = pipeline_test_hash,
.seed = 0,
- .signature_offset = 0,
- .key_offset = 32,
+ .signature_offset = APP_METADATA_OFFSET(0),
+ .key_offset = APP_METADATA_OFFSET(32),
+ .key_mask = NULL,
};
uint8_t key16lru[16];
};
uint8_t key16lru[16];
@@
-534,8
+538,8
@@
test_table_hash32lru(void)
.n_entries = 1<<16,
.f_hash = pipeline_test_hash,
.seed = 0,
.n_entries = 1<<16,
.f_hash = pipeline_test_hash,
.seed = 0,
- .signature_offset =
0
,
- .key_offset =
32
,
+ .signature_offset =
APP_METADATA_OFFSET(0)
,
+ .key_offset =
APP_METADATA_OFFSET(32)
,
};
uint8_t key32lru[32];
};
uint8_t key32lru[32];
@@
-593,8
+597,9
@@
test_table_hash8ext(void)
.n_entries_ext = 1<<15,
.f_hash = pipeline_test_hash,
.seed = 0,
.n_entries_ext = 1<<15,
.f_hash = pipeline_test_hash,
.seed = 0,
- .signature_offset = 0,
- .key_offset = 32,
+ .signature_offset = APP_METADATA_OFFSET(0),
+ .key_offset = APP_METADATA_OFFSET(32),
+ .key_mask = NULL,
};
uint8_t key8ext[8];
};
uint8_t key8ext[8];
@@
-659,8
+664,9
@@
test_table_hash16ext(void)
.n_entries_ext = 1<<15,
.f_hash = pipeline_test_hash,
.seed = 0,
.n_entries_ext = 1<<15,
.f_hash = pipeline_test_hash,
.seed = 0,
- .signature_offset = 0,
- .key_offset = 32,
+ .signature_offset = APP_METADATA_OFFSET(0),
+ .key_offset = APP_METADATA_OFFSET(32),
+ .key_mask = NULL,
};
uint8_t key16ext[16];
};
uint8_t key16ext[16];
@@
-725,8
+731,8
@@
test_table_hash32ext(void)
.n_entries_ext = 1<<15,
.f_hash = pipeline_test_hash,
.seed = 0,
.n_entries_ext = 1<<15,
.f_hash = pipeline_test_hash,
.seed = 0,
- .signature_offset =
0
,
- .key_offset =
32
,
+ .signature_offset =
APP_METADATA_OFFSET(0)
,
+ .key_offset =
APP_METADATA_OFFSET(32)
,
};
uint8_t key32ext[32];
};
uint8_t key32ext[32];
@@
-780,5
+786,3
@@
test_table_hash32ext(void)
return 0;
}
return 0;
}
-
-#endif