forked from Imagelibrary/rtems
sapi: New implementation of rtems_panic()
The previous rtems_panic() implementation was quite heavy weight. It depended on _exit() which calls the global destructors. It used fprintf(stderr, ...) for output which depends on an initialized console device and the complex fprintf(). Introduce a new fatal source RTEMS_FATAL_SOURCE_PANIC for rtems_panic() and output via vprintk(). Update #3244.
This commit is contained in:
@@ -48,7 +48,7 @@
|
|||||||
#define _RTEMS_RTEMS_ERROR_H
|
#define _RTEMS_RTEMS_ERROR_H
|
||||||
|
|
||||||
#include <rtems/rtems/status.h>
|
#include <rtems/rtems/status.h>
|
||||||
#include <rtems/score/interr.h>
|
#include <rtems/fatal.h>
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
@@ -124,14 +124,6 @@ int rtems_verror(
|
|||||||
va_list arglist
|
va_list arglist
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
|
||||||
* rtems_panic is shorthand for rtems_error(RTEMS_ERROR_PANIC, ...)
|
|
||||||
*/
|
|
||||||
void rtems_panic(
|
|
||||||
const char *printf_format,
|
|
||||||
...
|
|
||||||
) RTEMS_NO_RETURN;
|
|
||||||
|
|
||||||
extern int rtems_panic_in_progress;
|
extern int rtems_panic_in_progress;
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
@@ -98,18 +98,3 @@ int rtems_error(
|
|||||||
|
|
||||||
return chars_written;
|
return chars_written;
|
||||||
}
|
}
|
||||||
|
|
||||||
void rtems_panic(
|
|
||||||
const char *printf_format,
|
|
||||||
...
|
|
||||||
)
|
|
||||||
{
|
|
||||||
va_list arglist;
|
|
||||||
|
|
||||||
va_start(arglist, printf_format);
|
|
||||||
(void) rtems_verror(RTEMS_ERROR_PANIC, printf_format, arglist);
|
|
||||||
va_end(arglist);
|
|
||||||
|
|
||||||
rtems_error(0, "fatal error, exiting");
|
|
||||||
_exit(errno);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ libsapi_a_SOURCES += src/delaynano.c
|
|||||||
libsapi_a_SOURCES += src/rbtree.c
|
libsapi_a_SOURCES += src/rbtree.c
|
||||||
libsapi_a_SOURCES += src/rbtreefind.c
|
libsapi_a_SOURCES += src/rbtreefind.c
|
||||||
libsapi_a_SOURCES += src/rbtreeinsert.c
|
libsapi_a_SOURCES += src/rbtreeinsert.c
|
||||||
|
libsapi_a_SOURCES += src/panic.c
|
||||||
libsapi_a_SOURCES += src/profilingiterate.c
|
libsapi_a_SOURCES += src/profilingiterate.c
|
||||||
libsapi_a_SOURCES += src/profilingreportxml.c
|
libsapi_a_SOURCES += src/profilingreportxml.c
|
||||||
libsapi_a_SOURCES += src/tcsimpleinstall.c
|
libsapi_a_SOURCES += src/tcsimpleinstall.c
|
||||||
|
|||||||
@@ -88,6 +88,18 @@ RTEMS_NO_RETURN RTEMS_INLINE_ROUTINE void rtems_fatal(
|
|||||||
_Terminate( fatal_source, error_code );
|
_Terminate( fatal_source, error_code );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Prints the specified message via printk() and terminates the system.
|
||||||
|
*
|
||||||
|
* @param[in] fmt The message format.
|
||||||
|
* @param[in] ... The message parameters.
|
||||||
|
*
|
||||||
|
* @see _Terminate().
|
||||||
|
*/
|
||||||
|
RTEMS_NO_RETURN void rtems_panic(
|
||||||
|
const char *fmt, ...
|
||||||
|
) RTEMS_PRINTFLIKE( 1, 2 );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Returns a text for a fatal source.
|
* @brief Returns a text for a fatal source.
|
||||||
*
|
*
|
||||||
|
|||||||
32
cpukit/sapi/src/panic.c
Normal file
32
cpukit/sapi/src/panic.c
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2017 embedded brains GmbH. All rights reserved.
|
||||||
|
*
|
||||||
|
* embedded brains GmbH
|
||||||
|
* Dornierstr. 4
|
||||||
|
* 82178 Puchheim
|
||||||
|
* Germany
|
||||||
|
* <rtems@embedded-brains.de>
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <rtems/fatal.h>
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
void rtems_panic( const char *fmt, ... )
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start( ap, fmt );
|
||||||
|
vprintk( fmt, ap );
|
||||||
|
va_end( ap);
|
||||||
|
|
||||||
|
_Terminate( RTEMS_FATAL_SOURCE_PANIC, (Internal_errors_t) fmt );
|
||||||
|
}
|
||||||
@@ -123,6 +123,13 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
RTEMS_FATAL_SOURCE_SMP = 10,
|
RTEMS_FATAL_SOURCE_SMP = 10,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Fatal source of rtems_panic().
|
||||||
|
*
|
||||||
|
* @see rtem
|
||||||
|
*/
|
||||||
|
RTEMS_FATAL_SOURCE_PANIC = 11,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The last available fatal source.
|
* @brief The last available fatal source.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -16,8 +16,7 @@
|
|||||||
|
|
||||||
const char rtems_test_name[] = "SPERROR 3";
|
const char rtems_test_name[] = "SPERROR 3";
|
||||||
|
|
||||||
/* forward declarations to avoid warnings */
|
static const char fmt[] = "Dummy panic\n";
|
||||||
rtems_task Init(rtems_task_argument argument);
|
|
||||||
|
|
||||||
static void fatal_extension(
|
static void fatal_extension(
|
||||||
rtems_fatal_source source,
|
rtems_fatal_source source,
|
||||||
@@ -26,24 +25,20 @@ static void fatal_extension(
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
source == RTEMS_FATAL_SOURCE_EXIT
|
source == RTEMS_FATAL_SOURCE_PANIC
|
||||||
&& !always_set_to_false
|
&& !always_set_to_false
|
||||||
&& error == 0
|
&& error == (rtems_fatal_code) fmt
|
||||||
) {
|
) {
|
||||||
TEST_END();
|
TEST_END();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rtems_task Init(
|
static rtems_task Init(
|
||||||
rtems_task_argument argument
|
rtems_task_argument argument
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
TEST_BEGIN();
|
TEST_BEGIN();
|
||||||
|
rtems_panic( fmt );
|
||||||
rtems_panic(
|
|
||||||
"Dummy panic\n"
|
|
||||||
);
|
|
||||||
|
|
||||||
rtems_test_assert(0);
|
rtems_test_assert(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user