91b1417d44
2004-01-05 Robert Dewar <dewar@gnat.com> * 1ssecsta.ads: Default_Secondary_Stack is not a constant since it may be modified by the binder generated main program if the -D switch is used. * 4onumaux.ads, 4znumaux.ads: Add Pure_Function pragmas for all imported functions (since now we expect this to be done for imported functions) * 5vtaprop.adb: Add several ??? for sections requiring more comments Minor reformatting throughout * 5zinit.adb: Minor reformatting Add 2004 to copyright date Minor changes to avoid -gnatwa warnings Correct some instances of using OR instead of OR ELSE (noted while doing reformatting) * sprint.adb: Minor updates to avoid -gnatwa warnings * s-secsta.ads, s-secsta.adb: (SS_Get_Max): New function to obtain high water mark for ss stack Default_Secondary_Stack is not a constant since it may be modified by the binder generated main program if the -D switch is used. * switch-b.adb: New -Dnnn switch for binder * switch-c.adb: Make -gnatg imply all warnings currently in -gnatwa * vms_conv.adb: Minor reformatting Add 2004 to copyright notice Add 2004 to printed copyright notice * 3vexpect.adb, 4zsytaco.adb, 3wsocthi.adb, 3zsocthi.adb, 3zsocthi.adb, 56taprop.adb, 56tpopsp.adb, 5amastop.adb, 5aml-tgt.adb, 5ataprop.adb, 5ataprop.adb, 5atpopsp.adb, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb, 5gml-tgt.adb, 5gtaprop.adb, 5hml-tgt.adb, 5hml-tgt.adb, 5hml-tgt.adb, 5htaprop.adb, 5htraceb.adb, 5itaprop.adb, 5lml-tgt.adb, 5sml-tgt.adb, 5staprop.adb, 5staprop.adb, 5stpopsp.adb, 5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vtaprop.adb, 5vml-tgt.adb, 5vtaprop.adb, 5wosprim.adb, 5wtaprop.adb, 5zinterr.adb, 5zintman.adb, 5zml-tgt.adb, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb, 7staprop.adb, 7stpopsp.adb, vxaddr2line.adb, vxaddr2line.adb, xref_lib.adb, xr_tabls.adb, xr_tabls.ads, s-tasdeb.adb, s-tasdeb.adb, sem_res.ads, sem_util.adb, sem_util.adb, sem_util.ads, s-interr.adb, checks.adb, clean.adb, cstand.adb, einfo.ads, einfo.adb, exp_aggr.adb, exp_ch11.adb, exp_ch3.adb, exp_ch4.adb, exp_ch5.adb, exp_ch7.adb, exp_ch9.adb, prj-nmsc.adb, prj-pp.adb, prj-util.adb, sem_attr.adb, sem_ch10.adb, sem_ch12.adb, sem_ch4.adb, g-dirope.adb, g-dirope.ads, gnatlbr.adb, i-cstrea.adb, inline.adb, lib-xref.adb, sem_ch5.adb, sem_ch7.adb, sem_ch8.adb: Minor reformatting and code clean ups. Minor changes to prevent -gnatwa warnings * ali.adb: Minor reformatting and cleanup of code Acquire new SS indication of secondary stack use from ali files * a-numaux.ads: Add Pure_Function pragmas for all imported functions (since now we expect this to be done for imported functions) * bindgen.adb: Generate call to modify default secondary stack size if -Dnnn switch given * bindusg.adb: Add line for new -D switch * exp_aggr.adb (Type_May_Have_Bit_Aligned_Components): More appropriate replacement name for Type_May_Have_Non_Bit_Aligned_Components! Add circuitry for both records and arrays to avoid gigi processing if the type involved has non-bit-aligned components * exp_ch5.adb (Expand_Assign_Array): Avoid assumption that N_String_Literal node always references an E_String_Literal_Subtype entity. This may not be true in the future. (Possible_Bit_Aligned_Component): Move processing of Component_May_Be_Bit_Aligned from exp_ch5 to exp_util * exp_ch6.adb (Expand_Thread_Body): Pick up Default_Secondary_Stack_Size as variable so that we get value modified by possible -Dnnn binder parameter. * exp_util.adb (Component_May_Be_Bit_Aligned): New function. (Type_May_Have_Bit_Aligned_Components): New function. * exp_util.ads (Component_May_Be_Bit_Aligned): New function. (Type_May_Have_Bit_Aligned_Components): New function. * fe.h: (Set_Identifier_Casing): Fix prototype. Add declaration for Sem_Elim.Eliminate_Error_Msg. Minor reformatting. * freeze.adb (Freeze_Entity): Add RM reference to error message about importing constant atomic/volatile objects. (Freeze_Subprogram): Reset Is_Pure indication for imported subprogram unless explicit Pure_Function pragma given, to avoid insidious bug of call to non-pure imported function getting eliminated. * gnat1drv.adb, gnatbind.adb, gnatchop.adb, gnatfind.adb, gnatls.adb, gnatlink.adb, gnatmem.adb, gnatname.adb, gnatsym.adb, gnatxref.adb, gprcmd.adb, gprep.adb, make.adb: Minor reformatting Add 2004 to printed copyright notice * lib-writ.ads, lib-writ.adb: Put new SS flag in ali file if secondary stack used. * Makefile.rtl: Add entry for g-sestin.o g-sestin.ads: New file. * mdll.adb: Minor changes to avoid -gnatwa warnings * mlib-tgt.adb: Minor reformatting * opt.ads: New parameter Default_Secondary_Stack_Size (GNATBIND) New switch Sec_Stack_Used (GNAT, GNATBIND) Make Default_Secondary_Stack_Size a variable instead of a constant, so that it can be modified by the new -Dnnn bind switch. * rtsfind.adb (Load_Fail): Give full error message in configurable run-time mode if all_errors mode is set. This was not done in the case of a file not found, which was an oversight. Note if secondary stack unit is used by compiler. * sem_elab.adb (Check_A_Call): Rewrite to avoid trying to put ineffective elaborate all pragmas on non-visible packages (this happened when a renamed subprogram was called). Now the elaborate all always goes on the package containing the renaming rather than the one containing the renamed subprogram. * sem_elim.ads, sem_elim.adb (Eliminate_Error_Msg): New procedure (Process_Eliminate_Pragma): Add parameter to capture pragma location. * sem_eval.adb (Eval_String_Literal): Do not assume that string literal has an Etype that references an E_String_Literal. (Eval_String_Literal): Avoid assumption that N_String_Literal node always references an E_String_Literal_Subtype entity. This may not be true in the future. * sem_prag.adb (Process_Eliminate_Pragma): Add parameter to capture pragma location. * sem_res.adb (Resolve): Specialize msg for function name used in proc call. 2004-01-05 Ed Falis <falis@gnat.com> * g-debuti.adb: Replaced direct boolean operator with short-circuit form. 2004-01-05 Vincent Celier <celier@gnat.com> * bld.adb: Minor comment updates (Process_Declarative_Items): Correct incorrect name (Index_Name instead of Item_Name). * make.adb (Gnatmake): Special process for files to compile/check when -B is specified. Fail when there are only foreign mains in attribute Main of the project file and -B is not specified. Do not skip bind/link steps when -B is specified. * makeusg.adb: Document new switch -B * opt.ads (Build_Bind_And_Link_Full_Project): New Boolean flag * switch-m.adb: (Scan_Make_Switches): Process -B switch * vms_data.ads: Add new GNAT PRETTY qualifier /FORM_FEED_AFTER_PRAGMA_PAGE for switch -ff 2004-01-05 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> * trans.c (tree_transform, case N_Free_Statement): Handle thin pointer case. * misc.c (gnat_printable_name): If VERBOSITY is 2, call Set_Identifier_Casing. * decl.c (gnat_to_gnu_entity, E_Function): Give error if return type has size that overflows. 2004-01-05 Gary Dismukes <dismukes@gnat.com> * exp_ch4.adb (Expand_Array_Comparison): Add Boolean constant to avoid -gnatwa warning on static condition. 2004-01-05 Doug Rupp <rupp@gnat.com> * link.c: (shared_libgnat_default) [VMS]: Change to STATIC. 2004-01-05 Arnaud Charlet <charlet@act-europe.fr> * Makefile.in: Install ali files using INSTALL_DATA_DATE to preserve all attributes, including read-only attribute. 2004-01-05 Pascal Obry <obry@gnat.com> * bindgen.adb (Gen_Object_Files_Options): Generate the new shared library naming scheme. * mlib-prj.adb (Build_Library): Generate different names for the static or dynamic version of the GNAT runtime. This is needed to support the new shared library naming scheme. (Process_Binder_File): Add detection of shared library in binder file based on the new naming scheme. * gnatlink.adb (Process_Binder_File): Properly detect the new naming scheme for the shared runtime libraries. * Makefile.in: (LIBRARY_VERSION) [VMS]: Convert all . to _ to conform to new naming scheme. (install-gnatlib): Do not create symlinks for shared libraries. (gnatlib-shared-default): Idem. (gnatlib-shared-dual-win32): New target. Not used for now as the auto-import feature does not support arrays/records. (gnatlib-shared-win32): Do not create copy for the shared libraries. (gnatlib-shared-vms): Fix shared runtime libraries names. * osint.ads, osint.adb (Shared_Lib): New routine, returns the target dependent runtime shared library name. 2004-01-05 Vasiliy Fofanov <fofanov@act-europe.fr> * osint.adb (Read_Library_Info): Remove bogus check if ALI is older than the object. 2004-01-05 Ed Schonberg <schonberg@gnat.com> * sem_ch4.adb (Analyze_Allocator): Check restriction on dynamic protected objects when allocator has a subtype indication, not a qualified expression. Note that qualified expressions may have to be checked when limited aggregates are implemented. * sem_prag.adb (Analyze_Pragma, case Import): If enclosing package is pure, emit warning. (Analyze_Pragma, case Pure_Function): If enclosing package is pure and subprogram is imported, remove warning. 2004-01-05 Geert Bosch <bosch@gnat.com> * s-poosiz.adb: Update copyright notice. (Allocate): Use Task_Lock to protect against concurrent access. (Deallocate): Likewise. 2004-01-05 Joel Brobecker <brobecker@gnat.com> * s-stalib.adb (Elab_Final_Code): Add missing year in date inside ??? comment. From-SVN: r75432
287 lines
11 KiB
Ada
287 lines
11 KiB
Ada
------------------------------------------------------------------------------
|
|
-- --
|
|
-- GNU ADA 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) 1998-2003 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 2, or (at your option) any later ver- --
|
|
-- sion. GNARL 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. See the GNU General Public License --
|
|
-- for more details. You should have received a copy of the GNU General --
|
|
-- Public License distributed with GNARL; see file COPYING. If not, write --
|
|
-- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, --
|
|
-- MA 02111-1307, USA. --
|
|
-- --
|
|
-- As a special exception, if other files instantiate generics from this --
|
|
-- unit, or you link this unit with other files to produce an executable, --
|
|
-- this unit does not by itself cause the resulting executable to be --
|
|
-- covered by the GNU General Public License. This exception does not --
|
|
-- however invalidate any other reasons why the executable file might be --
|
|
-- covered by the GNU Public License. --
|
|
-- --
|
|
-- GNARL was developed by the GNARL team at Florida State University. --
|
|
-- Extensive contributions were provided by Ada Core Technologies, Inc. --
|
|
-- --
|
|
------------------------------------------------------------------------------
|
|
|
|
-- This is the NT version of this package
|
|
|
|
with Ada.Exceptions;
|
|
with Interfaces.C;
|
|
|
|
package body System.OS_Primitives is
|
|
|
|
---------------------------
|
|
-- Win32 API Definitions --
|
|
---------------------------
|
|
|
|
-- These definitions are copied from System.OS_Interface because we do not
|
|
-- want to depend on gnarl here.
|
|
|
|
type DWORD is new Interfaces.C.unsigned_long;
|
|
|
|
type LARGE_INTEGER is delta 1.0 range -2.0**63 .. 2.0**63 - 1.0;
|
|
|
|
type BOOL is new Boolean;
|
|
for BOOL'Size use Interfaces.C.unsigned_long'Size;
|
|
|
|
procedure GetSystemTimeAsFileTime (lpFileTime : access Long_Long_Integer);
|
|
pragma Import (Stdcall, GetSystemTimeAsFileTime, "GetSystemTimeAsFileTime");
|
|
|
|
function QueryPerformanceCounter
|
|
(lpPerformanceCount : access LARGE_INTEGER) return BOOL;
|
|
pragma Import
|
|
(Stdcall, QueryPerformanceCounter, "QueryPerformanceCounter");
|
|
|
|
function QueryPerformanceFrequency
|
|
(lpFrequency : access LARGE_INTEGER) return BOOL;
|
|
pragma Import
|
|
(Stdcall, QueryPerformanceFrequency, "QueryPerformanceFrequency");
|
|
|
|
procedure Sleep (dwMilliseconds : DWORD);
|
|
pragma Import (Stdcall, Sleep, External_Name => "Sleep");
|
|
|
|
----------------------------------------
|
|
-- Data for the high resolution clock --
|
|
----------------------------------------
|
|
|
|
-- Declare some pointers to access multi-word data above. This is needed
|
|
-- to workaround a limitation in the GNU/Linker auto-import feature used
|
|
-- to build the GNAT runtime DLLs. In fact the Clock and Monotonic_Clock
|
|
-- routines are inlined and they are using some multi-word variables.
|
|
-- GNU/Linker will fail to auto-import those variables when building
|
|
-- libgnarl.dll. The indirection level introduced here has no measurable
|
|
-- penalties.
|
|
--
|
|
-- Note that access variables below must not be declared as constant
|
|
-- otherwise the compiler optimization will remove this indirect access.
|
|
|
|
type DA is access all Duration;
|
|
-- Use to have indirect access to multi-word variables
|
|
|
|
type LIA is access all LARGE_INTEGER;
|
|
-- Use to have indirect access to multi-word variables
|
|
|
|
type LLIA is access all Long_Long_Integer;
|
|
-- Use to have indirect access to multi-word variables
|
|
|
|
Tick_Frequency : aliased LARGE_INTEGER;
|
|
TFA : constant LIA := Tick_Frequency'Access;
|
|
-- Holds frequency of high-performance counter used by Clock
|
|
-- Windows NT uses a 1_193_182 Hz counter on PCs.
|
|
|
|
Base_Ticks : aliased LARGE_INTEGER;
|
|
BTA : constant LIA := Base_Ticks'Access;
|
|
-- Holds the Tick count for the base time.
|
|
|
|
Base_Monotonic_Ticks : aliased LARGE_INTEGER;
|
|
BMTA : constant LIA := Base_Monotonic_Ticks'Access;
|
|
-- Holds the Tick count for the base monotonic time
|
|
|
|
Base_Clock : aliased Duration;
|
|
BCA : constant DA := Base_Clock'Access;
|
|
-- Holds the current clock for the standard clock's base time
|
|
|
|
Base_Monotonic_Clock : aliased Duration;
|
|
BMCA : constant DA := Base_Monotonic_Clock'Access;
|
|
-- Holds the current clock for monotonic clock's base time
|
|
|
|
Base_Time : aliased Long_Long_Integer;
|
|
BTiA : constant LLIA := Base_Time'Access;
|
|
-- Holds the base time used to check for system time change, used with
|
|
-- the standard clock.
|
|
|
|
procedure Get_Base_Time;
|
|
-- Retrieve the base time and base ticks. These values will be used by
|
|
-- clock to compute the current time by adding to it a fraction of the
|
|
-- performance counter. This is for the implementation of a
|
|
-- high-resolution clock. Note that this routine does not change the base
|
|
-- monotonic values used by the monotonic clock.
|
|
|
|
-----------
|
|
-- Clock --
|
|
-----------
|
|
|
|
-- This implementation of clock provides high resolution timer values
|
|
-- using QueryPerformanceCounter. This call return a 64 bits values (based
|
|
-- on the 8253 16 bits counter). This counter is updated every 1/1_193_182
|
|
-- times per seconds. The call to QueryPerformanceCounter takes 6
|
|
-- microsecs to complete.
|
|
|
|
function Clock return Duration is
|
|
Max_Shift : constant Duration := 2.0;
|
|
Hundreds_Nano_In_Sec : constant Long_Long_Float := 1.0E7;
|
|
Current_Ticks : aliased LARGE_INTEGER;
|
|
Elap_Secs_Tick : Duration;
|
|
Elap_Secs_Sys : Duration;
|
|
Now : aliased Long_Long_Integer;
|
|
|
|
begin
|
|
if not QueryPerformanceCounter (Current_Ticks'Access) then
|
|
return 0.0;
|
|
end if;
|
|
|
|
GetSystemTimeAsFileTime (Now'Access);
|
|
|
|
Elap_Secs_Sys :=
|
|
Duration (Long_Long_Float (abs (Now - BTiA.all)) /
|
|
Hundreds_Nano_In_Sec);
|
|
|
|
Elap_Secs_Tick :=
|
|
Duration (Long_Long_Float (Current_Ticks - BTA.all) /
|
|
Long_Long_Float (TFA.all));
|
|
|
|
-- If we have a shift of more than Max_Shift seconds we resynchonize the
|
|
-- Clock. This is probably due to a manual Clock adjustment, an DST
|
|
-- adjustment or an NTP synchronisation. And we want to adjust the
|
|
-- time for this system (non-monotonic) clock.
|
|
|
|
if abs (Elap_Secs_Sys - Elap_Secs_Tick) > Max_Shift then
|
|
Get_Base_Time;
|
|
|
|
Elap_Secs_Tick :=
|
|
Duration (Long_Long_Float (Current_Ticks - BTA.all) /
|
|
Long_Long_Float (TFA.all));
|
|
end if;
|
|
|
|
return BCA.all + Elap_Secs_Tick;
|
|
end Clock;
|
|
|
|
-------------------
|
|
-- Get_Base_Time --
|
|
-------------------
|
|
|
|
procedure Get_Base_Time is
|
|
-- The resolution for GetSystemTime is 1 millisecond.
|
|
|
|
-- The time to get both base times should take less than 1 millisecond.
|
|
-- Therefore, the elapsed time reported by GetSystemTime between both
|
|
-- actions should be null.
|
|
|
|
Max_Elapsed : constant := 0;
|
|
|
|
Test_Now : aliased Long_Long_Integer;
|
|
|
|
epoch_1970 : constant := 16#19D_B1DE_D53E_8000#; -- win32 UTC epoch
|
|
system_time_ns : constant := 100; -- 100 ns per tick
|
|
Sec_Unit : constant := 10#1#E9;
|
|
|
|
begin
|
|
-- Here we must be sure that both of these calls are done in a short
|
|
-- amount of time. Both are base time and should in theory be taken
|
|
-- at the very same time.
|
|
|
|
loop
|
|
GetSystemTimeAsFileTime (Base_Time'Access);
|
|
|
|
if not QueryPerformanceCounter (Base_Ticks'Access) then
|
|
pragma Assert
|
|
(Standard.False,
|
|
"Could not query high performance counter in Clock");
|
|
null;
|
|
end if;
|
|
|
|
GetSystemTimeAsFileTime (Test_Now'Access);
|
|
|
|
exit when Test_Now - Base_Time = Max_Elapsed;
|
|
end loop;
|
|
|
|
Base_Clock := Duration
|
|
(Long_Long_Float ((Base_Time - epoch_1970) * system_time_ns) /
|
|
Long_Long_Float (Sec_Unit));
|
|
end Get_Base_Time;
|
|
|
|
---------------------
|
|
-- Monotonic_Clock --
|
|
---------------------
|
|
|
|
function Monotonic_Clock return Duration is
|
|
Current_Ticks : aliased LARGE_INTEGER;
|
|
Elap_Secs_Tick : Duration;
|
|
begin
|
|
if not QueryPerformanceCounter (Current_Ticks'Access) then
|
|
return 0.0;
|
|
end if;
|
|
|
|
Elap_Secs_Tick :=
|
|
Duration (Long_Long_Float (Current_Ticks - BMTA.all) /
|
|
Long_Long_Float (TFA.all));
|
|
|
|
return BMCA.all + Elap_Secs_Tick;
|
|
end Monotonic_Clock;
|
|
|
|
-----------------
|
|
-- Timed_Delay --
|
|
-----------------
|
|
|
|
procedure Timed_Delay (Time : Duration; Mode : Integer) is
|
|
Rel_Time : Duration;
|
|
Abs_Time : Duration;
|
|
Check_Time : Duration := Monotonic_Clock;
|
|
|
|
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
|
|
Sleep (DWORD (Rel_Time * 1000.0));
|
|
Check_Time := Monotonic_Clock;
|
|
|
|
exit when Abs_Time <= Check_Time;
|
|
|
|
Rel_Time := Abs_Time - Check_Time;
|
|
end loop;
|
|
end if;
|
|
end Timed_Delay;
|
|
|
|
-- Package elaboration, get starting time as base
|
|
|
|
begin
|
|
if not QueryPerformanceFrequency (Tick_Frequency'Access) then
|
|
Ada.Exceptions.Raise_Exception
|
|
(Program_Error'Identity,
|
|
"cannot get high performance counter frequency");
|
|
end if;
|
|
|
|
Get_Base_Time;
|
|
|
|
-- Keep base clock and ticks for the monotonic clock. These values should
|
|
-- never be changed to ensure proper behavior of the monotonic clock.
|
|
|
|
Base_Monotonic_Clock := Base_Clock;
|
|
Base_Monotonic_Ticks := Base_Ticks;
|
|
end System.OS_Primitives;
|