===================================================================
@@ -6,7 +6,7 @@
* *
* C Implementation File *
* *
- * Copyright (C) 1992-2011, Free Software Foundation, Inc. *
+ * Copyright (C) 1992-2012, Free Software Foundation, Inc. *
* *
* GNAT 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- *
@@ -644,72 +644,95 @@
/* Reentrant localtime for Windows. */
extern void
-__gnat_localtime_tzoff (const time_t *, long *);
+__gnat_localtime_tzoff (const time_t *, const int *, long *);
static const unsigned long long w32_epoch_offset = 11644473600ULL;
void
-__gnat_localtime_tzoff (const time_t *timer, long *off)
+__gnat_localtime_tzoff (const time_t *timer, const int *is_historic, long *off)
{
- union
- {
- FILETIME ft_time;
- unsigned long long ull_time;
- } utc_time, local_time;
-
- SYSTEMTIME utc_sys_time, local_sys_time;
TIME_ZONE_INFORMATION tzi;
- BOOL status = 1;
+ BOOL rtx_active;
DWORD tzi_status;
+#ifdef RTX
+ rtx_active = 1;
+#else
+ rtx_active = 0;
+#endif
+
(*Lock_Task) ();
-#ifdef RTX
-
tzi_status = GetTimeZoneInformation (&tzi);
- *off = tzi.Bias;
- if (tzi_status == TIME_ZONE_ID_STANDARD)
- /* The system is operating in the range covered by the StandardDate
- member. */
- *off = *off + tzi.StandardBias;
- else if (tzi_status == TIME_ZONE_ID_DAYLIGHT)
- /* The system is operating in the range covered by the DaylightDate
- member. */
- *off = *off + tzi.DaylightBias;
- *off = *off * -60;
-#else
+ /* Processing for RTX targets or cases where we simply want to extract the
+ offset of the current time zone, regardless of the date. */
- /* First convert unix time_t structure to windows FILETIME format. */
- utc_time.ull_time = ((unsigned long long) *timer + w32_epoch_offset)
- * 10000000ULL;
+ if (rtx_active || !is_historic) {
+ *off = tzi.Bias;
- tzi_status = GetTimeZoneInformation (&tzi);
+ /* The system is operating in the range covered by the StandardDate
+ member. */
+ if (tzi_status == TIME_ZONE_ID_STANDARD) {
+ *off = *off + tzi.StandardBias;
+ }
- /* If GetTimeZoneInformation does not return a value between 0 and 2 then
- it means that we were not able to retrieve timezone informations.
- Note that we cannot use here FileTimeToLocalFileTime as Windows will use
- in always in this case the current timezone setting. As suggested on
- MSDN we use the following three system calls to get the right information.
- Note also that starting with Windows Vista new functions are provided to
- get timezone settings that depend on the year. We cannot use them as we
- still support Windows XP and Windows 2003. */
- status = (tzi_status >= 0 && tzi_status <= 2)
- && FileTimeToSystemTime (&utc_time.ft_time, &utc_sys_time)
- && SystemTimeToTzSpecificLocalTime (&tzi, &utc_sys_time, &local_sys_time)
- && SystemTimeToFileTime (&local_sys_time, &local_time.ft_time);
+ /* The system is operating in the range covered by the DaylightDate
+ member. */
+ else if (tzi_status == TIME_ZONE_ID_DAYLIGHT) {
+ *off = *off + tzi.DaylightBias;
+ }
- if (!status)
- /* An error occurs so return invalid_tzoff. */
- *off = __gnat_invalid_tzoff;
- else
- if (local_time.ull_time > utc_time.ull_time)
- *off = (long) ((local_time.ull_time - utc_time.ull_time) / 10000000ULL);
- else
- *off = - (long) ((utc_time.ull_time - local_time.ull_time) / 10000000ULL);
+ *off = *off * -60;
+ }
-#endif
+ /* Time zone offset calculations for a historic or future date */
+ else {
+ union
+ {
+ FILETIME ft_time;
+ unsigned long long ull_time;
+ } utc_time, local_time;
+
+ SYSTEMTIME utc_sys_time, local_sys_time;
+ BOOL status;
+
+ /* First convert unix time_t structure to windows FILETIME format. */
+ utc_time.ull_time = ((unsigned long long) *timer + w32_epoch_offset)
+ * 10000000ULL;
+
+ /* If GetTimeZoneInformation does not return a value between 0 and 2 then
+ it means that we were not able to retrieve timezone informations. Note
+ that we cannot use here FileTimeToLocalFileTime as Windows will use in
+ always in this case the current timezone setting. As suggested on MSDN
+ we use the following three system calls to get the right information.
+ Note also that starting with Windows Vista new functions are provided
+ to get timezone settings that depend on the year. We cannot use them as
+ we still support Windows XP and Windows 2003. */
+
+ status = (tzi_status >= 0 && tzi_status <= 2)
+ && FileTimeToSystemTime (&utc_time.ft_time, &utc_sys_time)
+ && SystemTimeToTzSpecificLocalTime (&tzi, &utc_sys_time, &local_sys_time)
+ && SystemTimeToFileTime (&local_sys_time, &local_time.ft_time);
+
+ /* An error has occured, return invalid_tzoff */
+
+ if (!status) {
+ *off = __gnat_invalid_tzoff;
+ }
+ else {
+ if (local_time.ull_time > utc_time.ull_time) {
+ *off = (long) ((local_time.ull_time - utc_time.ull_time)
+ / 10000000ULL);
+ }
+ else {
+ *off = - (long) ((utc_time.ull_time - local_time.ull_time)
+ / 10000000ULL);
+ }
+ }
+ }
+
(*Unlock_Task) ();
}
@@ -726,10 +749,10 @@
the Lynx convention when building against the legacy API. */
extern void
-__gnat_localtime_tzoff (const time_t *, long *);
+__gnat_localtime_tzoff (const time_t *, const int *, long *);
void
-__gnat_localtime_tzoff (const time_t *timer, long *off)
+__gnat_localtime_tzoff (const time_t *timer, const int *is_historic, long *off)
{
*off = 0;
}
@@ -751,10 +774,10 @@
extern void (*Unlock_Task) (void);
extern void
-__gnat_localtime_tzoff (const time_t *, long *);
+__gnat_localtime_tzoff (const time_t *, const int *, long *);
void
-__gnat_localtime_tzoff (const time_t *timer, long *off)
+__gnat_localtime_tzoff (const time_t *timer, const int *is_historic, long *off)
{
struct tm tp;
===================================================================
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
+-- Copyright (C) 2009-2012, Free Software Foundation, Inc. --
-- --
-- GNAT 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- --
@@ -42,9 +42,11 @@
-- UTC_Time_Offset --
---------------------
- function UTC_Time_Offset (Date : Time := Clock) return Time_Offset is
+ function UTC_Time_Offset return Time_Offset is
Offset_L : constant Long_Integer :=
- Time_Zones_Operations.UTC_Time_Offset (Date);
+ Time_Zones_Operations.UTC_Time_Offset
+ (Date => Clock,
+ Is_Historic => False);
Offset : Time_Offset;
begin
@@ -66,4 +68,34 @@
return Offset;
end UTC_Time_Offset;
+ ---------------------
+ -- UTC_Time_Offset --
+ ---------------------
+
+ function UTC_Time_Offset (Date : Time) return Time_Offset is
+ Offset_L : constant Long_Integer :=
+ Time_Zones_Operations.UTC_Time_Offset
+ (Date => Date,
+ Is_Historic => True);
+ Offset : Time_Offset;
+
+ begin
+ if Offset_L = Invalid_Time_Zone_Offset then
+ raise Unknown_Zone_Error;
+ end if;
+
+ -- The offset returned by Time_Zones_Operations.UTC_Time_Offset is in
+ -- seconds, the returned value needs to be in minutes.
+
+ Offset := Time_Offset (Offset_L / 60);
+
+ -- Validity checks
+
+ if not Offset'Valid then
+ raise Unknown_Zone_Error;
+ end if;
+
+ return Offset;
+ end UTC_Time_Offset;
+
end Ada.Calendar.Time_Zones;
===================================================================
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
+-- Copyright (C) 2005-2012, Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. In accordance with the copyright of that document, you can freely --
@@ -26,8 +26,13 @@
Unknown_Zone_Error : exception;
- function UTC_Time_Offset (Date : Time := Clock) return Time_Offset;
+ function UTC_Time_Offset return Time_Offset;
-- Returns (in minutes), the difference between the implementation-defined
+ -- time zone of Calendar, and UTC time. If the time zone of the Calendar
+ -- implementation is unknown, raises Unknown_Zone_Error.
+
+ function UTC_Time_Offset (Date : Time) return Time_Offset;
+ -- Returns (in minutes), the difference between the implementation-defined
-- time zone of Calendar, and UTC time, at the time Date. If the time zone
-- of the Calendar implementation is unknown, raises Unknown_Zone_Error.
===================================================================
@@ -1025,7 +1025,10 @@
function Day_Of_Week (Date : Time) return Integer is
Date_N : constant Time_Rep := Time_Rep (Date);
Time_Zone : constant Long_Integer :=
- Time_Zones_Operations.UTC_Time_Offset (Date);
+ Time_Zones_Operations.UTC_Time_Offset
+ (Date => Date,
+ Is_Historic => False);
+
Ada_Low_N : Time_Rep;
Day_Count : Long_Integer;
Day_Dur : Time_Dur;
@@ -1138,7 +1141,9 @@
else
declare
Off : constant Long_Integer :=
- Time_Zones_Operations.UTC_Time_Offset (Time (Date_N));
+ Time_Zones_Operations.UTC_Time_Offset
+ (Date => Time (Date_N),
+ Is_Historic => False);
begin
Date_N := Date_N + Time_Rep (Off) * Nano;
end;
@@ -1360,12 +1365,14 @@
declare
Current_Off : constant Long_Integer :=
Time_Zones_Operations.UTC_Time_Offset
- (Time (Res_N));
+ (Date => Time (Res_N),
+ Is_Historic => False);
Current_Res_N : constant Time_Rep :=
Res_N - Time_Rep (Current_Off) * Nano;
Off : constant Long_Integer :=
Time_Zones_Operations.UTC_Time_Offset
- (Time (Current_Res_N));
+ (Date => Time (Current_Res_N),
+ Is_Historic => False);
begin
Res_N := Res_N - Time_Rep (Off) * Nano;
end;
@@ -1438,7 +1445,9 @@
Nanos_In_56_Years : constant := (14 * 366 + 42 * 365) * Nanos_In_Day;
subtype long is Long_Integer;
+ subtype int is Integer;
type long_Pointer is access all long;
+ type int_Pointer is access all int;
type time_t is
range -(2 ** (Standard'Address_Size - Integer'(1))) ..
@@ -1446,21 +1455,28 @@
type time_t_Pointer is access all time_t;
procedure localtime_tzoff
- (timer : time_t_Pointer;
- off : long_Pointer);
+ (timer : time_t_Pointer;
+ is_historic : int_Pointer;
+ off : long_Pointer);
pragma Import (C, localtime_tzoff, "__gnat_localtime_tzoff");
-- This is a lightweight wrapper around the system library function
-- localtime_r. Parameter 'off' captures the UTC offset which is either
-- retrieved from the tm struct or calculated from the 'timezone' extern
- -- and the tm_isdst flag in the tm struct.
+ -- and the tm_isdst flag in the tm struct. Flag 'is_historic' denotes
+ -- whether 'timer' is a historical time stamp. If this is not the case,
+ -- the routine returns the offset of the local time zone.
---------------------
-- UTC_Time_Offset --
---------------------
- function UTC_Time_Offset (Date : Time) return Long_Integer is
+ function UTC_Time_Offset
+ (Date : Time;
+ Is_Historic : Boolean := True) return Long_Integer
+ is
Adj_Cent : Integer;
Date_N : Time_Rep;
+ Flag : aliased int;
Offset : aliased long;
Secs_T : aliased time_t;
@@ -1499,8 +1515,13 @@
Secs_T := time_t (Date_N / Nano);
+ -- Determine whether to treat the input date as historical or not
+
+ Flag := (if Is_Historic then 1 else 0);
+
localtime_tzoff
(Secs_T'Unchecked_Access,
+ Flag'Unchecked_Access,
Offset'Unchecked_Access);
return Offset;
@@ -1512,4 +1533,5 @@
begin
System.OS_Primitives.Initialize;
+
end Ada.Calendar;
===================================================================
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
+-- Copyright (C) 1992-2012, Free Software Foundation, Inc. --
-- --
-- This specification is derived from the Ada Reference Manual for use with --
-- GNAT. The copyright notice above, and the license provisions that follow --
@@ -350,8 +350,12 @@
package Time_Zones_Operations is
- function UTC_Time_Offset (Date : Time) return Long_Integer;
- -- Return the offset in seconds from UTC
+ function UTC_Time_Offset
+ (Date : Time;
+ Is_Historic : Boolean := True) return Long_Integer;
+ -- Return the offset in seconds from UTC of an arbitrary date. If flag
+ -- Is_Historic is set to False, then return the local time zone offset
+ -- regardless of what Date designates.
end Time_Zones_Operations;