Re: Suspicious reentrant semaphore

[Jano <nono@celes.unizar.es>]

Dmitry A. Kazakov dice...
> The requeue statement does the trick in case you want to use a parameter 
> value in a barrier. You could add one more private entry and requeue to it 
> if the task is not the owner:

Dmitry: I love this suggestion specially because is the first time I'm 
going to employ requeue (never before I faced the necessity).

Here is the new version of my package. I've also slightly changed the 
release logic to obtain exceptions instead of deadlocks in case of wrong 
use:

---------------- SPEC ---------------------

with Ada.Finalization;        use Ada;
with Ada.Task_identification;

package Adagio.Monitor is

   use Ada.Task_identification;

   Use_error : Exception;
   
   protected type Semaphore is

      entry     P (Owner : Task_id);
      procedure V (Owner : Task_id);

   private

      entry Safe_P (Owner : Task_id);

      Caller : Task_id := Null_task_id;           -- Requester
      In_use : Natural := 0;                      -- Times requested

   end Semaphore;

   type Semaphore_access is access all Semaphore;

   -- Use: 
   -- S : aliased Semaphore;
   -- declare
   --   M : Object(S'access);
   -- begin
   --   Exclusive_work;
   -- end;
   type Object (S : access Semaphore) is new 
      Finalization.Limited_Controlled with null record;

   procedure Initialize (this : in out Object);
   procedure Finalize   (this : in out Object);

end Adagio.Monitor;

------------------ BODY -----------------------

package body Adagio.Monitor is

   protected body Semaphore is

      entry P (Owner : Task_id) when true is
      begin
         if Owner = Caller then
            In_use := In_use + 1;
         else
            requeue Safe_P with abort;
         end if;
      end P;

      entry Safe_P (Owner : Task_id) when In_use = 0 is
      begin
         Caller := Owner;
         In_use := 1;
      end Safe_P;

      procedure V (Owner : Task_id) is
      begin
         if Owner /= Caller then
            raise Use_error;
         else
            In_use:= In_use - 1;
            if In_use = 0 then
               Caller := Null_task_id;
            end if;
         end if;
      end V;

   end Semaphore;

   -- Get
   procedure Initialize(this: in out Object) is
   begin
      this.S.P (Current_task);
   end Initialize;

   -- Release
   procedure Finalize(this: in out Object) is
   begin
      this.S.V (Current_task);
   end Finalize;

end Adagio.Monitor;

-- 
-------------------------
Jano
402450.at.cepsz.unizar.es
-------------------------