diff options
author | Chris Johns <chrisj@rtems.org> | 2016-05-20 18:39:50 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-05-25 15:47:34 +1000 |
commit | 24d0ee57a4d95f99be6e7e60bd162a30daf0638d (patch) | |
tree | 94239c8cc6b21813ca44b6ca89da73f9038914cc /cpukit/sapi/include/rtems/profiling.h | |
parent | psxtests/psxmsgq01: Fix typo (diff) | |
download | rtems-24d0ee57a4d95f99be6e7e60bd162a30daf0638d.tar.bz2 |
cpukit, testsuite: Add rtems_printf and rtems_printer support.
This change adds rtems_printf and related functions and wraps the
RTEMS print plugin support into a user API. All references to the
plugin are removed and replaced with the rtems_printer interface.
Printk and related functions are made to return a valid number of
characters formatted and output.
The function attribute to check printf functions has been added
to rtems_printf and printk. No changes to remove warrnings are part
of this patch set.
The testsuite has been moved over to the rtems_printer. The testsuite
has a mix of rtems_printer access and direct print control via the
tmacros.h header file. The support for begink/endk has been removed
as it served no purpose and only confused the code base. The testsuite
has not been refactored to use rtems_printf. This is future work.
Diffstat (limited to '')
-rw-r--r-- | cpukit/sapi/include/rtems/profiling.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/cpukit/sapi/include/rtems/profiling.h b/cpukit/sapi/include/rtems/profiling.h index 836e6d890e..9e434b2a3c 100644 --- a/cpukit/sapi/include/rtems/profiling.h +++ b/cpukit/sapi/include/rtems/profiling.h @@ -25,6 +25,8 @@ #include <stdint.h> +#include <rtems/print.h> + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -306,24 +308,10 @@ void rtems_profiling_iterate( ); /** - * @brief Function for formatted output. - * - * @param[in, out] arg Some argument. - * @param[in] format The output format as specified by printf(). - * @param[in] ... More parameters according to format. - * - * @returns As specified by printf(). - * - * @see rtems_profiling_report_xml(). - */ -typedef int (*rtems_profiling_printf)(void *arg, const char *format, ...); - -/** * @brief Reports profiling data as XML. * * @param[in] name The name of the profiling report. - * @param[in] printf_func The formatted output function. - * @param[in, out] printf_arg The formatted output function argument. + * @param[in] printer The RTEMS printer to send the output too. * @param[in] indentation_level The current indentation level. * @param[in] indentation The string used for indentation. * @@ -331,8 +319,7 @@ typedef int (*rtems_profiling_printf)(void *arg, const char *format, ...); */ int rtems_profiling_report_xml( const char *name, - rtems_profiling_printf printf_func, - void *printf_arg, + const rtems_printer *printer, uint32_t indentation_level, const char *indentation ); |