2002-07-01 Joel Sherrill <joel@OARcorp.com>

	* Mega patch merge to change the format of the object IDs to
	loosen the dependency between the SCORE and the various APIs.
	There was considerable work to simplify the object name management
        and it appears that the name_table field is no longer needed.
	This patch also includes the addition of the internal mutex
	which is currently only used to protect some types of allocation
	and deallocation.  This significantly can reduce context
	switch latency under certain circumstances.  In particular,
	some heap/region operations were O(n) and had dispatching
	disabled.  This should help enormously.  With this merge,
	the patch is not as clean as it should be.  In particular,
	the documentation has not been modified to reflect the new object
	ID layout, the IDs in the test screens are not updated, and
	_Objects_Get_information needs to be a real routine not inlined.
	As part of this patch a lot of MP code for thread/proxy blocking
	was made conditional and cleaned up.
	* include/Makefile.am, include/rtems/score/coremsg.h,
	include/rtems/score/coremutex.h, include/rtems/score/coresem.h,
	include/rtems/score/object.h, include/rtems/score/threadq.h,
	inline/rtems/score/object.inl, inline/rtems/score/thread.inl,
	macros/rtems/score/object.inl, src/Makefile.am, src/coremsg.c,
	src/coremutex.c, src/coresem.c, src/mpci.c,
	src/objectcomparenameraw.c, src/objectextendinformation.c,
	src/objectinitializeinformation.c, src/objectnametoid.c,
	src/thread.c, src/threadclose.c, src/threadget.c, src/threadq.c,
	src/threadqextractwithproxy.c: Modified as part of above.
	* include/rtems/score/apimutex.h, src/objectgetnoprotection.c: New
	files.

1 files changed, 153 insertions, 0 deletions

diff --git a/c/src/exec/score/include/rtems/score/apimutex.h b/c/src/exec/score/include/rtems/score/apimutex.h
new file mode 100644
index 0000000000..1f0c6bb230
--- /dev/null
+++ b/c/src/exec/score/include/rtems/score/apimutex.h
@@ -0,0 +1,153 @@
+/*  apimutex.h
+ *
+ *  This include file contains all the constants and structures associated
+ *  with the API Mutex Handler.  This handler is used by API level 
+ *  routines to manage mutual exclusion.
+ *
+ *  COPYRIGHT (c) 1989-2002.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#ifndef __API_MUTEX_h
+#define __API_MUTEX_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <rtems/score/coremutex.h>
+#include <rtems/score/isr.h>
+#include <rtems/score/object.h>
+
+/*
+ *  The following defines the control block used to manage each mutex.
+ */
+
+typedef struct {
+  Objects_Control       Object;
+  CORE_mutex_Control    Mutex;
+}   API_Mutex_Control;
+
+/*
+ *  The following defines the information control block used to manage
+ *  this class of objects.
+ */
+
+SCORE_EXTERN Objects_Information  _API_Mutex_Information;
+
+/*
+ *  _API_Mutex_Initialization
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine performs the initialization necessary for this handler.
+ */
+
+#if defined(RTEMS_MULTIPROCESSING)
+#define _API_Mutex_Initialization( _maximum_mutexes ) \
+  _Objects_Initialize_information( \
+    &_API_Mutex_Information, \
+    OBJECTS_INTERNAL_API, \
+    OBJECTS_INTERNAL_MUTEXES, \
+    _maximum_mutexes, \
+    sizeof( API_Mutex_Control ), \
+    FALSE, \
+    0, \
+    FALSE, \
+    NULL \
+  );
+#else
+#define _API_Mutex_Initialization( _maximum_mutexes ) \
+  _Objects_Initialize_information( \
+    &_API_Mutex_Information, \
+    OBJECTS_INTERNAL_API, \
+    OBJECTS_INTERNAL_MUTEXES, \
+    _maximum_mutexes, \
+    sizeof( API_Mutex_Control ), \
+    FALSE, \
+    0  \
+  );
+#endif
+
+/*
+ *  _API_Mutex_Allocate
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine allocates an api mutex from the inactive set.
+ */
+
+#define _API_Mutex_Allocate( _the_mutex ) \
+  do { \
+    CORE_mutex_Attributes attr =  \
+      { CORE_MUTEX_NESTING_IS_ERROR, FALSE, \
+        CORE_MUTEX_DISCIPLINES_PRIORITY_INHERIT, 0 }; \
+    (_the_mutex) = (API_Mutex_Control *) \
+      _Objects_Allocate( &_API_Mutex_Information ); \
+    _CORE_mutex_Initialize( \
+       &(_the_mutex)->Mutex, &attr, CORE_MUTEX_UNLOCKED ); \
+  } while (0)
+
+/*
+ *  _API_Mutex_Lock
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine acquires the specified api mutex.
+ */
+
+#define _API_Mutex_Lock( _the_mutex ) \
+  do { \
+    ISR_Level _level;  \
+    _CORE_mutex_Seize( \
+      &(_the_mutex)->Mutex, (_the_mutex)->Object.id, TRUE, 0, (_level) ); \
+  } while (0)
+  
+/*
+ *  _API_Mutex_Unlock
+ *
+ *  DESCRIPTION:
+ *
+ *  This routine releases the specified api mutex.
+ */
+
+#define _API_Mutex_Unlock( _the_mutex ) \
+  do { \
+    _Thread_Disable_dispatch(); \
+      _CORE_mutex_Surrender( \
+        &(_the_mutex)->Mutex, (_the_mutex)->Object.id, NULL ); \
+    _Thread_Enable_dispatch(); \
+  } while (0);
+
+/*XXX when the APIs all use this for allocation and deallocation
+ *XXX protection, then they should be renamed and probably moved
+ */
+
+SCORE_EXTERN API_Mutex_Control  *_RTEMS_Allocator_Mutex;
+
+#define _RTEMS_Lock_allocator() \
+  _API_Mutex_Lock( _RTEMS_Allocator_Mutex )
+
+#define _RTEMS_Unlock_allocator() \
+  _API_Mutex_Unlock( _RTEMS_Allocator_Mutex )
+
+/*
+ *  There are no inlines for this handler.
+ */
+
+#ifndef __RTEMS_APPLICATION__
+/* #include <rtems/score/apimutex.inl> */
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/*  end of include file */