[rtems-examples commit] tracing: Add a special ticker variant to show tracing.
Joel Sherrill
joel at rtems.org
Thu Feb 24 23:04:34 UTC 2022
Module: rtems-examples
Branch: master
Commit: 3c7094087ed544beff2535a5190deb5bcdc9326e
Changeset: http://git.rtems.org/rtems-examples/commit/?id=3c7094087ed544beff2535a5190deb5bcdc9326e
Author: Joel Sherrill <joel at rtems.org>
Date: Tue Feb 22 14:08:25 2022 -0600
tracing: Add a special ticker variant to show tracing.
This was complicating both_hello which was designed for another
purpose entirely.
---
hello/both_hello/wscript | 22 ++---
ticker/ticker_trace/Makefile | 23 +++++
ticker/ticker_trace/init.c | 99 ++++++++++++++++++++++
.../ticker_trace/ticker-deep.ini | 3 +-
.../hello.ini => ticker/ticker_trace/ticker.ini | 4 +-
ticker/ticker_trace/wscript | 26 ++++++
ticker/wscript | 1 +
7 files changed, 162 insertions(+), 16 deletions(-)
diff --git a/hello/both_hello/wscript b/hello/both_hello/wscript
index 2cb1d76..5e784b4 100644
--- a/hello/both_hello/wscript
+++ b/hello/both_hello/wscript
@@ -10,17 +10,17 @@ import rtems_waf.rtems as rtems
def build(bld):
rtems.build(bld)
- if rtems.check_env(bld, 'RTEMS_TLD'):
- bld(features = 'c rtrace',
- target = 'both_hello.texe',
- source = ['test.c'],
- rtrace_cfg = '../../hello/both_hello/hello.ini',
- rtrace_wrapper = 'hello-test')
- bld(features = 'c rtrace',
- target = 'hello-deep.texe',
- source = ['test.c'],
- rtrace_cfg = '../../hello/both_hello/hello-deep.ini',
- rtrace_wrapper = 'hello-deep')
+# if rtems.check_env(bld, 'RTEMS_TLD'):
+# bld(features = 'c rtrace',
+# target = 'both_hello.texe',
+# source = ['test.c'],
+# rtrace_cfg = '../../hello/both_hello/hello.ini',
+# rtrace_wrapper = 'hello-test')
+# bld(features = 'c rtrace',
+# target = 'hello-deep.texe',
+# source = ['test.c'],
+# rtrace_cfg = '../../hello/both_hello/hello-deep.ini',
+# rtrace_wrapper = 'hello-deep')
bld(features = 'c cprogram',
target = 'both_hello.exe',
diff --git a/ticker/ticker_trace/Makefile b/ticker/ticker_trace/Makefile
new file mode 100644
index 0000000..4347705
--- /dev/null
+++ b/ticker/ticker_trace/Makefile
@@ -0,0 +1,23 @@
+#
+# RTEMS_MAKEFILE_PATH is typically set in an environment variable
+#
+
+PGM=${ARCH}/ticker.exe
+
+# optional managers required
+MANAGERS=all
+
+# C source names
+CSRCS = init.c
+COBJS = $(CSRCS:%.c=${ARCH}/%.o)
+
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+include $(RTEMS_CUSTOM)
+include $(PROJECT_ROOT)/make/leaf.cfg
+
+OBJS= $(COBJS) $(CXXOBJS) $(ASOBJS)
+
+all: ${ARCH} $(PGM)
+
+$(PGM): $(OBJS)
+ $(make-exe)
diff --git a/ticker/ticker_trace/init.c b/ticker/ticker_trace/init.c
new file mode 100644
index 0000000..4d86cf6
--- /dev/null
+++ b/ticker/ticker_trace/init.c
@@ -0,0 +1,99 @@
+/*
+ * COPYRIGHT (c) 1989-2007.
+ * On-Line Applications Research Corporation (OAR).
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <bsp.h>
+
+#include "../../testmacros.h"
+
+rtems_id Task_id[ 4 ]; /* array of task ids */
+rtems_name Task_name[ 4 ]; /* array of task names */
+
+rtems_task Test_task(
+ rtems_task_argument task_index
+)
+{
+ rtems_time_of_day time;
+ rtems_interval ticks;
+
+ ticks = task_index * 5 * rtems_clock_get_ticks_per_second();
+
+ for ( ; ; ) {
+ (void) rtems_clock_get_tod( &time );
+ if ( time.second >= 35 ) {
+ puts( "*** END OF CLOCK TICK TEST ***" );
+ exit( 0 );
+ }
+ put_name( Task_name[ task_index ], FALSE );
+ print_time( " - rtems_clock_get_tod - ", &time, "\n" );
+ (void) rtems_task_wake_after( ticks );
+ }
+}
+
+rtems_task Init(
+ rtems_task_argument argument
+)
+{
+ rtems_time_of_day time;
+
+ puts( "\n\n*** CLOCK TICK TEST ***" );
+
+ time.year = 1988;
+ time.month = 12;
+ time.day = 31;
+ time.hour = 9;
+ time.minute = 0;
+ time.second = 0;
+ time.ticks = 0;
+
+ (void) rtems_clock_set( &time );
+
+ Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
+ Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
+ Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' );
+
+ (void) rtems_task_create(
+ Task_name[ 1 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
+ RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 1 ]
+ );
+ (void) rtems_task_create(
+ Task_name[ 2 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
+ RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 2 ]
+ );
+ (void) rtems_task_create(
+ Task_name[ 3 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES,
+ RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 3 ]
+ );
+
+ (void) rtems_task_start( Task_id[ 1 ], Test_task, 1 );
+ (void) rtems_task_start( Task_id[ 2 ], Test_task, 2 );
+ (void) rtems_task_start( Task_id[ 3 ], Test_task, 3 );
+
+ (void) rtems_task_delete( RTEMS_SELF );
+}
+
+/**************** START OF CONFIGURATION INFORMATION ****************/
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_MAXIMUM_TASKS 4
+
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_INIT_TASK_STACK_SIZE (2 * RTEMS_MINIMUM_STACK_SIZE)
+
+#define CONFIGURE_EXTRA_TASK_STACKS (4 * RTEMS_MINIMUM_STACK_SIZE)
+
+#define CONFIGURE_INIT
+#include <rtems/confdefs.h>
+
+/**************** END OF CONFIGURATION INFORMATION ****************/
+
diff --git a/hello/both_hello/hello-deep.ini b/ticker/ticker_trace/ticker-deep.ini
similarity index 94%
rename from hello/both_hello/hello-deep.ini
rename to ticker/ticker_trace/ticker-deep.ini
index 84466fc..863d671 100644
--- a/hello/both_hello/hello-deep.ini
+++ b/ticker/ticker_trace/ticker-deep.ini
@@ -38,10 +38,9 @@ include = rtems.ini, rtld-base.ini
[hello-deep-trace]
generator = printk-generator
signatures = hello-signatures
-trace = exit, Init, POSIX_Init
+trace = exit, Init
header = "#include <rtems.h>"
[hello-signatures]
exit=void, int
Init = void, rtems_task_argument
-POSIX_Init = void*, void*
diff --git a/hello/both_hello/hello.ini b/ticker/ticker_trace/ticker.ini
similarity index 73%
rename from hello/both_hello/hello.ini
rename to ticker/ticker_trace/ticker.ini
index 7056414..ca738b0 100644
--- a/hello/both_hello/hello.ini
+++ b/ticker/ticker_trace/ticker.ini
@@ -33,7 +33,7 @@ include = rtems.ini, rtld-base.ini
[hello-trace]
generator = printk-generator
signatures = hello-signatures
-trace = exit, Init, POSIX_Init, _Thread_Initialize
+trace = exit, Init
header = "#include <rtems.h>"
header = "#include <rtems/score/objectimpl.h>"
header = "#include <rtems/score/scheduler.h>"
@@ -41,5 +41,3 @@ header = "#include <rtems/score/scheduler.h>"
[hello-signatures]
exit=void, int
Init = void, rtems_task_argument
-POSIX_Init = void*, void*
-_Thread_Initialize = bool, Objects_Information*, Thread_Control*, const Scheduler_Control*, void*, size_t, bool, Priority_Control, bool, Thread_CPU_budget_algorithms, Thread_CPU_budget_algorithm_callout, uint32_t, Objects_Name
diff --git a/ticker/ticker_trace/wscript b/ticker/ticker_trace/wscript
new file mode 100644
index 0000000..9b5e5d0
--- /dev/null
+++ b/ticker/ticker_trace/wscript
@@ -0,0 +1,26 @@
+# Copyright 2022 Joel Sherrill (joel at rtems.org)
+#
+# This file's license is 2-clause BSD as in this distribution's LICENSE.2 file.
+#
+
+# Waf build script for an RTEMS Hello
+import rtems_waf.rtems as rtems
+
+def build(bld):
+ rtems.build(bld)
+
+ bld(features = 'c cprogram',
+ target = 'ticker_trace.exe',
+ source = ['init.c'])
+
+ if rtems.check_env(bld, 'RTEMS_TLD'):
+ bld(features = 'c rtrace',
+ target = 'ticker_trace.texe',
+ source = ['init.c'],
+ rtrace_cfg = '../../ticker/ticker_trace/ticker.ini',
+ rtrace_wrapper = 'ticker-test')
+ bld(features = 'c rtrace',
+ target = 'ticker_trace-deep.texe',
+ source = ['init.c'],
+ rtrace_cfg = '../../ticker/ticker_trace/ticker-deep.ini',
+ rtrace_wrapper = 'ticker-deep')
diff --git a/ticker/wscript b/ticker/wscript
index df7a45e..178a68d 100644
--- a/ticker/wscript
+++ b/ticker/wscript
@@ -8,6 +8,7 @@ import rtems_waf.rtems as rtems
def build(bld):
bld.recurse(['ticker',
'ticker_stackchk',
+ 'ticker_trace',
'low_ticker',
'low_ticker1',
'low_ticker2'])
More information about the vc
mailing list