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
add prefix to cache line macros
[dpdk.git]
/
app
/
test
/
test_mbuf.c
diff --git
a/app/test/test_mbuf.c
b/app/test/test_mbuf.c
index
280b1ab
..
e86ba22
100644
(file)
--- a/
app/test/test_mbuf.c
+++ b/
app/test/test_mbuf.c
@@
-344,8
+344,8
@@
testclone_testupdate_testdetach(void)
GOTO_FAIL("cannot clone data\n");
rte_pktmbuf_free(clone);
GOTO_FAIL("cannot clone data\n");
rte_pktmbuf_free(clone);
- mc->
pkt.
next = rte_pktmbuf_alloc(pktmbuf_pool);
- if(mc->
pkt.
next == NULL)
+ mc->next = rte_pktmbuf_alloc(pktmbuf_pool);
+ if(mc->next == NULL)
GOTO_FAIL("Next Pkt Null\n");
clone = rte_pktmbuf_clone(mc, pktmbuf_pool);
GOTO_FAIL("Next Pkt Null\n");
clone = rte_pktmbuf_clone(mc, pktmbuf_pool);
@@
-432,7
+432,7
@@
test_pktmbuf_pool_ptr(void)
printf("rte_pktmbuf_alloc() failed (%u)\n", i);
ret = -1;
}
printf("rte_pktmbuf_alloc() failed (%u)\n", i);
ret = -1;
}
- m[i]->
pkt.data = RTE_PTR_ADD(m[i]->pkt.data, 64)
;
+ m[i]->
data_off += 64
;
}
/* free them */
}
/* free them */
@@
-451,8
+451,8
@@
test_pktmbuf_pool_ptr(void)
printf("rte_pktmbuf_alloc() failed (%u)\n", i);
ret = -1;
}
printf("rte_pktmbuf_alloc() failed (%u)\n", i);
ret = -1;
}
- if (m[i]->
pkt.data != RTE_PTR_ADD(m[i]->buf_addr, RTE_PKTMBUF_HEADROOM)
) {
- printf
("pkt.data pointer not set properly
\n");
+ if (m[i]->
data_off != RTE_PKTMBUF_HEADROOM
) {
+ printf
("invalid data_off
\n");
ret = -1;
}
}
ret = -1;
}
}
@@
-493,7
+493,7
@@
test_pktmbuf_free_segment(void)
mb = m[i];
while(mb != NULL) {
mt = mb;
mb = m[i];
while(mb != NULL) {
mt = mb;
- mb = mb->
pkt.
next;
+ mb = mb->next;
rte_pktmbuf_free_seg(mt);
}
}
rte_pktmbuf_free_seg(mt);
}
}
@@
-677,21
+677,10
@@
test_refcnt_mbuf(void)
return (0);
}
return (0);
}
-#ifdef RTE_EXEC_ENV_BAREMETAL
-
-/* baremetal - don't test failing sanity checks */
-static int
-test_failing_mbuf_sanity_check(void)
-{
- return 0;
-}
-
-#else
-
#include <unistd.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/wait.h>
-/*
linuxapp -
use fork() to test mbuf errors panic */
+/* use fork() to test mbuf errors panic */
static int
verify_mbuf_check_panics(struct rte_mbuf *buf)
{
static int
verify_mbuf_check_panics(struct rte_mbuf *buf)
{
@@
-776,13
+765,12
@@
test_failing_mbuf_sanity_check(void)
return 0;
}
return 0;
}
-#endif
static int
test_mbuf(void)
{
static int
test_mbuf(void)
{
- RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) !=
64
);
+ RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) !=
RTE_CACHE_LINE_SIZE * 2
);
/* create pktmbuf pool if it does not exist */
if (pktmbuf_pool == NULL) {
/* create pktmbuf pool if it does not exist */
if (pktmbuf_pool == NULL) {