Change jerry_port interface to allow for a correct implementation of timezones. (#2540)
The previous jerry_port interface did not allow timezones to be handled correctly, even if the host system was up to the task. This PR changes the jerry_port interface to allow a completely correct implementation to exist, and provides one (for Linux/BSD systems) in default-date.c. Fixes #1661 JerryScript-DCO-1.0-Signed-off-by: crazy2be crazy1be@gmail.com
This commit is contained in:
@@ -600,7 +600,7 @@ ecma_builtin_date_prototype_dispatch_routine (uint16_t builtin_routine_id, /**<
|
||||
|
||||
if (!BUILTIN_DATE_FUNCTION_IS_UTC (builtin_routine_id))
|
||||
{
|
||||
this_num += ecma_date_local_time_zone (this_num);
|
||||
this_num += ecma_date_local_time_zone_adjustment (this_num);
|
||||
}
|
||||
|
||||
if (builtin_routine_id <= ECMA_DATE_PROTOTYPE_GET_UTC_TIMEZONE_OFFSET)
|
||||
|
||||
@@ -302,83 +302,32 @@ ecma_date_week_day (ecma_number_t time) /**< time value */
|
||||
} /* ecma_date_week_day */
|
||||
|
||||
/**
|
||||
* Helper function to get local time zone adjustment.
|
||||
* Helper function to get the local time zone offset at a given UTC timestamp.
|
||||
* You can add this number to the given UTC timestamp to get local time.
|
||||
*
|
||||
* See also:
|
||||
* ECMA-262 v5, 15.9.1.7
|
||||
* ECMA-262 v5, 15.9.1.9
|
||||
*
|
||||
* @return local time zone adjustment
|
||||
*/
|
||||
static inline ecma_number_t JERRY_ATTR_ALWAYS_INLINE
|
||||
ecma_date_local_tza (jerry_time_zone_t *tz) /**< time zone information */
|
||||
{
|
||||
return tz->offset * -ECMA_DATE_MS_PER_MINUTE;
|
||||
} /* ecma_date_local_tza */
|
||||
|
||||
/**
|
||||
* Helper function to get the daylight saving time adjustment.
|
||||
*
|
||||
* See also:
|
||||
* ECMA-262 v5, 15.9.1.8
|
||||
*
|
||||
* @return daylight saving time adjustment
|
||||
*/
|
||||
static inline ecma_number_t JERRY_ATTR_ALWAYS_INLINE
|
||||
ecma_date_daylight_saving_ta (jerry_time_zone_t *tz, /**< time zone information */
|
||||
ecma_number_t time) /**< time value */
|
||||
{
|
||||
JERRY_ASSERT (!ecma_number_is_nan (time));
|
||||
|
||||
/*
|
||||
* TODO: Fix daylight saving calculation.
|
||||
* https://github.com/jerryscript-project/jerryscript/issues/1661
|
||||
*/
|
||||
return tz->daylight_saving_time * ECMA_DATE_MS_PER_HOUR;
|
||||
} /* ecma_date_daylight_saving_ta */
|
||||
|
||||
/**
|
||||
* Helper function to get local time from UTC.
|
||||
*
|
||||
* See also:
|
||||
* ECMA-262 v5, 15.9.1.9
|
||||
*
|
||||
* @return local time
|
||||
*/
|
||||
inline ecma_number_t JERRY_ATTR_ALWAYS_INLINE
|
||||
ecma_date_local_time_zone (ecma_number_t time) /**< time value */
|
||||
ecma_date_local_time_zone_adjustment (ecma_number_t time) /**< time value */
|
||||
{
|
||||
jerry_time_zone_t tz;
|
||||
|
||||
if (ecma_number_is_nan (time)
|
||||
|| !jerry_port_get_time_zone (&tz))
|
||||
{
|
||||
return ecma_number_make_nan ();
|
||||
}
|
||||
|
||||
return ecma_date_local_tza (&tz) + ecma_date_daylight_saving_ta (&tz, time);
|
||||
} /* ecma_date_local_time_zone */
|
||||
return jerry_port_get_local_time_zone_adjustment (time, true);
|
||||
} /* ecma_date_local_time_zone_adjustment */
|
||||
|
||||
/**
|
||||
* Helper function to get utc from local time.
|
||||
* Helper function to get UTC time from local time.
|
||||
*
|
||||
* See also:
|
||||
* ECMA-262 v5, 15.9.1.9
|
||||
*
|
||||
* @return utc time
|
||||
* @return UTC time
|
||||
*/
|
||||
ecma_number_t
|
||||
ecma_date_utc (ecma_number_t time) /**< time value */
|
||||
{
|
||||
jerry_time_zone_t tz;
|
||||
|
||||
if (ecma_number_is_nan (time)
|
||||
|| !jerry_port_get_time_zone (&tz))
|
||||
{
|
||||
return ecma_number_make_nan ();
|
||||
}
|
||||
|
||||
ecma_number_t simple_utc_time = time - ecma_date_local_tza (&tz);
|
||||
return simple_utc_time - ecma_date_daylight_saving_ta (&tz, simple_utc_time);
|
||||
return time - jerry_port_get_local_time_zone_adjustment (time, false);
|
||||
} /* ecma_date_utc */
|
||||
|
||||
/**
|
||||
@@ -615,7 +564,7 @@ ecma_date_timezone_offset (ecma_number_t time) /**< time value */
|
||||
{
|
||||
JERRY_ASSERT (!ecma_number_is_nan (time));
|
||||
|
||||
return (-ecma_date_local_time_zone (time)) / ECMA_DATE_MS_PER_MINUTE;
|
||||
return (-ecma_date_local_time_zone_adjustment (time)) / ECMA_DATE_MS_PER_MINUTE;
|
||||
} /* ecma_date_timezone_offset */
|
||||
|
||||
/**
|
||||
@@ -724,7 +673,7 @@ ecma_date_to_string_format (ecma_number_t datetime_number, /**< datetime */
|
||||
}
|
||||
case LIT_CHAR_LOWERCASE_Z: /* Time zone minutes part. */
|
||||
{
|
||||
int32_t time_zone = (int32_t) ecma_date_local_time_zone (datetime_number);
|
||||
int32_t time_zone = (int32_t) ecma_date_local_time_zone_adjustment (datetime_number);
|
||||
|
||||
if (time_zone >= 0)
|
||||
{
|
||||
@@ -744,7 +693,7 @@ ecma_date_to_string_format (ecma_number_t datetime_number, /**< datetime */
|
||||
{
|
||||
JERRY_ASSERT (*format_p == LIT_CHAR_UPPERCASE_Z); /* Time zone seconds part. */
|
||||
|
||||
int32_t time_zone = (int32_t) ecma_date_local_time_zone (datetime_number);
|
||||
int32_t time_zone = (int32_t) ecma_date_local_time_zone_adjustment (datetime_number);
|
||||
|
||||
if (time_zone < 0)
|
||||
{
|
||||
@@ -805,7 +754,7 @@ ecma_date_to_string_format (ecma_number_t datetime_number, /**< datetime */
|
||||
ecma_value_t
|
||||
ecma_date_value_to_string (ecma_number_t datetime_number) /**< datetime */
|
||||
{
|
||||
datetime_number += ecma_date_local_time_zone (datetime_number);
|
||||
datetime_number += ecma_date_local_time_zone_adjustment (datetime_number);
|
||||
return ecma_date_to_string_format (datetime_number, "$W $M $D $Y $h:$m:$s GMT$z:$Z");
|
||||
} /* ecma_date_value_to_string */
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@ ecma_number_t ecma_date_year_from_time (ecma_number_t time);
|
||||
ecma_number_t ecma_date_month_from_time (ecma_number_t time);
|
||||
ecma_number_t ecma_date_date_from_time (ecma_number_t time);
|
||||
ecma_number_t ecma_date_week_day (ecma_number_t time);
|
||||
ecma_number_t ecma_date_local_time_zone (ecma_number_t time);
|
||||
ecma_number_t ecma_date_local_time_zone_adjustment (ecma_number_t time);
|
||||
ecma_number_t ecma_date_utc (ecma_number_t time);
|
||||
ecma_number_t ecma_date_hour_from_time (ecma_number_t time);
|
||||
ecma_number_t ecma_date_min_from_time (ecma_number_t time);
|
||||
|
||||
@@ -111,27 +111,37 @@ void JERRY_ATTR_FORMAT (printf, 2, 3) jerry_port_log (jerry_log_level_t level, c
|
||||
*/
|
||||
|
||||
/**
|
||||
* Jerry time zone structure
|
||||
*/
|
||||
typedef struct
|
||||
{
|
||||
int offset; /**< minutes from west */
|
||||
int daylight_saving_time; /**< daylight saving time (1 - DST applies, 0 - not on DST) */
|
||||
} jerry_time_zone_t;
|
||||
|
||||
/**
|
||||
* Get timezone and daylight saving data
|
||||
* Get local time zone adjustment, in milliseconds, for the given timestamp.
|
||||
* The timestamp can be specified in either UTC or local time, depending on
|
||||
* the value of is_utc. Adding the value returned from this function to
|
||||
* a timestamp in UTC time should result in local time for the current time
|
||||
* zone, and subtracting it from a timestamp in local time should result in
|
||||
* UTC time.
|
||||
*
|
||||
* Ideally, this function should satisfy the stipulations applied to LocalTZA
|
||||
* in section 20.3.1.7 of the ECMAScript version 9.0 spec.
|
||||
*
|
||||
* See Also:
|
||||
* ECMA-262 v9, 20.3.1.7
|
||||
*
|
||||
* Note:
|
||||
* This port function is called by jerry-core when
|
||||
* CONFIG_DISABLE_DATE_BUILTIN is _not_ defined. Otherwise this function is
|
||||
* not used.
|
||||
*
|
||||
* @param[out] tz_p time zone structure to fill.
|
||||
* @return true - if success
|
||||
* false - otherwise
|
||||
* @param unix_ms The unix timestamp we want an offset for, given in
|
||||
* millisecond precision (could be now, in the future,
|
||||
* or in the past). As with all unix timestamps, 0 refers to
|
||||
* 1970-01-01, a day is exactly 86 400 000 milliseconds, and
|
||||
* leap seconds cause the same second to occur twice.
|
||||
* @param is_utc Is the given timestamp in UTC time? If false, it is in local
|
||||
* time.
|
||||
*
|
||||
* @return milliseconds between local time and UTC for the given timestamp,
|
||||
* if available
|
||||
*. 0 if not available / we are in UTC.
|
||||
*/
|
||||
bool jerry_port_get_time_zone (jerry_time_zone_t *tz_p);
|
||||
double jerry_port_get_local_time_zone_adjustment (double unix_ms, bool is_utc);
|
||||
|
||||
/**
|
||||
* Get system time
|
||||
|
||||
Reference in New Issue
Block a user