michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: net: zperf: Convert to new logging system

Browse source 
Use new logging system with support for network log level.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2018-09-04 13:05:23 +03:00
commit 22c8ccbca9
12 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/net/zperf/prj_bt.conf
View file

@ -18,7 +18,6 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y
CONFIG_INIT_STACKS=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_L2_BT=y
CONFIG_NET_SHELL=y

1
samples/net/zperf/prj_frdm_k64f.conf
View file

@ -20,7 +20,6 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y
CONFIG_INIT_STACKS=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_PRINTK=y
CONFIG_NET_L2_ETHERNET=y

5
samples/net/zperf/prj_netusb.conf
View file

@ -13,12 +13,11 @@ CONFIG_NET_BUF_TX_COUNT=50
CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=2
CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_MAX_CONTEXTS=8
CONFIG_NET_CONTEXT_SYNC_RECV=y
CONFIG_INIT_STACKS=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_PRINTK=y
CONFIG_NET_6LO_CONTEXT=y
@ -31,8 +30,6 @@ CONFIG_PRINTK=y
# USB Device Settings
CONFIG_USB=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_SYS_LOG_USB_DRIVER_LEVEL=3
CONFIG_SYS_LOG_USB_DEVICE_LEVEL=3
# Select USB Configurations
CONFIG_USB_DEVICE_NETWORK_ECM=y

1
samples/net/zperf/prj_qemu_x86.conf
View file

@ -20,7 +20,6 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y
CONFIG_INIT_STACKS=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_SHELL=y

1
samples/net/zperf/prj_quark_se_c1000_devboard.conf
View file

@ -17,7 +17,6 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y
CONFIG_INIT_STACKS=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SYS_LOG_SHOW_COLOR=y
CONFIG_PRINTK=y
CONFIG_NET_L2_IEEE802154=y

3
samples/net/zperf/src/shell_utils.c
View file

@ -4,6 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_MODULE_NAME net_zperf_shell_utils
#define NET_LOG_LEVEL LOG_LEVEL_DBG
#include <ctype.h>
#include <misc/printk.h>
#include <stdio.h>

3
samples/net/zperf/src/zperf_session.c
View file

@ -4,6 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_MODULE_NAME net_zperf_session
#define NET_LOG_LEVEL LOG_LEVEL_DBG
#include <zephyr.h>
#include <net/net_pkt.h>

3
samples/net/zperf/src/zperf_shell.c
View file

@ -4,7 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define SYS_LOG_DOMAIN "net/zperf"
#define LOG_MODULE_NAME net_zperf_shell
#define NET_LOG_LEVEL LOG_LEVEL_DBG
#include <ctype.h>
#include <stdio.h>

3
samples/net/zperf/src/zperf_tcp_receiver.c
View file

@ -4,6 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_MODULE_NAME net_zperf_tcp_recv
#define NET_LOG_LEVEL LOG_LEVEL_DBG
#include <zephyr.h>
#include <linker/sections.h>

3
samples/net/zperf/src/zperf_tcp_uploader.c
View file

@ -4,6 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_MODULE_NAME net_zperf_tcp_send
#define NET_LOG_LEVEL LOG_LEVEL_DBG
#include <zephyr.h>
#include <errno.h>

3
samples/net/zperf/src/zperf_udp_receiver.c
View file

@ -4,6 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_MODULE_NAME net_zperf_udp_recv
#define NET_LOG_LEVEL LOG_LEVEL_DBG
#include <linker/sections.h>
#include <toolchain.h>

3
samples/net/zperf/src/zperf_udp_uploader.c
View file

@ -4,6 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define LOG_MODULE_NAME net_zperf_udp_send
#define NET_LOG_LEVEL LOG_LEVEL_DBG
#include <zephyr.h>
#include <misc/printk.h>