Provide Task_Info.Number_Of_Processors on Solaris

	gcc/ada:
	* libgnarl/s-osinte__solaris.ads (sysconf): Declare.
	(SC_NPROCESSORS_ONLN): Define.
	* libgnarl/s-tasinf__solaris.ads (Number_Of_Processors): Declare.
	* libgnarl/s-tasinf__solaris.adb (N_CPU): New variable.
	(Number_Of_Processors): New function.

	gcc/testsuite:
	* gnat.dg/system_info1.adb: Sort dg-do target list.
	Add *-*-solaris2.*.

From-SVN: r276049

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c0bc883c20acb09ef8ace6ac2f6f728a074010b6..08244e89afbe4536b7823c4cd973a66650140414 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * libgnarl/s-osinte__solaris.ads (sysconf): Declare.
+       (SC_NPROCESSORS_ONLN): Define.
+       * libgnarl/s-tasinf__solaris.ads (Number_Of_Processors): Declare.
+       * libgnarl/s-tasinf__solaris.adb (N_CPU): New variable.
+       (Number_Of_Processors): New function.
+
 2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/trans.c (Regular_Loop_to_gnu): Do not rotate the loop

diff --git a/gcc/ada/libgnarl/s-osinte__solaris.ads b/gcc/ada/libgnarl/s-osinte__solaris.ads
index 25432255df7b3ebce5b6693438a879ce91e27880..be242baaf587a0e8bc636860a122b5768176e8d0 100644 (file)
--- a/gcc/ada/libgnarl/s-osinte__solaris.ads
+++ b/gcc/ada/libgnarl/s-osinte__solaris.ads
@@ -259,6 +259,11 @@ package System.OS_Interface is
    function To_Timespec (D : Duration) return timespec;
    pragma Inline (To_Timespec);
 
+   function sysconf (name : int) return long;
+   pragma Import (C, sysconf);
+
+   SC_NPROCESSORS_ONLN : constant := 15;
+
    -------------
    -- Process --
    -------------

diff --git a/gcc/ada/libgnarl/s-tasinf__solaris.adb b/gcc/ada/libgnarl/s-tasinf__solaris.adb
index 9744d010d356df6a0353cbd7de6c54f46446f2eb..44a9115953166912d2e0c584706981549bd5e1ca 100644 (file)
--- a/gcc/ada/libgnarl/s-tasinf__solaris.adb
+++ b/gcc/ada/libgnarl/s-tasinf__solaris.adb
@@ -84,4 +84,23 @@ package body System.Task_Info is
       return (False, False);
    end Unbound_Thread_Attributes;
 
+   N_CPU : Natural := 0;
+   pragma Atomic (N_CPU);
+   --  Cache CPU number. Use pragma Atomic to avoid a race condition when
+   --  setting N_CPU in Number_Of_Processors below.
+
+   --------------------------
+   -- Number_Of_Processors --
+   --------------------------
+
+   function Number_Of_Processors return Positive is
+   begin
+      if N_CPU = 0 then
+         N_CPU := Natural
+           (OS_Interface.sysconf (OS_Interface.SC_NPROCESSORS_ONLN));
+      end if;
+
+      return N_CPU;
+   end Number_Of_Processors;
+
 end System.Task_Info;

diff --git a/gcc/ada/libgnarl/s-tasinf__solaris.ads b/gcc/ada/libgnarl/s-tasinf__solaris.ads
index c3dc0f1e316af037c6dbf11ff2fd989c435aba46..0d2cbfdca544978c506d8f8bce2af0ed0886928d 100644 (file)
--- a/gcc/ada/libgnarl/s-tasinf__solaris.ads
+++ b/gcc/ada/libgnarl/s-tasinf__solaris.ads
@@ -139,4 +139,7 @@ package System.Task_Info is
 
    Unspecified_Task_Info : constant Task_Info_Type := null;
 
+   function Number_Of_Processors return Positive;
+   --  Returns the number of processors on the running host
+
 end System.Task_Info;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02462fc5229c272cb5d4018a589a97ec1000ea96..815aee0ad527bde7a3a605cead5549b39b2808ef 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-23  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * gnat.dg/system_info1.adb: Sort dg-do target list.
+       Add *-*-solaris2.*.
+
 2019-09-23  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/specs/compile_time1.ads: New test.

diff --git a/gcc/testsuite/gnat.dg/system_info1.adb b/gcc/testsuite/gnat.dg/system_info1.adb
index e299bc4481e786b217574e5d9aa22af1a42f59dd..fedcc228f29d025977ca02e5cf71478710b2b7e5 100644 (file)
--- a/gcc/testsuite/gnat.dg/system_info1.adb
+++ b/gcc/testsuite/gnat.dg/system_info1.adb
@@ -3,7 +3,7 @@
 --  both 32bit and 64bit Windows. Additional configurations where the
 --  feature was verified to work can opt-in.
 
---  { dg-do run { target *-*-mingw* *-*-linux* } }
+--  { dg-do run { target *-*-linux* *-*-mingw* *-*-solaris2.* } }
 
 with System.Multiprocessors;
 with System.Task_Info;