[PATCH 2/3] rtems: Use object information to get config max
Sebastian Huber
sebastian.huber at embedded-brains.de
Tue Dec 11 15:41:09 UTC 2018
Use functions instead of macros. Add missing
rtems_configuration_get_maximum_*() functions.
Update #3621.
---
cpukit/Makefile.am | 1 +
cpukit/include/rtems/config.h | 3 +-
cpukit/include/rtems/rtems/config.h | 22 ++++++--
cpukit/libmisc/monitor/mon-config.c | 18 +++----
cpukit/sapi/src/extension.c | 2 +-
cpukit/sapi/src/getconfigmax.c | 102 ++++++++++++++++++++++++++++++++++++
6 files changed, 131 insertions(+), 17 deletions(-)
create mode 100644 cpukit/sapi/src/getconfigmax.c
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index c65048634b..b7a2d2bb11 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1023,6 +1023,7 @@ librtemscpu_a_SOURCES += sapi/src/extensiondelete.c
librtemscpu_a_SOURCES += sapi/src/extensionident.c
librtemscpu_a_SOURCES += sapi/src/fatal.c
librtemscpu_a_SOURCES += sapi/src/fatalsrctext.c
+librtemscpu_a_SOURCES += sapi/src/getconfigmax.c
librtemscpu_a_SOURCES += sapi/src/getversionstring.c
librtemscpu_a_SOURCES += sapi/src/interrtext.c
librtemscpu_a_SOURCES += sapi/src/io.c
diff --git a/cpukit/include/rtems/config.h b/cpukit/include/rtems/config.h
index a6b918c09b..36b20dba09 100644
--- a/cpukit/include/rtems/config.h
+++ b/cpukit/include/rtems/config.h
@@ -276,8 +276,7 @@ extern const rtems_configuration_table Configuration;
(rtems_configuration_get_stack_allocator_avoids_work_space() ? \
0 : rtems_configuration_get_stack_space_size()))
-#define rtems_configuration_get_maximum_extensions() \
- (Configuration.maximum_extensions)
+uint32_t rtems_configuration_get_maximum_extensions( void );
#define rtems_configuration_get_microseconds_per_tick() \
(Configuration.microseconds_per_tick)
diff --git a/cpukit/include/rtems/rtems/config.h b/cpukit/include/rtems/rtems/config.h
index 77ee798d74..51b3dbe30f 100644
--- a/cpukit/include/rtems/rtems/config.h
+++ b/cpukit/include/rtems/rtems/config.h
@@ -126,11 +126,23 @@ extern rtems_api_configuration_table Configuration_RTEMS_API;
/**@}*/
-/**
- * This macro returns the number of Classic API semaphores configured.
- */
-#define rtems_configuration_get_maximum_semaphores() \
- rtems_configuration_get_rtems_api_configuration()->maximum_semaphores
+uint32_t rtems_configuration_get_maximum_barriers( void );
+
+uint32_t rtems_configuration_get_maximum_message_queues( void );
+
+uint32_t rtems_configuration_get_maximum_partitions( void );
+
+uint32_t rtems_configuration_get_maximum_periods( void );
+
+uint32_t rtems_configuration_get_maximum_ports( void );
+
+uint32_t rtems_configuration_get_maximum_regions( void );
+
+uint32_t rtems_configuration_get_maximum_semaphores( void );
+
+uint32_t rtems_configuration_get_maximum_timers( void );
+
+uint32_t rtems_configuration_get_maximum_tasks( void );
#ifdef __cplusplus
}
diff --git a/cpukit/libmisc/monitor/mon-config.c b/cpukit/libmisc/monitor/mon-config.c
index bee7d2847f..852e780d04 100644
--- a/cpukit/libmisc/monitor/mon-config.c
+++ b/cpukit/libmisc/monitor/mon-config.c
@@ -34,15 +34,15 @@ rtems_monitor_config_canonical(
rtems_api_configuration_table *r = &Configuration_RTEMS_API;
canonical_config->work_space_size = c->work_space_size;
- canonical_config->maximum_tasks = r->maximum_tasks;
- canonical_config->maximum_timers = r->maximum_timers;
- canonical_config->maximum_semaphores = r->maximum_semaphores;
- canonical_config->maximum_message_queues = r->maximum_message_queues;
- canonical_config->maximum_partitions = r->maximum_partitions;
- canonical_config->maximum_regions = r->maximum_regions;
- canonical_config->maximum_ports = r->maximum_ports;
- canonical_config->maximum_periods = r->maximum_periods;
- canonical_config->maximum_extensions = c->maximum_extensions;
+ canonical_config->maximum_tasks = rtems_configuration_get_maximum_tasks();
+ canonical_config->maximum_timers = rtems_configuration_get_maximum_timers();
+ canonical_config->maximum_semaphores = rtems_configuration_get_maximum_semaphores();
+ canonical_config->maximum_message_queues = rtems_configuration_get_maximum_message_queues();
+ canonical_config->maximum_partitions = rtems_configuration_get_maximum_partitions();
+ canonical_config->maximum_regions = rtems_configuration_get_maximum_regions();
+ canonical_config->maximum_ports = rtems_configuration_get_maximum_ports();
+ canonical_config->maximum_periods = rtems_configuration_get_maximum_periods();
+ canonical_config->maximum_extensions = rtems_configuration_get_maximum_extensions();
canonical_config->microseconds_per_tick = c->microseconds_per_tick;
canonical_config->ticks_per_timeslice = c->ticks_per_timeslice;
canonical_config->number_of_initialization_tasks = r->number_of_initialization_tasks;
diff --git a/cpukit/sapi/src/extension.c b/cpukit/sapi/src/extension.c
index 70246048a4..8e73030d29 100644
--- a/cpukit/sapi/src/extension.c
+++ b/cpukit/sapi/src/extension.c
@@ -33,7 +33,7 @@ static void _Extension_Manager_initialization(void)
&_Extension_Information,
OBJECTS_CLASSIC_API, /* object API */
OBJECTS_RTEMS_EXTENSIONS,
- rtems_configuration_get_maximum_extensions(),
+ Configuration.maximum_extensions,
sizeof( Extension_Control ),
OBJECTS_NO_STRING_NAME, /* maximum length of an object name */
NULL /* Proxy extraction support callout */
diff --git a/cpukit/sapi/src/getconfigmax.c b/cpukit/sapi/src/getconfigmax.c
new file mode 100644
index 0000000000..4d2779dc85
--- /dev/null
+++ b/cpukit/sapi/src/getconfigmax.c
@@ -0,0 +1,102 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (C) 2018 embedded brains GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/config.h>
+#include <rtems/extensionimpl.h>
+#include <rtems/rtems/barrierimpl.h>
+#include <rtems/rtems/dpmemimpl.h>
+#include <rtems/rtems/messageimpl.h>
+#include <rtems/rtems/partimpl.h>
+#include <rtems/rtems/ratemonimpl.h>
+#include <rtems/rtems/regionimpl.h>
+#include <rtems/rtems/semimpl.h>
+#include <rtems/rtems/tasksimpl.h>
+#include <rtems/rtems/timerimpl.h>
+#include <rtems/score/objectimpl.h>
+
+static uint32_t get_config_max( const Objects_Information *info )
+{
+ if ( _Objects_Is_auto_extend( info ) ) {
+ return info->objects_per_block | RTEMS_UNLIMITED_OBJECTS;
+ }
+
+ return _Objects_Get_maximum_index( info );
+}
+
+uint32_t rtems_configuration_get_maximum_barriers( void )
+{
+ return get_config_max( &_Barrier_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_extensions( void )
+{
+ return get_config_max( &_Extension_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_message_queues( void )
+{
+ return get_config_max( &_Message_queue_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_partitions( void )
+{
+ return get_config_max( &_Partition_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_periods( void )
+{
+ return get_config_max( &_Rate_monotonic_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_ports( void )
+{
+ return get_config_max( &_Dual_ported_memory_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_regions( void )
+{
+ return get_config_max( &_Region_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_semaphores( void )
+{
+ return get_config_max( &_Semaphore_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_timers( void )
+{
+ return get_config_max( &_Timer_Information );
+}
+
+uint32_t rtems_configuration_get_maximum_tasks( void )
+{
+ return get_config_max( &_RTEMS_tasks_Information.Objects );
+}
--
2.16.4
More information about the devel
mailing list