* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,

	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads,
	s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads,
	s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads,
	s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads,
	s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50451 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 39 insertions, 24 deletions

diff --git a/gcc/ada/s-taprop.ads b/gcc/ada/s-taprop.ads
index df22279115e..c9171c6f57b 100644
--- a/gcc/ada/s-taprop.ads
+++ b/gcc/ada/s-taprop.ads
@@ -29,8 +29,7 @@
 -- covered by the  GNU Public License.                                      --
 --                                                                          --
 -- GNARL was developed by the GNARL team at Florida State University. It is --
--- now maintained by Ada Core Technologies Inc. in cooperation with Florida --
--- State University (http://www.gnat.com).                                  --
+-- now maintained by Ada Core Technologies, Inc. (http://www.gnat.com).     --
 --                                                                          --
 ------------------------------------------------------------------------------
 
@@ -138,9 +137,7 @@ package System.Task_Primitives.Operations is
    type Lock_Level is
      (PO_Level,
       Global_Task_Level,
-      All_Attrs_Level,
-      All_Tasks_Level,
-      Interrupts_Level,
+      RTS_Lock_Level,
       ATCB_Level);
    --  Type used to describe kind of lock for second form of Initialize_Lock
    --  call specified below.
@@ -176,7 +173,7 @@ package System.Task_Primitives.Operations is
    --  corresponding Initialize_Lock operation.
 
    procedure Write_Lock (L : access Lock; Ceiling_Violation : out Boolean);
-   procedure Write_Lock (L : access RTS_Lock);
+   procedure Write_Lock (L : access RTS_Lock; Global_Lock : Boolean := False);
    procedure Write_Lock (T : ST.Task_ID);
    pragma Inline (Write_Lock);
    --  Lock a lock object for write access. After this operation returns,
@@ -190,6 +187,9 @@ package System.Task_Primitives.Operations is
    --  operation failed, which will happen if there is a priority ceiling
    --  violation.
    --
+   --  For the operation on RTS_Lock, Global_Lock should be set to True
+   --  if L is a global lock (Single_RTS_Lock, Global_Task_Lock).
+   --
    --  For the operation on ST.Task_ID, the lock is the special lock object
    --  associated with that task's ATCB. This lock has effective ceiling
    --  priority high enough that it is safe to call by a task with any
@@ -221,7 +221,7 @@ package System.Task_Primitives.Operations is
    --  locking that make a reader-writer distinction have higher overhead.
 
    procedure Unlock (L : access Lock);
-   procedure Unlock (L : access RTS_Lock);
+   procedure Unlock (L : access RTS_Lock; Global_Lock : Boolean := False);
    procedure Unlock (T : ST.Task_ID);
    pragma Inline (Unlock);
    --  Unlock a locked lock object.
@@ -232,9 +232,12 @@ package System.Task_Primitives.Operations is
    --  read or write permission. (That is, matching pairs of Lock and Unlock
    --  operations on each lock object must be properly nested.)
 
+   --  For the operation on RTS_Lock, Global_Lock should be set to True
+   --  if L is a global lock (Single_RTS_Lock, Global_Task_Lock).
+   --
    --  Note that Write_Lock for RTS_Lock does not have an out-parameter.
    --  RTS_Locks are used in situations where we have not made provision
-   --  for recovery from ceiling violations.  We do not expect them to
+   --  for recovery from ceiling violations. We do not expect them to
    --  occur inside the runtime system, because all RTS locks have ceiling
    --  Priority'Last.
 
@@ -243,7 +246,7 @@ package System.Task_Primitives.Operations is
    --  executing in the Interrupt_Priority range.
 
    --  It is not clear what to do about ceiling violations due
-   --  to RTS calls done at interrupt priority.  In general, it
+   --  to RTS calls done at interrupt priority. In general, it
    --  is not acceptable to give all RTS locks interrupt priority,
    --  since that whould give terrible performance on systems where
    --  this has the effect of masking hardware interrupts, though we
@@ -255,7 +258,7 @@ package System.Task_Primitives.Operations is
    --  penalties.
 
    --  For POSIX systems, we considered just skipping setting a
-   --  priority ceiling on RTS locks.  This would mean there is no
+   --  priority ceiling on RTS locks. This would mean there is no
    --  ceiling violation, but we would end up with priority inversions
    --  inside the runtime system, resulting in failure to satisfy the
    --  Ada priority rules, and possible missed validation tests.
@@ -267,9 +270,9 @@ package System.Task_Primitives.Operations is
 
    --  This issue should be reconsidered whenever we get around to
    --  checking for calls to potentially blocking operations from
-   --  within protected operations.  If we check for such calls and
+   --  within protected operations. If we check for such calls and
    --  catch them on entry to the OS, it may be that we can eliminate
-   --  the possibility of ceiling violations inside the RTS.  For this
+   --  the possibility of ceiling violations inside the RTS. For this
    --  to work, we would have to forbid explicitly setting the priority
    --  of a task to anything in the Interrupt_Priority range, at least.
    --  We would also have to check that there are no RTS-lock operations
@@ -278,7 +281,7 @@ package System.Task_Primitives.Operations is
 
    --  The latter approach seems to be the best, i.e. to check on entry
    --  to RTS calls that may need to use locks that the priority is not
-   --  in the interrupt range.  If there are RTS operations that NEED to
+   --  in the interrupt range. If there are RTS operations that NEED to
    --  be called from interrupt handlers, those few RTS locks should then
    --  be converted to PO-type locks, with ceiling Interrupt_Priority'Last.
 
@@ -325,9 +328,9 @@ package System.Task_Primitives.Operations is
    --  Returns the resolution of the underlying clock used to implement
    --  RT_Clock.
 
-   ------------------
-   --  Extensions  --
-   ------------------
+   ----------------
+   -- Extensions --
+   ----------------
 
    --  Whoever calls either of the Sleep routines is responsible
    --  for checking for pending aborts before the call.
@@ -389,6 +392,26 @@ package System.Task_Primitives.Operations is
    function Get_Thread_Id (T : ST.Task_ID) return OSI.Thread_Id;
    --  returns the thread id of the specified task.
 
+   -----------------------
+   -- RTS Entrance/Exit --
+   -----------------------
+
+   --  Following two routines are used for possible operations needed
+   --  to be setup/cleared upon entrance/exit of RTS while maintaining
+   --  a single thread of control in the RTS. Since we intend these
+   --  routines to be used for implementing the Single_Lock RTS,
+   --  Lock_RTS should follow the first Defer_Abortion operation
+   --  entering RTS. In the same fashion Unlock_RTS should preceed
+   --  the last Undefer_Abortion exiting RTS.
+   --
+   --  These routines also replace the functions Lock/Unlock_All_Tasks_List
+
+   procedure Lock_RTS;
+   --  Take the global RTS lock.
+
+   procedure Unlock_RTS;
+   --  Release the global RTS lock.
+
    --------------------
    -- Stack Checking --
    --------------------
@@ -465,12 +488,4 @@ package System.Task_Primitives.Operations is
    --  Such functionality is needed by gdb on some targets (e.g VxWorks)
    --  Return True is the operation is successful
 
-   procedure Lock_All_Tasks_List;
-   procedure Unlock_All_Tasks_List;
-   --  Lock/Unlock the All_Tasks_L lock which protects
-   --  System.Initialization.All_Tasks_List and Known_Tasks
-   --  ??? These routines were previousely in System.Tasking.Initialization
-   --  but were moved here to avoid dependency problems. That would be
-   --  nice to look at it some day and put it back in Initialization.
-
 end System.Task_Primitives.Operations;