X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_logs.c;h=425ae03cb98ca87459e3c492953de209a52e95a0;hb=8482ffe4b68bc0a6f14d46e65158d3c779f7e0f9;hp=d0a9962369057141e2051de305120cfdd54e1256;hpb=a3f34a98b7217f4ff2a8636096984f566a4e7cab;p=dpdk.git

diff --git a/app/test/test_logs.c b/app/test/test_logs.c
index d0a9962369..425ae03cb9 100644
--- a/app/test/test_logs.c
+++ b/app/test/test_logs.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdio.h>
@@ -38,7 +9,6 @@
 
 #include <rte_log.h>
 #include <rte_memory.h>
-#include <rte_memzone.h>
 #include <rte_launch.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
@@ -46,6 +16,7 @@
 
 #include "test.h"
 
+/* for legacy log test */
 #define RTE_LOGTYPE_TESTAPP1 RTE_LOGTYPE_USER1
 #define RTE_LOGTYPE_TESTAPP2 RTE_LOGTYPE_USER2
 
@@ -57,37 +28,82 @@
  * - Set log level.
  * - Send logs with different types and levels, some should not be displayed.
  */
-
 static int
-test_logs(void)
+test_legacy_logs(void)
 {
-	/* enable these logs type */
-	rte_set_log_type(RTE_LOGTYPE_TESTAPP1, 1);
-	rte_set_log_type(RTE_LOGTYPE_TESTAPP2, 1);
+	printf("== static log types\n");
+
+	/* set logtype level low to so we can test global level */
+	rte_log_set_level(RTE_LOGTYPE_TESTAPP1, RTE_LOG_DEBUG);
+	rte_log_set_level(RTE_LOGTYPE_TESTAPP2, RTE_LOG_DEBUG);
 
 	/* log in error level */
-	rte_set_log_level(RTE_LOG_ERR);
+	rte_log_set_global_level(RTE_LOG_ERR);
 	RTE_LOG(ERR, TESTAPP1, "error message\n");
 	RTE_LOG(CRIT, TESTAPP1, "critical message\n");
 
 	/* log in critical level */
-	rte_set_log_level(RTE_LOG_CRIT);
+	rte_log_set_global_level(RTE_LOG_CRIT);
 	RTE_LOG(ERR, TESTAPP2, "error message (not displayed)\n");
 	RTE_LOG(CRIT, TESTAPP2, "critical message\n");
 
-	/* disable one log type */
-	rte_set_log_type(RTE_LOGTYPE_TESTAPP2, 0);
+	/* bump up single log type level above global to test it */
+	rte_log_set_level(RTE_LOGTYPE_TESTAPP2, RTE_LOG_EMERG);
 
 	/* log in error level */
-	rte_set_log_level(RTE_LOG_ERR);
+	rte_log_set_global_level(RTE_LOG_ERR);
 	RTE_LOG(ERR, TESTAPP1, "error message\n");
 	RTE_LOG(ERR, TESTAPP2, "error message (not displayed)\n");
 
 	return 0;
 }
 
-static struct test_command logs_cmd = {
-	.command = "logs_autotest",
-	.callback = test_logs,
-};
-REGISTER_TEST_COMMAND(logs_cmd);
+static int
+test_logs(void)
+{
+	int logtype1, logtype2;
+	int ret;
+
+	printf("== dynamic log types\n");
+
+	logtype1 = rte_log_register("logtype1");
+	if (logtype1 < 0) {
+		printf("Cannot register logtype1\n");
+		return -1;
+	}
+	logtype2 = rte_log_register("logtype2");
+	if (logtype2 < 0) {
+		printf("Cannot register logtype2\n");
+		return -1;
+	}
+
+	/* set logtype level low to so we can test global level */
+	rte_log_set_level(logtype1, RTE_LOG_DEBUG);
+	rte_log_set_level(logtype2, RTE_LOG_DEBUG);
+
+	/* log in error level */
+	rte_log_set_global_level(RTE_LOG_ERR);
+	rte_log(RTE_LOG_ERR, logtype1, "error message\n");
+	rte_log(RTE_LOG_CRIT, logtype1, "critical message\n");
+
+	/* log in critical level */
+	rte_log_set_global_level(RTE_LOG_CRIT);
+	rte_log(RTE_LOG_ERR, logtype2, "error message (not displayed)\n");
+	rte_log(RTE_LOG_CRIT, logtype2, "critical message\n");
+
+	/* bump up single log type level above global to test it */
+	rte_log_set_level(logtype2, RTE_LOG_EMERG);
+
+	/* log in error level */
+	rte_log_set_global_level(RTE_LOG_ERR);
+	rte_log(RTE_LOG_ERR, logtype1, "error message\n");
+	rte_log(RTE_LOG_ERR, logtype2, "error message (not displayed)\n");
+
+	ret = test_legacy_logs();
+	if (ret < 0)
+		return ret;
+
+	return 0;
+}
+
+REGISTER_TEST_COMMAND(logs_autotest, test_logs);