Add and use System.Linux.time_t for time_t
PR ada/54040 * s-linux-x32.ads: New file. * s-osprim-x32.adb: Likewise. * s-linux.ads (time_t): New type. * s-linux-alpha.ads (time_t): Likewise. * s-linux-hppa.ads (time_t): Likewise. * s-linux-mipsel.ads (time_t): Likewise. * s-linux-sparc.ads (time_t): Likewise. * s-osinte-linux.ads (time_t): Mark it private. Replace long with System.Linux.time_t. (timespec): Replace long with time_t. * s-osinte-posix.adb (To_Timespec): Likewise. * s-taprop-linux.adb (timeval): Replace C.long with System.OS_Interface.time_t. * gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS): Replace s-linux.ads with s-linux-x32.ads, s-osprim-posix.adb with s-osprim-x32.adb for x32. From-SVN: r204840
This commit is contained in:
parent
d877729c89
commit
9f13879ee8
|
@ -1,3 +1,23 @@
|
||||||
|
2013-11-15 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
|
PR ada/54040
|
||||||
|
* s-linux-x32.ads: New file.
|
||||||
|
* s-osprim-x32.adb: Likewise.
|
||||||
|
* s-linux.ads (time_t): New type.
|
||||||
|
* s-linux-alpha.ads (time_t): Likewise.
|
||||||
|
* s-linux-hppa.ads (time_t): Likewise.
|
||||||
|
* s-linux-mipsel.ads (time_t): Likewise.
|
||||||
|
* s-linux-sparc.ads (time_t): Likewise.
|
||||||
|
* s-osinte-linux.ads (time_t): Mark it private. Replace long
|
||||||
|
with System.Linux.time_t.
|
||||||
|
(timespec): Replace long with time_t.
|
||||||
|
* s-osinte-posix.adb (To_Timespec): Likewise.
|
||||||
|
* s-taprop-linux.adb (timeval): Replace C.long with
|
||||||
|
System.OS_Interface.time_t.
|
||||||
|
* gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS): Replace
|
||||||
|
s-linux.ads with s-linux-x32.ads, s-osprim-posix.adb with
|
||||||
|
s-osprim-x32.adb for x32.
|
||||||
|
|
||||||
2013-11-14 H.J. Lu <hongjiu.lu@intel.com>
|
2013-11-14 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
* gcc-interface/trans.c: Include gimple.h and pointer-set.h.
|
* gcc-interface/trans.c: Include gimple.h and pointer-set.h.
|
||||||
|
|
|
@ -2186,11 +2186,11 @@ ifeq ($(strip $(filter-out %x32 linux%,$(target_cpu) $(target_os))),)
|
||||||
a-synbar.ads<a-synbar-posix.ads \
|
a-synbar.ads<a-synbar-posix.ads \
|
||||||
s-inmaop.adb<s-inmaop-posix.adb \
|
s-inmaop.adb<s-inmaop-posix.adb \
|
||||||
s-intman.adb<s-intman-posix.adb \
|
s-intman.adb<s-intman-posix.adb \
|
||||||
s-linux.ads<s-linux.ads \
|
s-linux.ads<s-linux-x32.ads \
|
||||||
s-mudido.adb<s-mudido-affinity.adb \
|
s-mudido.adb<s-mudido-affinity.adb \
|
||||||
s-osinte.ads<s-osinte-linux.ads \
|
s-osinte.ads<s-osinte-linux.ads \
|
||||||
s-osinte.adb<s-osinte-posix.adb \
|
s-osinte.adb<s-osinte-posix.adb \
|
||||||
s-osprim.adb<s-osprim-posix.adb \
|
s-osprim.adb<s-osprim-x32.adb \
|
||||||
s-taprop.adb<s-taprop-linux.adb \
|
s-taprop.adb<s-taprop-linux.adb \
|
||||||
s-tasinf.ads<s-tasinf-linux.ads \
|
s-tasinf.ads<s-tasinf-linux.ads \
|
||||||
s-tasinf.adb<s-tasinf-linux.adb \
|
s-tasinf.adb<s-tasinf-linux.adb \
|
||||||
|
|
|
@ -38,6 +38,12 @@
|
||||||
package System.Linux is
|
package System.Linux is
|
||||||
pragma Preelaborate;
|
pragma Preelaborate;
|
||||||
|
|
||||||
|
------------
|
||||||
|
-- time_t --
|
||||||
|
------------
|
||||||
|
|
||||||
|
type time_t is new Long_Integer;
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
-- Errno --
|
-- Errno --
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -38,6 +38,12 @@
|
||||||
package System.Linux is
|
package System.Linux is
|
||||||
pragma Preelaborate;
|
pragma Preelaborate;
|
||||||
|
|
||||||
|
------------
|
||||||
|
-- time_t --
|
||||||
|
------------
|
||||||
|
|
||||||
|
type time_t is new Long_Integer;
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
-- Errno --
|
-- Errno --
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -37,6 +37,12 @@
|
||||||
package System.Linux is
|
package System.Linux is
|
||||||
pragma Preelaborate;
|
pragma Preelaborate;
|
||||||
|
|
||||||
|
------------
|
||||||
|
-- time_t --
|
||||||
|
------------
|
||||||
|
|
||||||
|
type time_t is new Long_Integer;
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
-- Errno --
|
-- Errno --
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -38,6 +38,12 @@
|
||||||
package System.Linux is
|
package System.Linux is
|
||||||
pragma Preelaborate;
|
pragma Preelaborate;
|
||||||
|
|
||||||
|
------------
|
||||||
|
-- time_t --
|
||||||
|
------------
|
||||||
|
|
||||||
|
type time_t is new Long_Integer;
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
-- Errno --
|
-- Errno --
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -0,0 +1,110 @@
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
-- --
|
||||||
|
-- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
|
||||||
|
-- --
|
||||||
|
-- S Y S T E M . L I N U X --
|
||||||
|
-- --
|
||||||
|
-- S p e c --
|
||||||
|
-- --
|
||||||
|
-- Copyright (C) 2013, 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- --
|
||||||
|
-- ware Foundation; either version 3, or (at your option) any later ver- --
|
||||||
|
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
|
||||||
|
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
|
||||||
|
-- or FITNESS FOR A PARTICULAR PURPOSE. --
|
||||||
|
-- --
|
||||||
|
-- As a special exception under Section 7 of GPL version 3, you are granted --
|
||||||
|
-- additional permissions described in the GCC Runtime Library Exception, --
|
||||||
|
-- version 3.1, as published by the Free Software Foundation. --
|
||||||
|
-- --
|
||||||
|
-- You should have received a copy of the GNU General Public License and --
|
||||||
|
-- a copy of the GCC Runtime Library Exception along with this program; --
|
||||||
|
-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
|
||||||
|
-- <http://www.gnu.org/licenses/>. --
|
||||||
|
-- --
|
||||||
|
-- --
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-- This is the x32 version of this package
|
||||||
|
|
||||||
|
-- This package encapsulates cpu specific differences between implementations
|
||||||
|
-- of GNU/Linux, in order to share s-osinte-linux.ads.
|
||||||
|
|
||||||
|
-- PLEASE DO NOT add any with-clauses to this package or remove the pragma
|
||||||
|
-- Preelaborate. This package is designed to be a bottom-level (leaf) package
|
||||||
|
|
||||||
|
package System.Linux is
|
||||||
|
pragma Preelaborate;
|
||||||
|
|
||||||
|
------------
|
||||||
|
-- time_t --
|
||||||
|
------------
|
||||||
|
|
||||||
|
type time_t is new Long_Long_Integer;
|
||||||
|
|
||||||
|
-----------
|
||||||
|
-- Errno --
|
||||||
|
-----------
|
||||||
|
|
||||||
|
EAGAIN : constant := 11;
|
||||||
|
EINTR : constant := 4;
|
||||||
|
EINVAL : constant := 22;
|
||||||
|
ENOMEM : constant := 12;
|
||||||
|
EPERM : constant := 1;
|
||||||
|
ETIMEDOUT : constant := 110;
|
||||||
|
|
||||||
|
-------------
|
||||||
|
-- Signals --
|
||||||
|
-------------
|
||||||
|
|
||||||
|
SIGHUP : constant := 1; -- hangup
|
||||||
|
SIGINT : constant := 2; -- interrupt (rubout)
|
||||||
|
SIGQUIT : constant := 3; -- quit (ASCD FS)
|
||||||
|
SIGILL : constant := 4; -- illegal instruction (not reset)
|
||||||
|
SIGTRAP : constant := 5; -- trace trap (not reset)
|
||||||
|
SIGIOT : constant := 6; -- IOT instruction
|
||||||
|
SIGABRT : constant := 6; -- used by abort, replace SIGIOT in the future
|
||||||
|
SIGFPE : constant := 8; -- floating point exception
|
||||||
|
SIGKILL : constant := 9; -- kill (cannot be caught or ignored)
|
||||||
|
SIGBUS : constant := 7; -- bus error
|
||||||
|
SIGSEGV : constant := 11; -- segmentation violation
|
||||||
|
SIGPIPE : constant := 13; -- write on a pipe with no one to read it
|
||||||
|
SIGALRM : constant := 14; -- alarm clock
|
||||||
|
SIGTERM : constant := 15; -- software termination signal from kill
|
||||||
|
SIGUSR1 : constant := 10; -- user defined signal 1
|
||||||
|
SIGUSR2 : constant := 12; -- user defined signal 2
|
||||||
|
SIGCLD : constant := 17; -- alias for SIGCHLD
|
||||||
|
SIGCHLD : constant := 17; -- child status change
|
||||||
|
SIGPWR : constant := 30; -- power-fail restart
|
||||||
|
SIGWINCH : constant := 28; -- window size change
|
||||||
|
SIGURG : constant := 23; -- urgent condition on IO channel
|
||||||
|
SIGPOLL : constant := 29; -- pollable event occurred
|
||||||
|
SIGIO : constant := 29; -- I/O now possible (4.2 BSD)
|
||||||
|
SIGLOST : constant := 29; -- File lock lost
|
||||||
|
SIGSTOP : constant := 19; -- stop (cannot be caught or ignored)
|
||||||
|
SIGTSTP : constant := 20; -- user stop requested from tty
|
||||||
|
SIGCONT : constant := 18; -- stopped process has been continued
|
||||||
|
SIGTTIN : constant := 21; -- background tty read attempted
|
||||||
|
SIGTTOU : constant := 22; -- background tty write attempted
|
||||||
|
SIGVTALRM : constant := 26; -- virtual timer expired
|
||||||
|
SIGPROF : constant := 27; -- profiling timer expired
|
||||||
|
SIGXCPU : constant := 24; -- CPU time limit exceeded
|
||||||
|
SIGXFSZ : constant := 25; -- filesize limit exceeded
|
||||||
|
SIGUNUSED : constant := 31; -- unused signal (GNU/Linux)
|
||||||
|
SIGSTKFLT : constant := 16; -- coprocessor stack fault (Linux)
|
||||||
|
SIGLTHRRES : constant := 32; -- GNU/LinuxThreads restart signal
|
||||||
|
SIGLTHRCAN : constant := 33; -- GNU/LinuxThreads cancel signal
|
||||||
|
SIGLTHRDBG : constant := 34; -- GNU/LinuxThreads debugger signal
|
||||||
|
|
||||||
|
-- struct_sigaction offsets
|
||||||
|
|
||||||
|
sa_handler_pos : constant := 0;
|
||||||
|
sa_mask_pos : constant := Standard'Address_Size / 8;
|
||||||
|
sa_flags_pos : constant := 128 + sa_mask_pos;
|
||||||
|
|
||||||
|
SA_SIGINFO : constant := 16#04#;
|
||||||
|
SA_ONSTACK : constant := 16#08000000#;
|
||||||
|
|
||||||
|
end System.Linux;
|
|
@ -38,6 +38,12 @@
|
||||||
package System.Linux is
|
package System.Linux is
|
||||||
pragma Preelaborate;
|
pragma Preelaborate;
|
||||||
|
|
||||||
|
------------
|
||||||
|
-- time_t --
|
||||||
|
------------
|
||||||
|
|
||||||
|
type time_t is new Long_Integer;
|
||||||
|
|
||||||
-----------
|
-----------
|
||||||
-- Errno --
|
-- Errno --
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -218,6 +218,7 @@ package System.OS_Interface is
|
||||||
----------
|
----------
|
||||||
|
|
||||||
type timespec is private;
|
type timespec is private;
|
||||||
|
type time_t is private;
|
||||||
|
|
||||||
function To_Duration (TS : timespec) return Duration;
|
function To_Duration (TS : timespec) return Duration;
|
||||||
pragma Inline (To_Duration);
|
pragma Inline (To_Duration);
|
||||||
|
@ -596,11 +597,11 @@ private
|
||||||
|
|
||||||
type pid_t is new int;
|
type pid_t is new int;
|
||||||
|
|
||||||
type time_t is new long;
|
type time_t is new System.Linux.time_t;
|
||||||
|
|
||||||
type timespec is record
|
type timespec is record
|
||||||
tv_sec : time_t;
|
tv_sec : time_t;
|
||||||
tv_nsec : long;
|
tv_nsec : time_t;
|
||||||
end record;
|
end record;
|
||||||
pragma Convention (C, timespec);
|
pragma Convention (C, timespec);
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@ package body System.OS_Interface is
|
||||||
end if;
|
end if;
|
||||||
|
|
||||||
return timespec'(tv_sec => S,
|
return timespec'(tv_sec => S,
|
||||||
tv_nsec => long (Long_Long_Integer (F * 10#1#E9)));
|
tv_nsec => time_t (Long_Long_Integer (F * 10#1#E9)));
|
||||||
end To_Timespec;
|
end To_Timespec;
|
||||||
|
|
||||||
end System.OS_Interface;
|
end System.OS_Interface;
|
||||||
|
|
|
@ -0,0 +1,173 @@
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
-- --
|
||||||
|
-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
|
||||||
|
-- --
|
||||||
|
-- S Y S T E M . O S _ P R I M I T I V E S --
|
||||||
|
-- --
|
||||||
|
-- B o d y --
|
||||||
|
-- --
|
||||||
|
-- Copyright (C) 2013, 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- --
|
||||||
|
-- ware Foundation; either version 3, or (at your option) any later ver- --
|
||||||
|
-- sion. GNAT is distributed in the hope that it will be useful, but WITH- --
|
||||||
|
-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
|
||||||
|
-- or FITNESS FOR A PARTICULAR PURPOSE. --
|
||||||
|
-- --
|
||||||
|
-- As a special exception under Section 7 of GPL version 3, you are granted --
|
||||||
|
-- additional permissions described in the GCC Runtime Library Exception, --
|
||||||
|
-- version 3.1, as published by the Free Software Foundation. --
|
||||||
|
-- --
|
||||||
|
-- You should have received a copy of the GNU General Public License and --
|
||||||
|
-- a copy of the GCC Runtime Library Exception along with this program; --
|
||||||
|
-- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see --
|
||||||
|
-- <http://www.gnu.org/licenses/>. --
|
||||||
|
-- --
|
||||||
|
-- GNARL was developed by the GNARL team at Florida State University. --
|
||||||
|
-- Extensive contributions were provided by Ada Core Technologies, Inc. --
|
||||||
|
-- --
|
||||||
|
------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-- This version is for Linux/x32
|
||||||
|
|
||||||
|
package body System.OS_Primitives is
|
||||||
|
|
||||||
|
-- ??? These definitions are duplicated from System.OS_Interface
|
||||||
|
-- because we don't want to depend on any package. Consider removing
|
||||||
|
-- these declarations in System.OS_Interface and move these ones in
|
||||||
|
-- the spec.
|
||||||
|
|
||||||
|
type time_t is new Long_Long_Integer;
|
||||||
|
|
||||||
|
type timespec is record
|
||||||
|
tv_sec : time_t;
|
||||||
|
tv_nsec : time_t;
|
||||||
|
end record;
|
||||||
|
pragma Convention (C, timespec);
|
||||||
|
|
||||||
|
function nanosleep (rqtp, rmtp : not null access timespec) return Integer;
|
||||||
|
pragma Import (C, nanosleep, "nanosleep");
|
||||||
|
|
||||||
|
-----------
|
||||||
|
-- Clock --
|
||||||
|
-----------
|
||||||
|
|
||||||
|
function Clock return Duration is
|
||||||
|
type timeval is array (1 .. 2) of time_t;
|
||||||
|
|
||||||
|
procedure timeval_to_duration
|
||||||
|
(T : not null access timeval;
|
||||||
|
sec : not null access Long_Integer;
|
||||||
|
usec : not null access Long_Integer);
|
||||||
|
pragma Import (C, timeval_to_duration, "__gnat_timeval_to_duration");
|
||||||
|
|
||||||
|
Micro : constant := 10**6;
|
||||||
|
sec : aliased Long_Integer;
|
||||||
|
usec : aliased Long_Integer;
|
||||||
|
TV : aliased timeval;
|
||||||
|
Result : Integer;
|
||||||
|
pragma Unreferenced (Result);
|
||||||
|
|
||||||
|
function gettimeofday
|
||||||
|
(Tv : access timeval;
|
||||||
|
Tz : System.Address := System.Null_Address) return Integer;
|
||||||
|
pragma Import (C, gettimeofday, "gettimeofday");
|
||||||
|
|
||||||
|
begin
|
||||||
|
-- The return codes for gettimeofday are as follows (from man pages):
|
||||||
|
-- EPERM settimeofday is called by someone other than the superuser
|
||||||
|
-- EINVAL Timezone (or something else) is invalid
|
||||||
|
-- EFAULT One of tv or tz pointed outside accessible address space
|
||||||
|
|
||||||
|
-- None of these codes signal a potential clock skew, hence the return
|
||||||
|
-- value is never checked.
|
||||||
|
|
||||||
|
Result := gettimeofday (TV'Access, System.Null_Address);
|
||||||
|
timeval_to_duration (TV'Access, sec'Access, usec'Access);
|
||||||
|
return Duration (sec) + Duration (usec) / Micro;
|
||||||
|
end Clock;
|
||||||
|
|
||||||
|
---------------------
|
||||||
|
-- Monotonic_Clock --
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
function Monotonic_Clock return Duration renames Clock;
|
||||||
|
|
||||||
|
-----------------
|
||||||
|
-- To_Timespec --
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
function To_Timespec (D : Duration) return timespec;
|
||||||
|
|
||||||
|
function To_Timespec (D : Duration) return timespec is
|
||||||
|
S : time_t;
|
||||||
|
F : Duration;
|
||||||
|
|
||||||
|
begin
|
||||||
|
S := time_t (Long_Long_Integer (D));
|
||||||
|
F := D - Duration (S);
|
||||||
|
|
||||||
|
-- If F has negative value due to a round-up, adjust for positive F
|
||||||
|
-- value.
|
||||||
|
|
||||||
|
if F < 0.0 then
|
||||||
|
S := S - 1;
|
||||||
|
F := F + 1.0;
|
||||||
|
end if;
|
||||||
|
|
||||||
|
return
|
||||||
|
timespec'(tv_sec => S,
|
||||||
|
tv_nsec => time_t (Long_Long_Integer (F * 10#1#E9)));
|
||||||
|
end To_Timespec;
|
||||||
|
|
||||||
|
-----------------
|
||||||
|
-- Timed_Delay --
|
||||||
|
-----------------
|
||||||
|
|
||||||
|
procedure Timed_Delay
|
||||||
|
(Time : Duration;
|
||||||
|
Mode : Integer)
|
||||||
|
is
|
||||||
|
Request : aliased timespec;
|
||||||
|
Remaind : aliased timespec;
|
||||||
|
Rel_Time : Duration;
|
||||||
|
Abs_Time : Duration;
|
||||||
|
Base_Time : constant Duration := Clock;
|
||||||
|
Check_Time : Duration := Base_Time;
|
||||||
|
|
||||||
|
Result : Integer;
|
||||||
|
pragma Unreferenced (Result);
|
||||||
|
|
||||||
|
begin
|
||||||
|
if Mode = Relative then
|
||||||
|
Rel_Time := Time;
|
||||||
|
Abs_Time := Time + Check_Time;
|
||||||
|
else
|
||||||
|
Rel_Time := Time - Check_Time;
|
||||||
|
Abs_Time := Time;
|
||||||
|
end if;
|
||||||
|
|
||||||
|
if Rel_Time > 0.0 then
|
||||||
|
loop
|
||||||
|
Request := To_Timespec (Rel_Time);
|
||||||
|
Result := nanosleep (Request'Access, Remaind'Access);
|
||||||
|
Check_Time := Clock;
|
||||||
|
|
||||||
|
exit when Abs_Time <= Check_Time or else Check_Time < Base_Time;
|
||||||
|
|
||||||
|
Rel_Time := Abs_Time - Check_Time;
|
||||||
|
end loop;
|
||||||
|
end if;
|
||||||
|
end Timed_Delay;
|
||||||
|
|
||||||
|
----------------
|
||||||
|
-- Initialize --
|
||||||
|
----------------
|
||||||
|
|
||||||
|
procedure Initialize is
|
||||||
|
begin
|
||||||
|
null;
|
||||||
|
end Initialize;
|
||||||
|
|
||||||
|
end System.OS_Primitives;
|
|
@ -627,7 +627,7 @@ package body System.Task_Primitives.Operations is
|
||||||
function Monotonic_Clock return Duration is
|
function Monotonic_Clock return Duration is
|
||||||
use Interfaces;
|
use Interfaces;
|
||||||
|
|
||||||
type timeval is array (1 .. 2) of C.long;
|
type timeval is array (1 .. 2) of System.OS_Interface.time_t;
|
||||||
|
|
||||||
procedure timeval_to_duration
|
procedure timeval_to_duration
|
||||||
(T : not null access timeval;
|
(T : not null access timeval;
|
||||||
|
|
Loading…
Reference in New Issue