Disable date object related system calls by default

Use DATE_SYS_CALLS=ON for make target to enable the
date related system calls. Also fix some minor issues.
Related issue: #923

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
This commit is contained in:
László Langó
2016-03-02 15:56:28 +01:00
parent e926aa7d69
commit 9bf1ecc677
5 changed files with 41 additions and 11 deletions
+5
View File
@@ -75,6 +75,11 @@ BUILD_NAME:=
CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_LOG=$(LOG)
endif
# Date system calls
ifneq ($(DATE_SYS_CALLS),)
CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_DATE_SYS_CALLS=$(DATE_SYS_CALLS)
endif
# All-in-one build
ifneq ($(ALL_IN_ONE),)
CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_ALL_IN_ONE=$(ALL_IN_ONE)
+5
View File
@@ -185,6 +185,11 @@ project (JerryCore C ASM)
set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_ENABLE_LOG)
endif()
# Date system calls
if("${ENABLE_DATE_SYS_CALLS}" STREQUAL "ON")
set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_ENABLE_DATE_SYS_CALLS)
endif()
# Platform-specific configuration
set(DEFINES_JERRY ${DEFINES_JERRY} ${DEFINES_JERRY_${PLATFORM_EXT}})
@@ -33,7 +33,9 @@
#define BUILTIN_UNDERSCORED_ID date
#include "ecma-builtin-internal-routines-template.inc.h"
#ifdef JERRY_ENABLE_DATE_SYS_CALLS
#include <sys/time.h>
#endif /* JERRY_ENABLE_DATE_SYS_CALLS */
/** \addtogroup ecma ECMA
* @{
@@ -451,16 +453,19 @@ ecma_builtin_date_utc (ecma_value_t this_arg __attr_unused___, /**< this argumen
static ecma_value_t
ecma_builtin_date_now (ecma_value_t this_arg __attr_unused___) /**< this argument */
{
struct timeval tv;
ecma_number_t *now_num_p = ecma_alloc_number ();
*now_num_p = ECMA_NUMBER_ZERO;
#ifdef JERRY_ENABLE_DATE_SYS_CALLS
struct timeval tv;
if (gettimeofday (&tv, NULL) != 0)
{
return ecma_raise_type_error ("gettimeofday failed");
}
*now_num_p = ((ecma_number_t) tv.tv_sec) * 1000.0 + ((ecma_number_t) (tv.tv_usec / 1000));
#endif /* JERRY_ENABLE_DATE_SYS_CALLS */
return ecma_make_number_value (now_num_p);
} /* ecma_builtin_date_now */
@@ -26,16 +26,10 @@
#ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_DATE_BUILTIN
#ifdef JERRY_ENABLE_DATE_SYS_CALLS
#include <sys/time.h>
/**
* Timezone structure
*/
struct timezone
{
int tz_minuteswest; /**< minutes west of Greenwich */
int tz_dsttime; /**< type of DST correction */
};
#endif /* JERRY_ENABLE_DATE_SYS_CALLS */
/** \addtogroup ecma ECMA
* @{
@@ -456,15 +450,21 @@ ecma_date_week_day (ecma_number_t time) /**< time value */
ecma_number_t __attr_always_inline___
ecma_date_local_tza ()
{
#ifdef JERRY_ENABLE_DATE_SYS_CALLS
struct timeval tv;
struct timezone tz;
tz.tz_minuteswest = 0; /* gettimeofday may not fill tz, so zero-initializing */
if (gettimeofday (&tv, &tz) != 0)
{
return ecma_raise_type_error ("gettimeofday failed");
return ecma_number_make_nan ();
}
return tz.tz_minuteswest * -ECMA_DATE_MS_PER_MINUTE;
#else /* !JERRY_ENABLE_DATE_SYS_CALLS */
return ECMA_NUMBER_ZERO;
#endif /* JERRY_ENABLE_DATE_SYS_CALLS */
} /* ecma_date_local_tza */
/**
@@ -483,15 +483,21 @@ ecma_date_daylight_saving_ta (ecma_number_t time) /**< time value */
return time; /* time is NaN */
}
#ifdef JERRY_ENABLE_DATE_SYS_CALLS
struct timeval tv;
struct timezone tz;
tz.tz_dsttime = 0; /* gettimeofday may not fill tz, so zero-initializing */
if (gettimeofday (&tv, &tz) != 0)
{
return ecma_raise_type_error ("gettimeofday failed");
return ecma_number_make_nan ();
}
return tz.tz_dsttime;
#else /* !JERRY_ENABLE_DATE_SYS_CALLS */
return ECMA_NUMBER_ZERO;
#endif /* JERRY_ENABLE_DATE_SYS_CALLS */
} /* ecma_date_daylight_saving_ta */
/**
+9
View File
@@ -31,6 +31,15 @@ struct timeval
unsigned long tv_usec; /**< microseconds */
};
/**
* Timezone structure
*/
struct timezone
{
int tz_minuteswest; /**< minutes west of Greenwich */
int tz_dsttime; /**< type of DST correction */
};
int gettimeofday (void *tp, void *tzp);
#ifdef __cplusplus