X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_efd.c;h=a779a71f2d5b790c5c62afc713352c4df88e4e5a;hb=8482ffe4b68bc0a6f14d46e65158d3c779f7e0f9;hp=ced091aab63d41d8352a834865bec51d98f4970d;hpb=a9de470cc7c0649221e156fc5f30a2dbdfe7c166;p=dpdk.git

diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index ced091aab6..a779a71f2d 100644
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -31,72 +31,70 @@ struct flow_key {
 	uint16_t port_dst;
 	uint8_t proto;
 } __attribute__((packed));
+
+int efd_logtype_test;
+
+RTE_INIT(test_efd_init_log)
+{
+	efd_logtype_test = rte_log_register("test.efd");
+}
+
 /*
  * Print out result of unit test efd operation.
  */
-#if defined(UNIT_TEST_EFD_VERBOSE)
-
 static void print_key_info(const char *msg, const struct flow_key *key,
 		efd_value_t val)
 {
 	const uint8_t *p = (const uint8_t *) key;
 	unsigned int i;
 
-	printf("%s key:0x", msg);
+	rte_log(RTE_LOG_DEBUG, efd_logtype_test, "%s key:0x", msg);
 	for (i = 0; i < sizeof(struct flow_key); i++)
-		printf("%02X", p[i]);
+		rte_log(RTE_LOG_DEBUG, efd_logtype_test, "%02X", p[i]);
 
-	printf(" @ val %d\n", val);
+	rte_log(RTE_LOG_DEBUG, efd_logtype_test, " @ val %d\n", val);
 }
-#else
-
-static void print_key_info(__attribute__((unused)) const char *msg,
-		__attribute__((unused)) const struct flow_key *key,
-		__attribute__((unused)) efd_value_t val)
-{
-}
-#endif
 
 /* Keys used by unit test functions */
 static struct flow_key keys[5] = {
 	{
-		.ip_src = IPv4(0x03, 0x02, 0x01, 0x00),
-		.ip_dst = IPv4(0x07, 0x06, 0x05, 0x04),
+		.ip_src = RTE_IPV4(0x03, 0x02, 0x01, 0x00),
+		.ip_dst = RTE_IPV4(0x07, 0x06, 0x05, 0x04),
 		.port_src = 0x0908,
 		.port_dst = 0x0b0a,
 		.proto = 0x0c,
 	},
 	{
-		.ip_src = IPv4(0x13, 0x12, 0x11, 0x10),
-		.ip_dst = IPv4(0x17, 0x16, 0x15, 0x14),
+		.ip_src = RTE_IPV4(0x13, 0x12, 0x11, 0x10),
+		.ip_dst = RTE_IPV4(0x17, 0x16, 0x15, 0x14),
 		.port_src = 0x1918,
 		.port_dst = 0x1b1a,
 		.proto = 0x1c,
 	},
 	{
-		.ip_src = IPv4(0x23, 0x22, 0x21, 0x20),
-		.ip_dst = IPv4(0x27, 0x26, 0x25, 0x24),
+		.ip_src = RTE_IPV4(0x23, 0x22, 0x21, 0x20),
+		.ip_dst = RTE_IPV4(0x27, 0x26, 0x25, 0x24),
 		.port_src = 0x2928,
 		.port_dst = 0x2b2a,
 		.proto = 0x2c,
 	},
 	{
-		.ip_src = IPv4(0x33, 0x32, 0x31, 0x30),
-		.ip_dst = IPv4(0x37, 0x36, 0x35, 0x34),
+		.ip_src = RTE_IPV4(0x33, 0x32, 0x31, 0x30),
+		.ip_dst = RTE_IPV4(0x37, 0x36, 0x35, 0x34),
 		.port_src = 0x3938,
 		.port_dst = 0x3b3a,
 		.proto = 0x3c,
 	},
 	{
-		.ip_src = IPv4(0x43, 0x42, 0x41, 0x40),
-		.ip_dst = IPv4(0x47, 0x46, 0x45, 0x44),
+		.ip_src = RTE_IPV4(0x43, 0x42, 0x41, 0x40),
+		.ip_dst = RTE_IPV4(0x47, 0x46, 0x45, 0x44),
 		.port_src = 0x4948,
 		.port_dst = 0x4b4a,
 		.proto = 0x4c,
 	}
 };
 /* Array to store the data */
-efd_value_t data[5];
+static efd_value_t data[5];
 
 static inline uint8_t efd_get_all_sockets_bitmask(void)
 {