X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Ftest_metrics.c;h=e736019ae4e7cad0174161c29a61fcc8eba5bb5d;hb=25d5c40f252fb77ed78a7baa5d6e54912ad83941;hp=3c2f36b8a44a5f97251ba32338de9a03954a4fca;hpb=a9de470cc7c0649221e156fc5f30a2dbdfe7c166;p=dpdk.git

diff --git a/app/test/test_metrics.c b/app/test/test_metrics.c
index 3c2f36b8a4..e736019ae4 100644
--- a/app/test/test_metrics.c
+++ b/app/test/test_metrics.c
@@ -12,7 +12,6 @@
 
 #include "test.h"
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #define	REG_METRIC_COUNT	6
 #define	METRIC_LESSER_COUNT	3
 #define	KEY	1
@@ -28,6 +27,19 @@ test_metrics_init(void)
 	return TEST_SUCCESS;
 }
 
+/* Deinitialize metric module. This function must be called
+ * from a primary process after metrics usage is over
+ */
+static int
+test_metrics_deinitialize(void)
+{
+	int err = 0;
+	err = rte_metrics_deinit();
+	TEST_ASSERT(err == 0, "%s, %d", __func__, __LINE__);
+
+	return TEST_SUCCESS;
+}
+
  /* Test Case to check failures when memzone init is not done */
 static int
 test_metrics_without_init(void)
@@ -93,7 +105,7 @@ test_metrics_reg_names(void)
 		};
 
 	/* Success Test: valid array and count size */
-	err = rte_metrics_reg_names(&mnames[0], ARRAY_SIZE(mnames));
+	err = rte_metrics_reg_names(&mnames[0], RTE_DIM(mnames));
 	TEST_ASSERT(err >= 0, "%s, %d", __func__, __LINE__);
 
 	return TEST_SUCCESS;
@@ -154,20 +166,20 @@ test_metrics_update_values(void)
 
 	/* Failed Test: Invalid count size */
 	err = rte_metrics_update_values(RTE_METRICS_GLOBAL,
-			 KEY, &value[0], ARRAY_SIZE(value));
+			 KEY, &value[0], RTE_DIM(value));
 	TEST_ASSERT(err < 0, "%s, %d", __func__, __LINE__);
 
 	/* Failed Test: Invalid port_id(lower value) and valid data */
-	err = rte_metrics_update_values(-2, KEY, &value[0], ARRAY_SIZE(value));
+	err = rte_metrics_update_values(-2, KEY, &value[0], RTE_DIM(value));
 	TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
 
 	/* Failed Test: Invalid port_id(higher value) and valid data */
-	err = rte_metrics_update_values(39, 1, &value[0], ARRAY_SIZE(value));
+	err = rte_metrics_update_values(39, 1, &value[0], RTE_DIM(value));
 	TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
 
 	/* Failed Test: Invalid array */
 	err = rte_metrics_update_values(RTE_METRICS_GLOBAL,
-			 KEY, NULL, ARRAY_SIZE(value));
+			 KEY, NULL, RTE_DIM(value));
 	TEST_ASSERT(err == -EINVAL, "%s, %d", __func__, __LINE__);
 
 	return TEST_SUCCESS;
@@ -300,6 +312,10 @@ static struct unit_test_suite metrics_testsuite  = {
 		 * arraylist, count size
 		 */
 		TEST_CASE(test_metrics_get_values),
+
+		/* TEST CASE 8: Test to unregister metrics*/
+		TEST_CASE(test_metrics_deinitialize),
+
 		TEST_CASES_END()
 	}
 };