diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-18 11:51:53 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-18 11:51:53 +0000 |
| commit | 86eaf84ceed538668220a292a8586fe5aec8e602 (patch) | |
| tree | 64ee2821f35518d4a6aacb1c892e4cffb403f050 /gcc/ada/s-taprob.ads | |
| parent | 8d6caf908f1c06b54de27e6591e359606e7e8a0e (diff) | |
| download | gcc-86eaf84ceed538668220a292a8586fe5aec8e602.tar.gz | |
2005-03-17 Jose Ruiz <ruiz@adacore.com>
* s-taprob.adb (Initialize_Protection): Initialize the protected
object's owner to Null_Task.
(Lock): If pragma Detect_Blocking is in effect and the caller of this
procedure is already the protected object's owner then Program_Error
is raised. In addition the protected object's owner is updated.
(Lock_Read_Only): If pragma Detect_Blocking is in effect and the caller
of this procedure is already the protected object's owner then
Program_Error is raised.
In addition the protected object's owner is updated.
(Unlock): Remove the ownership of the protected object.
* s-taprob.ads (Protection): Add the field Owner, used to store the
protected object's owner.
This component is needed for detecting one type of potentially blocking
operations (external calls on a protected subprogram with the same
target object as that of the protected action). Document the rest of
the components.
* s-tposen.adb, s-tpoben.adb (Initialize_Protection_Entries):
Initialize the protected object's owner to Null_Task.
(Lock_Read_Only_Entries): If pragma Detect_Blocking is in effect and the
caller of this procedure is already the protected object's owner then
Program_Error is raised.
Do not raise Program_Error when this procedure is called from a
protected action.
(Unlock_Entries): Remove the ownership of the protected object.
(Lock_Entries): If pragma Detect_Blocking is in effect and the caller
of this procedure is already the protected object's owner then
Program_Error is raised.
Do not raise Program_Error when this procedure is called from
a protected action.
* s-tposen.ads, s-tpoben.ads (Protection_Entries): Add the field Owner,
used to store the protected object's owner.
* s-tpobop.adb (Protected_Entry_Call): If pragma Detect_Blocking is in
effect and this procedure (a potentially blocking operation) is called
from whithin a protected action, Program_Error is raised.
(Timed_Protected_Entry_Call): If pragma Detect_Blocking is in effect
and this procedure (a potentially blocking operation) is called from
whithin a protected action, Program_Error is raised.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96675 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/s-taprob.ads')
| -rw-r--r-- | gcc/ada/s-taprob.ads | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ada/s-taprob.ads b/gcc/ada/s-taprob.ads index 2419759131e..c28fa60ddd0 100644 --- a/gcc/ada/s-taprob.ads +++ b/gcc/ada/s-taprob.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2003, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -- -- -- GNARL is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -206,13 +206,24 @@ package System.Tasking.Protected_Objects is private type Protection is record - L : aliased Task_Primitives.Lock; + L : aliased Task_Primitives.Lock; + -- Lock used to ensure mutual exclusive access to the protected object + Ceiling : System.Any_Priority; + -- Ceiling priority associated to the protected object + + Owner : Task_Id; + -- This field contains the protected object's owner. Null_Task + -- indicates that the protected object is not currently being used. + -- This information is used for detecting the type of potentially + -- blocking operations described in the ARM 9.5.1, par. 15 (external + -- calls on a protected subprogram with the same target object as that + -- of the protected action). end record; procedure Finalize_Protection (Object : in out Protection); - -- Clean up a Protection object; in particular, finalize the associated - -- Lock object. The compiler generates automatically calls to this + -- Clean up a Protection object (in particular, finalize the associated + -- Lock object). The compiler generates calls automatically to this -- procedure end System.Tasking.Protected_Objects; |