Changeset 3a4ae6c in rtems for c/src/libmisc

Timestamp:

09/11/95 19:35:39 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ced11f99

Parents:

5072b07

Message:

The word "RTEMS" almost completely removed from the core.

Configuration Table Template file added and all tests
modified to use this. All gvar.h and conftbl.h files
removed from test directories.

Configuration parameter maximum_devices added.

Core semaphore and mutex handlers added and RTEMS API Semaphore
Manager updated to reflect this.

Initialization sequence changed to invoke API specific initialization
routines. Initialization tasks table now owned by RTEMS Tasks Manager.

Added user extension for post-switch.

Utilized user extensions to implement API specific functionality
like signal dispatching.

Added extensions to the System Initialization Thread so that an
API can register a function to be invoked while the system
is being initialized. These are largely equivalent to the
pre-driver and post-driver hooks.

Added the Modules file oar-go32_p5, modified oar-go32, and modified
the file make/custom/go32.cfg to look at an environment varable which
determines what CPU model is being used.

All BSPs updated to reflect named devices and clock driver's IOCTL
used by the Shared Memory Driver. Also merged clock isr into
main file and removed ckisr.c where possible.

Updated spsize to reflect new and moved variables.

Makefiles for the executive source and include files updated to show
break down of files into Core, RTEMS API, and Neither.

Header and inline files installed into subdirectory based on whether
logically in the Core or a part of the RTEMS API.

Location:

c/src/libmisc

Files:

• error/error.c (modified) (2 diffs)
• monitor/mon-dname.c (modified) (1 diff)
• monitor/mon-extension.c (modified) (1 diff)
• monitor/mon-object.c (modified) (1 diff)
• monitor/mon-server.c (modified) (1 diff)
• monitor/mon-task.c (modified) (2 diffs)
• stackchk/check.c (modified) (5 diffs)
• stackchk/internal.h (modified) (1 diff)

c/src/libmisc/error/error.c

@@ -92 +92 @@
     { "directive not implemented",          RTEMS_NOT_IMPLEMENTED, },
     { "RTEMS inconsistency detected",       RTEMS_INTERNAL_ERROR, },
-    { "internal multiprocessing only",      RTEMS_PROXY_BLOCKING, },
     { "could not get enough memory",        RTEMS_NO_MEMORY, },
+    { "internal multiprocessing only",      THREAD_STATUS_PROXY_BLOCKING, },
     { 0, 0, 0 },
 };
@@ -135 +135 @@
         local_errno = errno;
 
-    if (_Configuration_Is_multiprocessing())
+    if (_System_state_Is_multiprocessing)
         fprintf(stderr, "[%d] ", _Configuration_MP_table->node);
     

c/src/libmisc/monitor/mon-dname.c

@@ -58 +58 @@
     rtems_driver_name_t    *np = 0;
 
-    for (np = table + n ; n<RTEMS_MAX_DRIVER_NAMES; n++, np++)
+/* XXX should we be using _IO_Number_of_devices */
+    for (np = table + n ; n<_IO_Number_of_devices; n++, np++)
         if (np->device_name)
             goto done;

c/src/libmisc/monitor/mon-extension.c

@@ -23 +23 @@
 
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->create,
-                                            e->rtems_task_create);
+                                            e->thread_create);
 
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->start,
-                                            e->rtems_task_start);
+                                            e->thread_start);
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->restart,
-                                            e->rtems_task_restart);
+                                            e->thread_restart);
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->delete,
-                                            e->rtems_task_delete);
+                                            e->thread_delete);
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->tswitch,
-                                            e->task_switch);
+                                            e->thread_switch);
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->begin,
-                                            e->task_begin);
+                                            e->thread_begin);
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->exitted,
-                                            e->task_exitted);
+                                            e->thread_exitted);
     rtems_monitor_symbol_canonical_by_value(&canonical_extension->fatal,
                                             e->fatal);

c/src/libmisc/monitor/mon-object.c

@@ -93 +93 @@
     },
     { RTEMS_OBJECT_DNAME,
-      (void *) &rtems_driver_name_table[0],
+      /* XXX now that the driver name table is allocated from the */
+      /* XXX Workspace, this does not work */
+      (void *) 0,
+      /* (void *) _IO_Driver_name_table, */
       sizeof(rtems_monitor_dname_t),
       (rtems_monitor_object_next_fn)        rtems_monitor_dname_next,

c/src/libmisc/monitor/mon-server.c

@@ -220 +220 @@
     rtems_status_code status;
     
-    if (_Configuration_Is_multiprocessing()    &&
+    if (_System_state_Is_multiprocessing    &&
         (_Configuration_MP_table->maximum_nodes > 1))
     {

c/src/libmisc/monitor/mon-task.c

@@ -20 +20 @@
 {
     Thread_Control       *rtems_thread = (Thread_Control *) thread_void;
+    RTEMS_API_Control    *api;
+
+    api = rtems_thread->API_Extensions[ THREAD_API_RTEMS ];
     
     canonical_task->entry = rtems_thread->Start.entry_point;
@@ -28 +31 @@
     canonical_task->state = rtems_thread->current_state;
     canonical_task->wait_id = rtems_thread->Wait.id;
-    canonical_task->events = rtems_thread->RTEMS_API->pending_events;
-    canonical_task->modes = rtems_thread->current_modes;
-    canonical_task->attributes = 0 /* XXX FIX ME rtems_thread->RTEMS_API->attribute_set */;
-    (void) memcpy(canonical_task->notepad, rtems_thread->RTEMS_API->Notepads, sizeof(canonical_task->notepad));
+    canonical_task->events = api->pending_events;
+
+/* XXX modes and attributes only exist in the RTEMS API .. */
+/* XXX not directly in the core thread.. they will have to be derived */
+/* XXX if they are important enough to include anymore.   */
+    canonical_task->modes = 0; /* XXX FIX ME.... rtems_thread->current_modes; */
+    canonical_task->attributes = 0 /* XXX FIX ME rtems_thread->API_Extensions[ THREAD_API_RTEMS ]->attribute_set */;
+    (void) memcpy(canonical_task->notepad, api ->Notepads, sizeof(canonical_task->notepad));
+/* XXX more to fix */
+/*
     (void) memcpy(&canonical_task->wait_args, &rtems_thread->Wait.Extra, sizeof(canonical_task->wait_args));
+*/
 }
 

c/src/libmisc/stackchk/check.c

@@ -19 +19 @@
  */
 
-#include <rtems/system.h>
-#include <rtems/extension.h>
-#include <rtems/fatal.h>
-#include <rtems/heap.h>
-#include <rtems/stack.h>
-#include <rtems/thread.h>
-#ifdef XXX_RTEMS_H_FIXED
-#include <bsp.h>
-#else
-#include <rtems/config.h>
+#include <rtems.h>
+
 extern rtems_configuration_table BSP_Configuration;
-#endif
 
 #include <assert.h>
@@ -57 +48 @@
   0,                                /* rtems_task_delete  */
   Stack_check_Switch_extension,     /* task_switch  */
+  0,                                /* task_post_switch  */
   Stack_check_Begin_extension,      /* task_begin   */
   0,                                /* task_exitted */
@@ -134 +126 @@
 void Stack_check_Initialize( void )
 {
-  rtems_status_code status;
-  Objects_Id   id_ignored;
-  unsigned32  *p;
+  rtems_status_code    status;
+  Objects_Id           id_ignored;
+  unsigned32          *p;
+  unsigned32           i;
+  unsigned32           class_index;
+  Thread_Control      *the_thread;
+  Objects_Information *information;
 
   if (stack_check_initialized)
@@ -172 +168 @@
    */
 
+  /* XXX
+   *
+   *  Technically this has not been done for any task created before this
+   *  happened.  So just run through them and fix the situation.
+   */
+#if 0
   if (_Thread_Executing)
   {
       Stack_check_Create_extension(_Thread_Executing, _Thread_Executing);
   }
+#endif
+
+#if 0
+  for ( class_index = OBJECTS_CLASSES_FIRST ;
+        class_index <= OBJECTS_CLASSES_LAST ;
+        class_index++ ) {
+    information = _Objects_Information_table[ class_index ];
+    if ( information && information->is_thread ) {
+      for ( i=1 ; i <= information->maximum ; i++ ) {
+        the_thread = (Thread_Control *)information->local_table[ i ];
+        Stack_check_Create_extension( the_thread, the_thread );
+      }
+    }
+  }
+#endif
 
   /*
@@ -198 +215 @@
  */
 
-void Stack_check_Create_extension(
+boolean Stack_check_Create_extension(
   Thread_Control *running,
   Thread_Control *the_thread
 )
 {
-    if (the_thread && (the_thread != _Thread_Executing))
+    if (the_thread /* XXX && (the_thread != _Thread_Executing) */ )
         stack_check_dope_stack(&the_thread->Start.Initial_stack);
+
+    return TRUE;
 }
 

c/src/libmisc/stackchk/internal.h

@@ -51 +51 @@
  */
 
-void Stack_check_Create_extension(
+boolean Stack_check_Create_extension(
   Thread_Control *running,
   Thread_Control *the_thread