[Ada] Support both concurrent and sequential partition elaboration policies

Message ID	20121106094538.GA2158@adacore.com
State	New
Headers	show Return-Path: <gcc-patches-return-331167-incoming=patchwork.ozlabs.org@gcc.gnu.org> Comment: DKIM? See http://www.dkim.org Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=c8CO+n7ZcG2Ij1cjmcr4+EHPUxuJm5iIsxPJMvopE3TPPJUy4P8r09SFaV/ozr CXYtfsPgnkbMxWJWAedY2cX2RZpAUXAwIaISOROpoIKJbKdSQ+PO4XD/qUeiVEYF SuJ66lUFCSDWT2+dZ3V7nml6ycizWMtYmJbDkgxQpWtiI=; Date: Tue, 6 Nov 2012 04:45:38 -0500 From: Arnaud Charlet <charlet@adacore.com> To: gcc-patches@gcc.gnu.org Cc: Tristan Gingold <gingold@adacore.com> Subject: [Ada] Support both concurrent and sequential partition elaboration policies Message-ID: <20121106094538.GA2158@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0OAP2g/MAC+5xKAE" Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

Index: exp_ch9.adb =================================================================== --- exp_ch9.adb (revision 193208) +++ exp_ch9.adb (working copy) @@ -911,10 +911,10 @@ -- Start of processing for Build_Activation_Chain_Entity begin - -- Activation chain is never used in restricted profile, see comment - -- for Create_Restricted_Task in s-tarest.ads. + -- Activation chain is never used for sequential elaboration policy, see + -- comment for Create_Restricted_Task_Sequential in s-tarest.ads). - if Restricted_Profile then + if Partition_Elaboration_Policy = 'S' then return; end if; @@ -4900,10 +4900,10 @@ P : Node_Id; begin - -- On restricted profile, all the tasks will be activated at the end - -- of the elaboration (Sequential elaboration policy). + -- For sequential elaboration policy, all the tasks will be activated at + -- the end of the elaboration. - if Restricted_Profile then + if Partition_Elaboration_Policy = 'S' then return; end if; @@ -4925,7 +4925,11 @@ end if; if Present (Chain) then - Name := New_Reference_To (RTE (RE_Activate_Tasks), Loc); + if Restricted_Profile then + Name := New_Reference_To (RTE (RE_Activate_Restricted_Tasks), Loc); + else + Name := New_Reference_To (RTE (RE_Activate_Tasks), Loc); + end if; Call := Make_Procedure_Call_Statement (Loc, @@ -13980,10 +13984,10 @@ Prefix => Make_Identifier (Loc, New_External_Name (Tnam, 'E')), Attribute_Name => Name_Unchecked_Access)); - -- Chain parameter. This is a reference to the Chain parameter of the - -- initialization procedure. There is no chain in restricted profile. + -- Add Chain parameter (not done for sequential elaboration policy, see + -- comment for Create_Restricted_Task_Sequential in s-tarest.ads). - if not Restricted_Profile then + if Partition_Elaboration_Policy /= 'S' then Append_To (Args, Make_Identifier (Loc, Name_uChain)); end if; @@ -14015,11 +14019,20 @@ Prefix => Make_Identifier (Loc, Name_uInit), Selector_Name => Make_Identifier (Loc, Name_uTask_Id))); - if Restricted_Profile then - Name := New_Reference_To (RTE (RE_Create_Restricted_Task), Loc); - else - Name := New_Reference_To (RTE (RE_Create_Task), Loc); - end if; + declare + Create_RE : RE_Id; + begin + if Restricted_Profile then + if Partition_Elaboration_Policy = 'S' then + Create_RE := RE_Create_Restricted_Task_Sequential; + else + Create_RE := RE_Create_Restricted_Task; + end if; + else + Create_RE := RE_Create_Task; + end if; + Name := New_Reference_To (RTE (Create_RE), Loc); + end; return Make_Procedure_Call_Statement (Loc, Index: bindgen.adb =================================================================== --- bindgen.adb (revision 193208) +++ bindgen.adb (working copy) @@ -488,10 +488,16 @@ WBI (""); end if; - if System_Tasking_Restricted_Stages_Used then - WBI (" procedure Activate_Tasks;"); - WBI (" pragma Import (C, Activate_Tasks," & - " ""__gnat_activate_tasks"");"); + if System_Tasking_Restricted_Stages_Used + and then Partition_Elaboration_Policy_Specified = 'S' + then + WBI (" Partition_Elaboration_Policy : Character;"); + WBI (" pragma Import (C, Partition_Elaboration_Policy," & + " ""__gnat_partition_elaboration_policy"");"); + WBI (""); + WBI (" procedure Activate_All_Tasks_Sequential;"); + WBI (" pragma Import (C, Activate_All_Tasks_Sequential," & + " ""__gnat_activate_all_tasks"");"); end if; WBI (" begin"); @@ -510,8 +516,18 @@ Write_Statement_Buffer; end if; + if System_Tasking_Restricted_Stages_Used + and then Partition_Elaboration_Policy_Specified = 'S' + then + Set_String (" Partition_Elaboration_Policy := '"); + Set_Char (Partition_Elaboration_Policy_Specified); + Set_String ("';"); + Write_Statement_Buffer; + end if; + if Main_Priority = No_Main_Priority and then Main_CPU = No_Main_CPU + and then not System_Tasking_Restricted_Stages_Used then WBI (" null;"); end if; @@ -587,10 +603,16 @@ -- Import task activation procedure for ravenscar - if System_Tasking_Restricted_Stages_Used then - WBI (" procedure Activate_Tasks;"); - WBI (" pragma Import (C, Activate_Tasks," & - " ""__gnat_activate_tasks"");"); + if System_Tasking_Restricted_Stages_Used + and then Partition_Elaboration_Policy_Specified = 'S' + then + WBI (" Partition_Elaboration_Policy : Character;"); + WBI (" pragma Import (C, Partition_Elaboration_Policy," & + " ""__gnat_partition_elaboration_policy"");"); + WBI (""); + WBI (" procedure Activate_All_Tasks_Sequential;"); + WBI (" pragma Import (C, Activate_All_Tasks_Sequential," & + " ""__gnat_activate_all_tasks"");"); end if; -- The import of the soft link which performs library-level object @@ -727,6 +749,15 @@ Set_String ("';"); Write_Statement_Buffer; + if System_Tasking_Restricted_Stages_Used + and then Partition_Elaboration_Policy_Specified = 'S' + then + Set_String (" Partition_Elaboration_Policy := '"); + Set_Char (Partition_Elaboration_Policy_Specified); + Set_String ("';"); + Write_Statement_Buffer; + end if; + Gen_Restrictions; WBI (" Priority_Specific_Dispatching :="); @@ -913,8 +944,10 @@ WBI (" Freeze_Dispatching_Domains;"); end if; - if System_Tasking_Restricted_Stages_Used then - WBI (" Activate_Tasks;"); + if System_Tasking_Restricted_Stages_Used + and then Partition_Elaboration_Policy_Specified = 'S' + then + WBI (" Activate_All_Tasks_Sequential;"); end if; -- Case of main program is CIL function or procedure Index: rtsfind.ads =================================================================== --- rtsfind.ads (revision 193208) +++ rtsfind.ads (working copy) @@ -1762,10 +1762,12 @@ RE_Timed_Task_Entry_Call, -- System.Tasking.Rendezvous RE_Timed_Selective_Wait, -- System.Tasking.Rendezvous - RE_Complete_Restricted_Activation, -- System.Tasking.Restricted.Stages - RE_Create_Restricted_Task, -- System.Tasking.Restricted.Stages - RE_Complete_Restricted_Task, -- System.Tasking.Restricted.Stages - RE_Restricted_Terminated, -- System.Tasking.Restricted.Stages + RE_Activate_Restricted_Tasks, -- System.Tasking.Restricted.Stages + RE_Complete_Restricted_Activation, -- System.Tasking.Restricted.Stages + RE_Create_Restricted_Task, -- System.Tasking.Restricted.Stages + RE_Create_Restricted_Task_Sequential, -- System.Tasking.Restricted.Stages + RE_Complete_Restricted_Task, -- System.Tasking.Restricted.Stages + RE_Restricted_Terminated, -- System.Tasking.Restricted.Stages RE_Abort_Tasks, -- System.Tasking.Stages RE_Activate_Tasks, -- System.Tasking.Stages @@ -3054,10 +3056,12 @@ RE_Timed_Task_Entry_Call => System_Tasking_Rendezvous, RE_Timed_Selective_Wait => System_Tasking_Rendezvous, - RE_Complete_Restricted_Activation => System_Tasking_Restricted_Stages, - RE_Create_Restricted_Task => System_Tasking_Restricted_Stages, - RE_Complete_Restricted_Task => System_Tasking_Restricted_Stages, - RE_Restricted_Terminated => System_Tasking_Restricted_Stages, + RE_Activate_Restricted_Tasks => System_Tasking_Restricted_Stages, + RE_Complete_Restricted_Activation => System_Tasking_Restricted_Stages, + RE_Create_Restricted_Task => System_Tasking_Restricted_Stages, + RE_Create_Restricted_Task_Sequential => System_Tasking_Restricted_Stages, + RE_Complete_Restricted_Task => System_Tasking_Restricted_Stages, + RE_Restricted_Terminated => System_Tasking_Restricted_Stages, RE_Abort_Tasks => System_Tasking_Stages, RE_Activate_Tasks => System_Tasking_Stages, Index: s-tarest.adb =================================================================== --- s-tarest.adb (revision 193208) +++ s-tarest.adb (working copy) @@ -111,6 +111,24 @@ -- Terminate the calling task. -- This should only be called by the Task_Wrapper procedure. + procedure Create_Restricted_Task + (Priority : Integer; + Stack_Address : System.Address; + Size : System.Parameters.Size_Type; + Task_Info : System.Task_Info.Task_Info_Type; + CPU : Integer; + State : Task_Procedure_Access; + Discriminants : System.Address; + Elaborated : Access_Boolean; + Task_Image : String; + Created_Task : Task_Id); + -- Code shared between Create_Restricted_Task_Concurrent and + -- Create_Restricted_Task_Sequential. See comment of the former in the + -- specification of this package. + + procedure Activate_Tasks (Chain : Task_Id); + -- Activate the list of tasks started by Chain + procedure Init_RTS; -- This procedure performs the initialization of the GNARL. -- It consists of initializing the environment task, global locks, and @@ -301,6 +319,40 @@ -- Restricted GNARLI -- ----------------------- + ----------------------------------- + -- Activate_All_Tasks_Sequential -- + ----------------------------------- + + procedure Activate_All_Tasks_Sequential is + begin + pragma Assert (Partition_Elaboration_Policy = 'S'); + + Activate_Tasks (Tasks_Activation_Chain); + Tasks_Activation_Chain := Null_Task; + end Activate_All_Tasks_Sequential; + + ------------------------------- + -- Activate_Restricted_Tasks -- + ------------------------------- + + procedure Activate_Restricted_Tasks + (Chain_Access : Activation_Chain_Access) is + begin + if Partition_Elaboration_Policy = 'S' then + + -- In sequential elaboration policy, the chain must be empty. This + -- procedure can be called if the unit has been compiled without + -- partition elaboration policy, but the partition has a sequential + -- elaboration policy. + + pragma Assert (Chain_Access.T_ID = Null_Task); + null; + else + Activate_Tasks (Chain_Access.T_ID); + Chain_Access.T_ID := Null_Task; + end if; + end Activate_Restricted_Tasks; + -------------------- -- Activate_Tasks -- -------------------- @@ -311,7 +363,7 @@ -- created before the activated task. That satisfies our -- in-order-of-creation ATCB locking policy. - procedure Activate_Tasks is + procedure Activate_Tasks (Chain : Task_Id) is Self_ID : constant Task_Id := STPO.Self; C : Task_Id; Activate_Prio : System.Any_Priority; @@ -333,7 +385,7 @@ -- Activate all the tasks in the chain. Creation of the thread of -- control was deferred until activation. So create it now. - C := Tasks_Activation_Chain; + C := Chain; while C /= null loop if C.Common.State /= Terminated then pragma Assert (C.Common.State = Unactivated); @@ -381,10 +433,6 @@ if Single_Lock then Unlock_RTS; end if; - - -- Remove the tasks from the chain - - Tasks_Activation_Chain := null; end Activate_Tasks; ------------------------------------ @@ -557,9 +605,66 @@ -- may be used by the operation of Ada code within the task. SSL.Create_TSD (Created_Task.Common.Compiler_Data); + end Create_Restricted_Task; + + procedure Create_Restricted_Task + (Priority : Integer; + Stack_Address : System.Address; + Size : System.Parameters.Size_Type; + Task_Info : System.Task_Info.Task_Info_Type; + CPU : Integer; + State : Task_Procedure_Access; + Discriminants : System.Address; + Elaborated : Access_Boolean; + Chain : in out Activation_Chain; + Task_Image : String; + Created_Task : Task_Id) is + begin + Create_Restricted_Task (Priority, Stack_Address, Size, Task_Info, + CPU, State, Discriminants, Elaborated, + Task_Image, Created_Task); + + -- Append this task to the activation chain + + if Partition_Elaboration_Policy = 'S' then + + -- In fact the elaboration policy is sequential, add this task to + -- the global activation chain to defer its activation. + + Created_Task.Common.Activation_Link := Tasks_Activation_Chain; + Tasks_Activation_Chain := Created_Task; + + else + Created_Task.Common.Activation_Link := Chain.T_ID; + Chain.T_ID := Created_Task; + end if; + end Create_Restricted_Task; + + --------------------------------------- + -- Create_Restricted_Task_Sequential -- + --------------------------------------- + + procedure Create_Restricted_Task_Sequential + (Priority : Integer; + Stack_Address : System.Address; + Size : System.Parameters.Size_Type; + Task_Info : System.Task_Info.Task_Info_Type; + CPU : Integer; + State : Task_Procedure_Access; + Discriminants : System.Address; + Elaborated : Access_Boolean; + Task_Image : String; + Created_Task : Task_Id) is + begin + Create_Restricted_Task (Priority, Stack_Address, Size, Task_Info, + CPU, State, Discriminants, Elaborated, + Task_Image, Created_Task); + + -- Append this task to the activation chain + Created_Task.Common.Activation_Link := Tasks_Activation_Chain; Tasks_Activation_Chain := Created_Task; - end Create_Restricted_Task; + end Create_Restricted_Task_Sequential; --------------------------- -- Finalize_Global_Tasks -- Index: s-tarest.ads =================================================================== --- s-tarest.ads (revision 193208) +++ s-tarest.ads (working copy) @@ -43,10 +43,6 @@ -- The restricted GNARLI is also composed of System.Protected_Objects and -- System.Protected_Objects.Single_Entry -pragma Partition_Elaboration_Policy (Sequential); --- This package only implements the sequential elaboration policy. This pragma --- will enforce it (and detect conflicts with user specified policy). - with System.Task_Info; with System.Parameters; @@ -124,6 +120,13 @@ -- t1S : constant String := "t1"; -- tIP (t1, 3, _chain, t1S, 1); + Partition_Elaboration_Policy : Character := 'C'; + pragma Export (C, Partition_Elaboration_Policy, + "__gnat_partition_elaboration_policy"); + -- Partition elaboration policy. Value can be either 'C' for concurrent, + -- which is the default or 'S' for sequential. This value can be modified + -- by the binder generated code, before calling elaboration code. + procedure Create_Restricted_Task (Priority : Integer; Stack_Address : System.Address; @@ -133,10 +136,12 @@ State : Task_Procedure_Access; Discriminants : System.Address; Elaborated : Access_Boolean; + Chain : in out Activation_Chain; Task_Image : String; Created_Task : Task_Id); -- Compiler interface only. Do not call from within the RTS. - -- This must be called to create a new task. + -- This must be called to create a new task, when the partition + -- elaboration policy is not specified (or is concurrent). -- -- Priority is the task's priority (assumed to be in the -- System.Any_Priority'Range) @@ -165,19 +170,58 @@ -- Elaborated is a pointer to a Boolean that must be set to true on exit -- if the task could be successfully elaborated. -- + -- Chain is a linked list of task that needs to be created. On exit, + -- Created_Task.Activation_Link will be Chain.T_ID, and Chain.T_ID will be + -- Created_Task (the created task will be linked at the front of Chain). + -- -- Task_Image is a string created by the compiler that the run time can -- store to ease the debugging and the Ada.Task_Identification facility. -- -- Created_Task is the resulting task. -- -- This procedure can raise Storage_Error if the task creation fails + + procedure Create_Restricted_Task_Sequential + (Priority : Integer; + Stack_Address : System.Address; + Size : System.Parameters.Size_Type; + Task_Info : System.Task_Info.Task_Info_Type; + CPU : Integer; + State : Task_Procedure_Access; + Discriminants : System.Address; + Elaborated : Access_Boolean; + Task_Image : String; + Created_Task : Task_Id); + -- Compiler interface only. Do not call from within the RTS. + -- This must be called to create a new task, when the sequential partition + -- elaboration policy is used. -- - -- Contrary to Create_Task, there is no Chain parameter (for the activation - -- chain), as there is only one global activation chain, which is declared - -- in the body of this package. + -- The parameters are the same as Create_Restricted_Task_Concurrent, + -- except there is no Chain parameter (for the activation chain), as there + -- is only one global activation chain, which is declared in the body of + -- this package. - procedure Activate_Tasks; - pragma Export (C, Activate_Tasks, "__gnat_activate_tasks"); + procedure Activate_Restricted_Tasks + (Chain_Access : Activation_Chain_Access); + -- Compiler interface only. Do not call from within the RTS. + -- This must be called by the creator of a chain of one or more new tasks, + -- to activate them. The chain is a linked list that up to this point is + -- only known to the task that created them, though the individual tasks + -- are already in the All_Tasks_List. + -- + -- The compiler builds the chain in LIFO order (as a stack). Another + -- version of this procedure had code to reverse the chain, so as to + -- activate the tasks in the order of declaration. This might be nice, but + -- it is not needed if priority-based scheduling is supported, since all + -- the activated tasks synchronize on the activators lock before they start + -- activating and so they should start activating in priority order. + -- + -- When the partition elaboration policy is sequential, this procedure + -- does nothing, tasks will be activated at end of elaboration. + + procedure Activate_All_Tasks_Sequential; + pragma Export (C, Activate_All_Tasks_Sequential, + "__gnat_activate_all_tasks"); -- Binder interface only. Do not call from within the RTS. This must be -- called an the end of the elaboration to activate all tasks, in order -- to implement the sequential elaboration policy. Index: exp_ch3.adb =================================================================== --- exp_ch3.adb (revision 193208) +++ exp_ch3.adb (working copy) @@ -1537,10 +1537,10 @@ Append_To (Args, Make_Identifier (Loc, Name_uMaster)); end if; - -- Add _Chain (not done in the restricted profile because not used, - -- see comment for Create_Restricted_Task in s-tarest.ads). + -- Add _Chain (not done for sequential elaboration policy, see + -- comment for Create_Restricted_Task_Sequential in s-tarest.ads). - if not Restricted_Profile then + if Partition_Elaboration_Policy /= 'S' then Append_To (Args, Make_Identifier (Loc, Name_uChain)); end if; @@ -2004,11 +2004,10 @@ Append_To (Args, Make_Identifier (Loc, Name_uMaster)); end if; - if not Restricted_Profile then + -- Add _Chain (not done for sequential elaboration policy, see + -- comment for Create_Restricted_Task_Sequential in s-tarest.ads). - -- No _Chain for the restricted profile because not used, - -- see comment of Create_Restricted_Task in s-tarest.ads. - + if Partition_Elaboration_Policy /= 'S' then Append_To (Args, Make_Identifier (Loc, Name_uChain)); end if; @@ -7793,11 +7792,10 @@ Parameter_Type => New_Reference_To (RTE (RE_Master_Id), Loc))); - if not Restricted_Profile then + -- Add _Chain (not done for sequential elaboration policy, see + -- comment for Create_Restricted_Task_Sequential in s-tarest.ads). - -- No _Chain for the restricted profile because not used, see - -- comment for Create_Restricted_Task in s-tarest.ads. - + if Partition_Elaboration_Policy /= 'S' then Append_To (Formals, Make_Parameter_Specification (Loc, Defining_Identifier =>

[Ada] Support both concurrent and sequential partition elaboration policies

Commit Message

Patch