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
mbuf: remove rte_ctrlmbuf
[dpdk.git]
/
app
/
test
/
test_ivshmem.c
diff --git
a/app/test/test_ivshmem.c
b/app/test/test_ivshmem.c
index
227bba9
..
2996a86
100644
(file)
--- a/
app/test/test_ivshmem.c
+++ b/
app/test/test_ivshmem.c
@@
-43,8
+43,6
@@
#include "test.h"
#include "test.h"
-#ifdef RTE_LIBRTE_IVSHMEM
-
#include <rte_common.h>
#include <rte_ivshmem.h>
#include <rte_string_fns.h>
#include <rte_common.h>
#include <rte_ivshmem.h>
#include <rte_string_fns.h>
@@
-73,18
+71,19
@@
get_current_prefix(char * prefix, int size)
char buf[PATH_MAX] = {0};
/* get file for config (fd is always 3) */
char buf[PATH_MAX] = {0};
/* get file for config (fd is always 3) */
-
rte_
snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
+ snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
/* return NULL on error */
if (readlink(path, buf, sizeof(buf)) == -1)
return NULL;
/* get the basename */
/* return NULL on error */
if (readlink(path, buf, sizeof(buf)) == -1)
return NULL;
/* get the basename */
-
rte_
snprintf(buf, sizeof(buf), "%s", basename(buf));
+ snprintf(buf, sizeof(buf), "%s", basename(buf));
/* copy string all the way from second char up to start of _config */
/* copy string all the way from second char up to start of _config */
- rte_snprintf(prefix, size, "%.*s",
- strnlen(buf, sizeof(buf)) - sizeof("_config"), &buf[1]);
+ snprintf(prefix, size, "%.*s",
+ (int)(strnlen(buf, sizeof(buf)) - sizeof("_config")),
+ &buf[1]);
return prefix;
}
return prefix;
}
@@
-96,7
+95,7
@@
mmap_metadata(const char *name)
char pathname[PATH_MAX];
struct rte_ivshmem_metadata *metadata;
char pathname[PATH_MAX];
struct rte_ivshmem_metadata *metadata;
-
rte_
snprintf(pathname, sizeof(pathname),
+ snprintf(pathname, sizeof(pathname),
"/var/run/.dpdk_ivshmem_metadata_%s", name);
fd = open(pathname, O_RDWR, 0660);
"/var/run/.dpdk_ivshmem_metadata_%s", name);
fd = open(pathname, O_RDWR, 0660);
@@
-135,7
+134,7
@@
test_ivshmem_create_lots_of_memzones(void)
"Failed to create metadata");
for (i = 0; i < RTE_LIBRTE_IVSHMEM_MAX_ENTRIES; i++) {
"Failed to create metadata");
for (i = 0; i < RTE_LIBRTE_IVSHMEM_MAX_ENTRIES; i++) {
-
rte_
snprintf(name, sizeof(name), "mz_%i", i);
+ snprintf(name, sizeof(name), "mz_%i", i);
mz = rte_memzone_reserve(name, CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);
ASSERT(mz != NULL, "Failed to reserve memzone");
mz = rte_memzone_reserve(name, CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);
ASSERT(mz != NULL, "Failed to reserve memzone");
@@
-312,7
+311,7
@@
test_ivshmem_create_multiple_metadata_configs(void)
struct rte_ivshmem_metadata *metadata;
for (i = 0; i < RTE_LIBRTE_IVSHMEM_MAX_METADATA_FILES / 2; i++) {
struct rte_ivshmem_metadata *metadata;
for (i = 0; i < RTE_LIBRTE_IVSHMEM_MAX_METADATA_FILES / 2; i++) {
-
rte_
snprintf(name, sizeof(name), "test_%d", i);
+ snprintf(name, sizeof(name), "test_%d", i);
rte_ivshmem_metadata_create(name);
metadata = mmap_metadata(name);
rte_ivshmem_metadata_create(name);
metadata = mmap_metadata(name);
@@
-333,7
+332,7
@@
test_ivshmem_create_too_many_metadata_configs(void)
char name[IVSHMEM_NAME_LEN];
for (i = 0; i < RTE_LIBRTE_IVSHMEM_MAX_METADATA_FILES; i++) {
char name[IVSHMEM_NAME_LEN];
for (i = 0; i < RTE_LIBRTE_IVSHMEM_MAX_METADATA_FILES; i++) {
-
rte_
snprintf(name, sizeof(name), "test_%d", i);
+ snprintf(name, sizeof(name), "test_%d", i);
ASSERT(rte_ivshmem_metadata_create(name) == 0,
"Create config file failed");
}
ASSERT(rte_ivshmem_metadata_create(name) == 0,
"Create config file failed");
}
@@
-368,7
+367,7
@@
launch_all_tests_on_secondary_processes(void)
get_current_prefix(tmp, sizeof(tmp));
get_current_prefix(tmp, sizeof(tmp));
-
rte_
snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
const char *argv[] = { prgname, "-c", "1", "-n", "3",
"--proc-type=secondary", prefix };
const char *argv[] = { prgname, "-c", "1", "-n", "3",
"--proc-type=secondary", prefix };
@@
-430,12
+429,9
@@
test_ivshmem(void)
return -1;
}
return -1;
}
-#else /* RTE_LIBRTE_IVSHMEM */
-int
-test_ivshmem(void)
-{
- printf("This binary was not compiled with IVSHMEM support!\n");
- return 0;
-}
-#endif /* RTE_LIBRTE_IVSHMEM */
+static struct test_command ivshmem_cmd = {
+ .command = "ivshmem_autotest",
+ .callback = test_ivshmem,
+};
+REGISTER_TEST_COMMAND(ivshmem_cmd);