Changeset 4f7fd59 in rtems for c/src/exec/sapi/headers/confdefs.h

Timestamp:

Dec 23, 1997, 4:03:43 PM (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

2934c3e

Parents:

ede9a691

Message:

Added CONFIGURE_GNAT_KEYS to correct the number of keys configured
for GNAT. It was the number of Ada tasks when in fact the run-time
only required a single key.

Also added the CONFIGURE_MAXIMUM_FAKE_ADA_TASKS constant to account
for resources allocated for each non-Ada task/thread which invokes
the Ada run-time implicitly through an Ada call.

File:

• c/src/exec/sapi/headers/confdefs.h (modified) (5 diffs)

c/src/exec/sapi/headers/confdefs.h

@@ -412 +412 @@
 
 #endif
-
-#ifndef CONFIGURE_MEMORY_USER_OVERHEAD
-#define CONFIGURE_MEMORY_USER_OVERHEAD (96 * 1024)
-#endif
-
 #define CONFIGURE_EXECUTIVE_RAM_SIZE \
 (( CONFIGURE_MEMORY_FOR_TASKS(CONFIGURE_MAXIMUM_TASKS) + \
@@ -429 +424 @@
    CONFIGURE_MEMORY_FOR_DEVICES(CONFIGURE_MAXIMUM_DEVICES) + \
    CONFIGURE_MEMORY_FOR_MP + \
-   CONFIGURE_MEMORY_USER_OVERHEAD \
+   (96*1024) \
 ) & 0xffff8000)
 #endif
@@ -435 +430 @@
 #ifdef CONFIGURE_GNAT_RTEMS
 #define CONFIGURE_GNAT_MUTEXES 10
+#define CONFIGURE_GNAT_KEYS    1
 
 /* 20 are required to run all tests in the ACVC */
@@ -442 +438 @@
 
 #else
-#define CONFIGURE_GNAT_MUTEXES 0
-#define CONFIGURE_MAXIMUM_ADA_TASKS 0
+#define CONFIGURE_GNAT_MUTEXES           0
+#define CONFIGURE_GNAT_KEYS              0
+#define CONFIGURE_MAXIMUM_ADA_TASKS      0
+#define CONFIGURE_MAXIMUM_FAKE_ADA_TASKS 0
 #endif
 
@@ -465 +463 @@
 posix_api_configuration_table Configuration_POSIX_API = {
   CONFIGURE_MAXIMUM_POSIX_THREADS + CONFIGURE_MAXIMUM_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_MUTEXES + CONFIGURE_MAXIMUM_ADA_TASKS +
-     CONFIGURE_GNAT_MUTEXES,
-  CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES + CONFIGURE_MAXIMUM_ADA_TASKS,
-  CONFIGURE_MAXIMUM_POSIX_KEYS + CONFIGURE_MAXIMUM_ADA_TASKS,
+  CONFIGURE_MAXIMUM_POSIX_MUTEXES + CONFIGURE_GNAT_MUTEXES +
+    CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS,
+  CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES +
+    CONFIGURE_MAXIMUM_ADA_TASKS + CONFIGURE_MAXIMUM_FAKE_ADA_TASKS,
+  CONFIGURE_MAXIMUM_POSIX_KEYS + CONFIGURE_GNAT_KEYS,
   CONFIGURE_MAXIMUM_POSIX_QUEUED_SIGNALS,
   CONFIGURE_POSIX_INIT_THREAD_TABLE_SIZE,