Fix system call related date builtin functions

LaszloLango · LaszloLango · commit 2723f180cd7e · 2016-02-11T12:40:54.000Z
Related issues: #213, #691 * Fixed 'ecma_date_local_tza' and 'ecma_date_daylight_saving_ta' date builtin helper functions * Added syscall of gettimeofday function to get the current system time and timezone. * Fixed related regression test files. JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-date.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-date.cpp
@@ -1,5 +1,5 @@
-/* Copyright 2015 Samsung Electronics Co., Ltd.
- * Copyright 2015 University of Szeged.
+/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
+ * Copyright 2015-2016 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include "ecma-alloc.h"
 #include "ecma-builtin-helpers.h"
 #include "ecma-conversion.h"
+#include "ecma-exceptions.h"
 #include "ecma-gc.h"
 #include "ecma-globals.h"
 #include "ecma-helpers.h"
@@ -453,8 +454,17 @@ ecma_builtin_date_now (ecma_value_t this_arg __attr_unused___) /**< this argumen
    *        Get the real system time. ex: gettimeofday() on Linux
    *        Introduce system macros at first.
    */
+  struct timeval tv;
   ecma_number_t *now_num_p = ecma_alloc_number ();
   *now_num_p = ECMA_NUMBER_ZERO;
+
+  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));
+
   return ecma_make_normal_completion_value (ecma_make_number_value (now_num_p));
 } /* ecma_builtin_date_now */
 
diff --git a/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.cpp b/jerry-core/ecma/builtin-objects/ecma-builtin-helpers-date.cpp
@@ -1,5 +1,5 @@
-/* Copyright 2015 Samsung Electronics Co., Ltd.
- * Copyright 2015 University of Szeged.
+/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
+ * Copyright 2015-2016 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@
 #include "fdlibm-math.h"
 #include "lit-char-helpers.h"
 
+#include <time.h>
+
 #ifndef CONFIG_ECMA_COMPACT_PROFILE_DISABLE_DATE_BUILTIN
 
 /** \addtogroup ecma ECMA
@@ -445,13 +447,14 @@ ecma_date_week_day (ecma_number_t time) /**< time value */
 ecma_number_t __attr_always_inline___
 ecma_date_local_tza ()
 {
-  /*
-   * FIXME:
-   *        Get the real system time. ex: localtime_r, gmtime_r, daylight on Linux
-   *        Introduce system macros at first.
-   */
-  TODO ("Implement time functions in jerry-libc.");
-  return ECMA_NUMBER_ZERO;
+  struct timezone tz;
+
+  if (gettimeofday (NULL, &tz) != 0)
+  {
+    return ecma_raise_type_error ("gettimeofday failed");
+  }
+
+  return tz.tz_minuteswest * -60000;
 } /* ecma_date_local_tza */
 
 /**
@@ -470,13 +473,14 @@ ecma_date_daylight_saving_ta (ecma_number_t time) /**< time value */
     return time; /* time is NaN */
   }
 
-  /*
-   * FIXME:
-   *        Get the real system time. ex: localtime_r, gmtime_r, daylight on Linux
-   *        Introduce system macros at first.
-   */
-  TODO ("Implement time functions in jerry-libc.");
-  return ECMA_NUMBER_ZERO;
+  struct timezone tz;
+
+  if (gettimeofday (NULL, &tz) != 0)
+  {
+    return ecma_raise_type_error ("gettimeofday failed");
+  }
+
+  return tz.tz_dsttime;
 } /* ecma_date_daylight_saving_ta */
 
 /**
@@ -1062,7 +1066,7 @@ ecma_date_value_to_string (ecma_number_t datetime_number) /**< datetime */
   /*
    * Character length of the result string.
    */
-  const uint32_t result_string_length = 33;
+  const uint32_t result_string_length = 34;
 
   lit_utf8_byte_t character_buffer[result_string_length];
   lit_utf8_byte_t *dest_p = character_buffer;
@@ -1082,10 +1086,19 @@ ecma_date_value_to_string (ecma_number_t datetime_number) /**< datetime */
   dest_p = ecma_date_value_to_string_common (dest_p, datetime_number);
 
   int32_t time_zone = (int32_t) (ecma_date_local_tza () + ecma_date_daylight_saving_ta (datetime_number));
-  *dest_p++ = (time_zone >= 0) ? LIT_CHAR_PLUS : LIT_CHAR_MINUS;
+  if (time_zone >= 0)
+  {
+    *dest_p++ = LIT_CHAR_PLUS;
+  }
+  else
+  {
+    *dest_p++ = LIT_CHAR_MINUS;
+    time_zone = -time_zone;
+  }
 
-  dest_p = ecma_date_value_number_to_bytes (dest_p, time_zone / 60, 2);
-  dest_p = ecma_date_value_number_to_bytes (dest_p, time_zone % 60, 2);
+  dest_p = ecma_date_value_number_to_bytes (dest_p, time_zone / 3600000, 2);
+  *dest_p++ = LIT_CHAR_COLON;
+  dest_p = ecma_date_value_number_to_bytes (dest_p, time_zone % 3600000, 2);
 
   JERRY_ASSERT ((uint32_t) (dest_p - character_buffer) == result_string_length);
 
diff --git a/jerry-libc/include/time.h b/jerry-libc/include/time.h
@@ -0,0 +1,37 @@
+/* Copyright 2016 Samsung Electronics Co., Ltd.
+ * Copyright 2016 University of Szeged
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef JERRY_LIBC_TIME_H
+#define JERRY_LIBC_TIME_H
+
+#ifdef __cplusplus
+# define EXTERN_C "C"
+#else /* !__cplusplus */
+# define EXTERN_C
+#endif /* !__cplusplus */
+
+/**
+ * Timezone structure
+ */
+struct timezone
+{
+  int tz_minuteswest; /**< minutes west of Greenwich */
+  int tz_dsttime;     /**< type of DST correction */
+};
+
+extern EXTERN_C int gettimeofday (void *tp, void *tzp);
+
+#endif /* !JERRY_LIBC_TIME_H */
diff --git a/jerry-libc/target/darwin/jerry-libc-target.c b/jerry-libc/target/darwin/jerry-libc-target.c
@@ -1,4 +1,5 @@
-/* Copyright 2014-2015 Samsung Electronics Co., Ltd.
+/* Copyright 2014-2016 Samsung Electronics Co., Ltd.
+ * Copyright 2016 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +29,7 @@
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include "jerry-libc-defs.h"
 
@@ -384,3 +386,12 @@ fwrite (const void *ptr, /**< data to write */
   return bytes_written / size;
 } /* fwrite */
 
+/**
+ * This function can get the time as well as a timezone.
+ */
+int
+gettimeofday (void *tp,  /**< struct timeval */
+              void *tzp) /**< struct timezone */
+{
+  return (int) syscall_2 (__NR_gettimeofday, (long int) tp, (long int) tzp);
+} /* gettimeofday */
diff --git a/jerry-libc/target/linux/jerry-libc-target.c b/jerry-libc/target/linux/jerry-libc-target.c
@@ -1,4 +1,5 @@
-/* Copyright 2014-2015 Samsung Electronics Co., Ltd.
+/* Copyright 2014-2016 Samsung Electronics Co., Ltd.
+ * Copyright 2016 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,6 +29,7 @@
 #include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <time.h>
 
 #include "jerry-libc-defs.h"
 
@@ -384,6 +386,16 @@ fwrite (const void *ptr, /**< data to write */
   return bytes_written / size;
 } /* fwrite */
 
+/**
+ * This function can get the time as well as a timezone.
+ */
+int
+gettimeofday (void *tp,  /**< struct timeval */
+              void *tzp) /**< struct timezone */
+{
+  return (int) syscall_2 (__NR_gettimeofday, (long int) tp, (long int) tzp);
+} /* gettimeofday */
+
 // FIXME
 #if 0
 /**
diff --git a/jerry-libc/target/mcu-stubs/jerry-libc-target.c b/jerry-libc/target/mcu-stubs/jerry-libc-target.c
@@ -1,4 +1,5 @@
-/* Copyright 2015 Samsung Electronics Co., Ltd.
+/* Copyright 2015-2016 Samsung Electronics Co., Ltd.
+ * Copyright 2016 University of Szeged.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include "jerry-libc-defs.h"
 
@@ -61,3 +63,12 @@ fwrite (const void *ptr __attr_unused___, /**< data to write */
   return size * nmemb;
 } /* fwrite */
 
+/**
+ * This function can get the time as well as a timezone.
+ */
+int
+gettimeofday (void *tp __attr_unused___,  /**< struct timeval */
+              void *tzp __attr_unused___) /**< struct timezone */
+{
+  return 0;
+} /* gettimeofday */
diff --git a/tests/jerry/date-annexb.js b/tests/jerry/date-annexb.js
@@ -1,5 +1,5 @@
-// Copyright 2015 Samsung Electronics Co., Ltd.
-// Copyright 2015 University of Szeged.
+// Copyright 2015-2016 Samsung Electronics Co., Ltd.
+// Copyright 2015-2016 University of Szeged.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -40,8 +40,7 @@ assert (d.getFullYear() === 2004 && d.getMonth() === 1 && d.getDate() === 29);
 d.setYear(2015);
 assert (d.getFullYear() === 2015 && d.getMonth() === 2 && d.getDate() === 1);
 
-d = new Date(2015, 8, 17);
-assert (d.toGMTString() === "Thu, 17 Sep 2015 00:00:00 GMT");
+assert (/Thu, 17 Sep 2015 \d{2}:\d{2}:\d{2} GMT/.test (new Date("2015-09-17").toGMTString()));
 
 d = new Date(NaN);
 assert (d.toGMTString() === "Invalid Date");
diff --git a/tests/jerry/date-construct.js b/tests/jerry/date-construct.js
@@ -1,5 +1,5 @@
-// Copyright 2015 Samsung Electronics Co., Ltd.
-// Copyright 2015 University of Szeged.
+// Copyright 2015-2016 Samsung Electronics Co., Ltd.
+// Copyright 2015-2016 University of Szeged.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ d = new Date(1420070400000);
 assert (d.valueOf() == 1420070400000);
 
 d = new Date(2015,0,1,0,0,0,0);
-assert (d.valueOf() == 1420070400000);
+assert (d.valueOf() - (d.getTimezoneOffset() * 60000) == 1420070400000);
 
 d = new Date(8.64e+15);
 assert (d.valueOf() == 8.64e+15);
@@ -80,6 +80,3 @@ catch (e)
 assert (typeof Date (2015) == "string");
 assert (typeof Date() != typeof (new Date ()));
 assert (Date (Number.NaN) == Date ());
-
-// Fixme: remove this case when Date() gives the current time.
-assert (Date (2015,1,2) == "Thu Jan 01 1970 00:00:00 GMT+0000");
diff --git a/tests/jerry/date-tostring.js b/tests/jerry/date-tostring.js
@@ -1,5 +1,5 @@
-// Copyright 2015 Samsung Electronics Co., Ltd.
-// Copyright 2015 University of Szeged.
+// Copyright 2015-2016 Samsung Electronics Co., Ltd.
+// Copyright 2015-2016 University of Szeged.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ assert (new Date (2015, 7, 1, 0, Infinity, 0) == "Invalid Date");
 assert (new Date (NaN, 1, 1, 0, 0, 0) == "Invalid Date");
 assert (new Date (2015, NaN, 1, 0, 0, 0) == "Invalid Date");
 assert (new Date (2015, 7, 1, 0, NaN, 0) == "Invalid Date");
-assert (new Date ("2015-02-13") == "Fri Feb 13 2015 00:00:00 GMT+0000");
-assert (new Date ("2015-07-08T11:29:05.023") == "Wed Jul 08 2015 11:29:05 GMT+0000");
+assert (/Fri Feb 13 2015 \d{2}:\d{2}:\d{2} GMT\+\d{2}:\d{2}/.test (new Date ("2015-02-13")));
+assert (/Wed Jul 08 2015 \d{2}:\d{2}:\d{2} GMT\+\d{2}:\d{2}/.test (new Date ("2015-07-08T11:29:05.023")));
 
 try
 {
@@ -35,12 +35,12 @@ catch (e)
 }
 
 var date = new Date(0);
-assert (date.toString() === "Thu Jan 01 1970 00:00:00 GMT+0000");
+assert (/Thu Jan 01 1970 \d{2}:\d{2}:\d{2} GMT\+\d{2}:\d{2}/.test (date.toString()));
 assert (date.toUTCString() === "Thu, 01 Jan 1970 00:00:00 GMT");
 assert (date.toISOString() === "1970-01-01T00:00:00.000Z");
 
 date = new Date("2015-08-12T09:40:20.000Z")
-assert (date.toString() === "Wed Aug 12 2015 09:40:20 GMT+0000");
+assert (/Wed Aug 12 2015 \d{2}:\d{2}:\d{2} GMT\+\d{2}:\d{2}/.test (date.toString()));
 assert (date.toUTCString() === "Wed, 12 Aug 2015 09:40:20 GMT");
 assert (date.toISOString() === "2015-08-12T09:40:20.000Z");
 
@@ -147,8 +147,4 @@ assert (Date () == (new Date ()).toString ());
 assert (Date (2015, 1, 1) == (new Date ()).toString ());
 assert (Date (Number.NaN) == Date ());
 
-// Fixme: remove these cases when TZA and DST are supported.
-assert (new Date ("2015-07-08T11:29:05.023-02:00").toString () == "Wed Jul 08 2015 13:29:05 GMT+0000");
-assert (new Date ("2015-07-08T11:29:05.023-02:00").toLocaleString () == "Wed Jul 08 2015 13:29:05 GMT+0000");
-
 assert (new Date ("2015-07-08T11:29:05.023Z").toISOString() == "2015-07-08T11:29:05.023Z");
diff --git a/tests/unit/test-common.h b/tests/unit/test-common.h
@@ -24,8 +24,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <sys/time.h>
-
 
 /**
  * Verify that unit tests are built with all debug checks enabled
