Merge branch 'topic/csprng' into 'master'

Use GNATCOLL.Random instead of Ada.Numerics.Discrete_Random

See merge request eng/toolchain/aws!41

Author: jklmnn

src/core/aws-utils.adb

@@ -31,13 +31,14 @@ pragma Ada_2012;
 
 with Ada.Calendar.Time_Zones;
 with Ada.Integer_Text_IO;
-with Ada.Numerics.Discrete_Random;
 with Ada.Numerics.Long_Elementary_Functions;
 with Ada.Streams.Stream_IO;
 with Ada.Strings.Fixed;
 with Ada.Strings.Maps.Constants;
 with Ada.Text_IO;
 
+with GNATCOLL.Random;
+
 pragma Warnings (Off);
 with Ada.Strings.Unbounded.Aux;
 pragma Warnings (On);
@@ -50,7 +51,8 @@ package body AWS.Utils is
 
    use type Ada.Directories.File_Kind;
 
-   package Integer_Random is new Numerics.Discrete_Random (Random_Integer);
+   function Integer_Random is new
+     GNATCOLL.Random.Random_Range (Random_Integer);
 
    function Local_To_GMT (DT : Calendar.Time) return Calendar.Time
      with Inline;
@@ -67,14 +69,6 @@ package body AWS.Utils is
    --  Returns True if the string pointed to by Str and terminating to Last
    --  is well-formed UTF-8.
 
-   protected Shared_Random is
-      function Generate return Random_Integer;
-      procedure Reset;
-      procedure Reset (Seed : Integer);
-   private
-      Random_Generator : Integer_Random.Generator;
-   end Shared_Random;
-
    ---------------------
    -- Append_With_Sep --
    ---------------------
@@ -1004,35 +998,16 @@ package body AWS.Utils is
 
    function Random return Random_Integer is
    begin
-      return Shared_Random.Generate;
+      return Integer_Random;
    end Random;
 
-   ------------------
-   -- Random_Reset --
-   ------------------
-
-   procedure Random_Reset (Seed : Integer) is
-   begin
-      Shared_Random.Reset (Seed);
-   end Random_Reset;
-
    -------------------
    -- Random_String --
    -------------------
 
    procedure Random_String (Item : out String) is
-      Chars : constant String
-        := "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-      Rand  : Random_Integer := 0;
    begin
-      for Elem of Item loop
-         if Rand = 0 then
-            Rand := Random;
-         end if;
-
-         Elem := Chars (Integer (Rand rem Chars'Length) + 1);
-         Rand := Rand / Chars'Length;
-      end loop;
+      GNATCOLL.Random.Random_Alphanumerical_String (Item);
    end Random_String;
 
    function Random_String (Length : Natural) return String is
@@ -1131,37 +1106,6 @@ package body AWS.Utils is
 
    end Semaphore;
 
-   -------------------
-   -- Shared_Random --
-   -------------------
-
-   protected body Shared_Random is
-
-      --------------
-      -- Generate --
-      --------------
-
-      function Generate return Random_Integer is
-      begin
-         return Integer_Random.Random (Random_Generator);
-      end Generate;
-
-      -----------
-      -- Reset --
-      -----------
-
-      procedure Reset is
-      begin
-         Integer_Random.Reset (Random_Generator);
-      end Reset;
-
-      procedure Reset (Seed : Integer) is
-      begin
-         Integer_Random.Reset (Random_Generator, Seed);
-      end Reset;
-
-   end Shared_Random;
-
    -----------------------
    -- Significant_Image --
    -----------------------
@@ -1317,6 +1261,4 @@ package body AWS.Utils is
       end if;
    end Time_Zone;
 
-begin
-   Shared_Random.Reset;
 end AWS.Utils;

src/core/aws-utils.ads

@@ -95,12 +95,6 @@ package AWS.Utils is
                          => C in '0' .. '9' | 'a' .. 'z' | 'A' .. 'Z');
    --  Returns random string
 
-   procedure Random_Reset (Seed : Integer);
-   --  This function is needed only if the user wants to get predictable random
-   --  numbers. It means that after calling Random_Reset with the same Seed the
-   --  same sequence of Random and Random_String calls will give the same
-   --  results.
-
    function Image (N : Natural) return String with
      Post => Image'Result'Length > 0
              and then Image'Result (Image'Result'First) /= ' ';