logging: move event_logger to subsys/logging

nashif · nashif · commit fad7e2dd8d36 · 2016-12-25T14:34:43.000-05:00
Jira: ZEP-1337
Change-Id: If1690e19a882cf53caaa3418ccabeb49c783f63d
Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/arch/nios2/core/irq_manage.c b/arch/nios2/core/irq_manage.c
@@ -27,7 +27,7 @@
 #include <irq.h>
 #include <misc/printk.h>
 #include <sw_isr_table.h>
-#include <misc/kernel_event_logger.h>
+#include <logging/kernel_event_logger.h>
 
 void _irq_spurious(void *unused)
 {
diff --git a/arch/x86/core/cpuhalt.c b/arch/x86/core/cpuhalt.c
@@ -34,7 +34,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/kernel_event_logger.h>
+#include <logging/kernel_event_logger.h>
 #include <arch/cpu.h>
 
 #ifdef CONFIG_BOOT_TIME_MEASUREMENT
diff --git a/doc/subsystems/logging/kernel_event_logger.rst b/doc/subsystems/logging/kernel_event_logger.rst
@@ -179,7 +179,7 @@ Adding a Custom Event Type
 
 A custom event type must use an integer type ID that does not duplicate
 an existing type ID. The type IDs for the pre-defined events can be found
-in :file:`include/misc/kernel_event_logger.h`. If dynamic recording of
+in :file:`include/logging/kernel_event_logger.h`. If dynamic recording of
 events is enabled, the event type ID must not exceed 32.
 
 Custom events can be written to the kernel event logger using the following
diff --git a/include/logging/event_logger.h b/include/logging/event_logger.h
diff --git a/include/logging/kernel_event_logger.h b/include/logging/kernel_event_logger.h
@@ -19,7 +19,7 @@
  * @brief Kernel event logger support.
  */
 
-#include <misc/event_logger.h>
+#include <logging/event_logger.h>
 
 #ifndef __KERNEL_EVENT_LOGGER_H__
 #define __KERNEL_EVENT_LOGGER_H__
diff --git a/kernel/Makefile b/kernel/Makefile
@@ -37,6 +37,4 @@ lib-y += $(strip \
 lib-$(CONFIG_INT_LATENCY_BENCHMARK) += int_latency_bench.o
 lib-$(CONFIG_STACK_CANARIES) += compiler_stack_protect.o
 lib-$(CONFIG_SYS_CLOCK_EXISTS) += timer.o legacy_timer.o
-lib-$(CONFIG_KERNEL_EVENT_LOGGER) += event_logger.o
-lib-$(CONFIG_KERNEL_EVENT_LOGGER) += kernel_event_logger.o
 lib-$(CONFIG_ATOMIC_OPERATIONS_C) += atomic_c.o
diff --git a/samples/legacy/kernel_event_logger/microkernel/src/kernel_event_collector_sample.c b/samples/legacy/kernel_event_logger/microkernel/src/kernel_event_collector_sample.c
@@ -19,7 +19,7 @@
 #include <zephyr.h>
 
 #include "phil.h"
-#include <misc/kernel_event_logger.h>
+#include <logging/kernel_event_logger.h>
 #include <string.h>
 
 #ifdef NANO_APIS_ONLY
diff --git a/samples/legacy/task_profiler/profiler/src/profiler.c b/samples/legacy/task_profiler/profiler/src/profiler.c
@@ -17,7 +17,7 @@
  */
 
 #include <zephyr.h>
-#include <misc/kernel_event_logger.h>
+#include <logging/kernel_event_logger.h>
 #include <uart.h>
 
 #define PROF_LOG_HEADER "*** [PROF] "
diff --git a/subsys/logging/Makefile b/subsys/logging/Makefile
@@ -1,2 +1,3 @@
 
 obj-y += sys_log.o
+obj-$(CONFIG_KERNEL_EVENT_LOGGER) += event_logger.o kernel_event_logger.o
diff --git a/subsys/logging/event_logger.c b/subsys/logging/event_logger.c
@@ -19,7 +19,7 @@
  * @brief Event logger support.
  */
 
-#include <misc/event_logger.h>
+#include <logging/event_logger.h>
 #include <misc/ring_buffer.h>
 
 void sys_event_logger_init(struct event_logger *logger,
diff --git a/subsys/logging/kernel_event_logger.c b/subsys/logging/kernel_event_logger.c
@@ -20,7 +20,7 @@
  */
 
 
-#include <misc/kernel_event_logger.h>
+#include <logging/kernel_event_logger.h>
 #include <misc/util.h>
 #include <init.h>
 #include <kernel_structs.h>
diff --git a/tests/power/power_states/src/soc_watch_logger.h b/tests/power/power_states/src/soc_watch_logger.h
@@ -17,7 +17,7 @@
 #include <zephyr.h>
 #include <misc/printk.h>
 #include <string.h>
-#include <misc/kernel_event_logger.h>
+#include <logging/kernel_event_logger.h>
 #include "soc_watch.h"
 
 #if defined(CONFIG_STDOUT_CONSOLE)

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#include <irq.h>`
`28`	`28`	`#include <misc/printk.h>`
`29`	`29`	`#include <sw_isr_table.h>`
`30`		`-#include <misc/kernel_event_logger.h>`
	`30`	`+#include <logging/kernel_event_logger.h>`
`31`	`31`
`32`	`32`	`void _irq_spurious(void *unused)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`
`2`	`2`	`obj-y += sys_log.o`
	`3`	`+obj-$(CONFIG_KERNEL_EVENT_LOGGER) += event_logger.o kernel_event_logger.o`