X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_ivshmem.c;h=4e6148841594aeaac33ab2978053b2ce2acca062;hb=8c9a33744bf790f106084fc4fdbc7ff27bebe677;hp=bafd48790d24a2b3deae93c60311a7941a1f3492;hpb=e8ed6c78177fbbafa326d9efc590a51705848200;p=dpdk.git

diff --git a/app/test/test_ivshmem.c b/app/test/test_ivshmem.c
index bafd48790d..4e61488415 100644
--- a/app/test/test_ivshmem.c
+++ b/app/test/test_ivshmem.c
@@ -43,8 +43,6 @@
 
 #include "test.h"
 
-#ifdef RTE_LIBRTE_IVSHMEM
-
 #include <rte_common.h>
 #include <rte_ivshmem.h>
 #include <rte_string_fns.h>
@@ -73,17 +71,17 @@ get_current_prefix(char * prefix, int size)
 	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 */
-	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 */
-	rte_snprintf(prefix, size, "%.*s",
+	snprintf(prefix, size, "%.*s",
 			(int)(strnlen(buf, sizeof(buf)) - sizeof("_config")),
 			&buf[1]);
 
@@ -97,7 +95,7 @@ mmap_metadata(const char *name)
 	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);
@@ -136,15 +134,15 @@ test_ivshmem_create_lots_of_memzones(void)
 			"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);
+		mz = rte_memzone_reserve(name, RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);
 		ASSERT(mz != NULL, "Failed to reserve memzone");
 
 		ASSERT(rte_ivshmem_metadata_add_memzone(mz, METADATA_NAME) == 0,
 				"Failed to add memzone");
 	}
-	mz = rte_memzone_reserve("one too many", CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);
+	mz = rte_memzone_reserve("one too many", RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);
 	ASSERT(mz != NULL, "Failed to reserve memzone");
 
 	ASSERT(rte_ivshmem_metadata_add_memzone(mz, METADATA_NAME) < 0,
@@ -161,7 +159,7 @@ test_ivshmem_create_duplicate_memzone(void)
 	ASSERT(rte_ivshmem_metadata_create(METADATA_NAME) == 0,
 			"Failed to create metadata");
 
-	mz = rte_memzone_reserve("mz", CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);
+	mz = rte_memzone_reserve("mz", RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY, 0);
 	ASSERT(mz != NULL, "Failed to reserve memzone");
 
 	ASSERT(rte_ivshmem_metadata_add_memzone(mz, METADATA_NAME) == 0,
@@ -313,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++) {
-		rte_snprintf(name, sizeof(name), "test_%d", i);
+		snprintf(name, sizeof(name), "test_%d", i);
 		rte_ivshmem_metadata_create(name);
 		metadata = mmap_metadata(name);
 
@@ -334,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++) {
-		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");
 	}
@@ -369,7 +367,7 @@ launch_all_tests_on_secondary_processes(void)
 
 	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 };
@@ -431,12 +429,9 @@ test_ivshmem(void)
 
 	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);