diff options
| author | Chris Johns <chrisj@rtems.org> | 2017-04-18 12:44:44 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2017-04-19 12:36:32 +1000 |
| commit | 4fd25c4340f30f61360d4ab2eb126b095eab82e7 (patch) | |
| tree | 19a761afd84590ad78a56914052cc0077c072955 /cpukit/libmisc/monitor | |
| parent | Merge tmacros.h PRIxxx constants from testsuites/ into <rtems/inttypes.h> (diff) | |
| download | rtems-4fd25c4340f30f61360d4ab2eb126b095eab82e7.tar.bz2 | |
libmisc/monitor: Correctly print unlimited configuration table entries.
Closes #2997.
Diffstat (limited to 'cpukit/libmisc/monitor')
| -rw-r--r-- | cpukit/libmisc/monitor/mon-config.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/cpukit/libmisc/monitor/mon-config.c b/cpukit/libmisc/monitor/mon-config.c index f09c7cb195..bee7d2847f 100644 --- a/cpukit/libmisc/monitor/mon-config.c +++ b/cpukit/libmisc/monitor/mon-config.c @@ -101,8 +101,9 @@ rtems_monitor_config_dump( length = 0; length += fprintf(stdout,"WORKSPACE"); length += rtems_monitor_pad(DATACOL, length); - length += fprintf(stdout,"start: %p; size: 0x%" PRIx32 "\n", + length += fprintf(stdout,"start: %p; size: 0x%" PRIx32 " (%" PRId32 ")\n", monitor_config->work_space_start, + monitor_config->work_space_size, monitor_config->work_space_size); length = 0; @@ -116,18 +117,27 @@ rtems_monitor_config_dump( length = 0; length += fprintf(stdout,"MAXIMUMS"); length += rtems_monitor_pad(DATACOL, length); - length += fprintf(stdout,"tasks: %" PRId32 "; timers: %" PRId32 "; sems: %" PRId32 "; que's: %" PRId32 "; ext's: %" PRId32 "\n", - monitor_config->maximum_tasks, - monitor_config->maximum_timers, - monitor_config->maximum_semaphores, - monitor_config->maximum_message_queues, - monitor_config->maximum_extensions); + length += fprintf(stdout,"tasks: %" PRId32 "%c; timers: %" PRId32 "%c; sems: %" PRId32 "%c; que's: %" PRId32 "%c; ext's: %" PRId32 "%c;\n", + monitor_config->maximum_tasks & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_tasks & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+', + monitor_config->maximum_timers & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_timers & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+', + monitor_config->maximum_semaphores & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_semaphores & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+', + monitor_config->maximum_message_queues & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_message_queues & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+', + monitor_config->maximum_extensions & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_extensions & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+'); length = 0; length += rtems_monitor_pad(CONTCOL, length); - length += fprintf(stdout,"partitions: %" PRId32 "; regions: %" PRId32 "; ports: %" PRId32 "; periods: %" PRId32 "\n", - monitor_config->maximum_partitions, - monitor_config->maximum_regions, - monitor_config->maximum_ports, - monitor_config->maximum_periods); + length += fprintf(stdout,"partitions: %" PRId32 "%c; regions: %" PRId32 "%c; ports: %" PRId32 "%c; periods: %" PRId32 "%c;\n", + monitor_config->maximum_partitions & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_partitions & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+', + monitor_config->maximum_regions & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_regions & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+', + monitor_config->maximum_ports & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_ports & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+', + monitor_config->maximum_periods & ~OBJECTS_UNLIMITED_OBJECTS, + (monitor_config->maximum_periods & OBJECTS_UNLIMITED_OBJECTS) == 0 ? ' ' : '+'); return length; } |