michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cleanup: include/: move misc/gcov.h to debug/gcov.h

Browse source 
move misc/gcov.h to debug/gcov.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2019-06-26 10:38:42 -04:00
commit fa1c60014b
3 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/debug/gcov.h Normal file
View file

@ -0,0 +1,19 @@
/*
* Copyright (c) 2018 Intel Corporation
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_DEBUG_GCOV_H_
#define ZEPHYR_INCLUDE_DEBUG_GCOV_H_
#ifdef CONFIG_COVERAGE_GCOV
void gcov_coverage_dump(void);
void gcov_static_init(void);
#else
void gcov_coverage_dump(void) { }
void gcov_static_init(void) { }
#endif /* CONFIG_COVERAGE */
#endif /* ZEPHYR_INCLUDE_DEBUG_GCOV_H_ */

16
include/misc/gcov.h
View file

@ -1,19 +1,15 @@
/* /*
* Copyright (c) 2018 Intel Corporation * Copyright (c) 2019 Intel Corporation
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef ZEPHYR_INCLUDE_MISC_GCOV_H_ #ifndef ZEPHYR_INCLUDE_MISC_GCOV_H_
#define ZEPHYR_INCLUDE_MISC_GCOV_H_ #define ZEPHYR_INCLUDE_MISC_GCOV_H_
#ifdef CONFIG_COVERAGE_GCOV #ifndef CONFIG_COMPAT_INCLUDES
void gcov_coverage_dump(void); #warning "This header file has moved, include <debug/gcov.h> instead."
void gcov_static_init(void); #endif
#else
void gcov_coverage_dump(void) { }
void gcov_static_init(void) { }
#endif /* CONFIG_COVERAGE */ #include <debug/gcov.h>
#endif /* ZEPHYR_INCLUDE_MISC_GCOV_H_ */ #endif /* ZEPHYR_INCLUDE_MISC_GCOV_H_ */

2
kernel/init.c
View file

@ -33,7 +33,7 @@
#include <logging/log_ctrl.h> #include <logging/log_ctrl.h>
#include <debug/tracing.h> #include <debug/tracing.h>
#include <stdbool.h> #include <stdbool.h>
#include <misc/gcov.h> #include <debug/gcov.h>
#define IDLE_THREAD_NAME "idle" #define IDLE_THREAD_NAME "idle"
#define LOG_LEVEL CONFIG_KERNEL_LOG_LEVEL #define LOG_LEVEL CONFIG_KERNEL_LOG_LEVEL