Introduce APIs to make a Time object from 64bit time_t

Author: nobu

file.c

@@ -982,7 +982,7 @@ statx_atimespec(const rb_io_stat_data *st)
 static VALUE
 stat_time(const stat_timestamp ts)
 {
-    return rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
+    return rb_time64_nano_new(ts.tv_sec, ts.tv_nsec);
 }
 
 static VALUE

include/ruby/internal/intern/time.h

@@ -57,6 +57,11 @@ void rb_timespec_now(struct timespec *ts);
  * @return     An allocated instance of ::rb_cTime.
  */
 VALUE rb_time_new(time_t sec, long usec);
+#if (SIZEOF_INT64_T <= SIZEOF_TIME_T) && defined(NEGATIVE_TIME_T)
+# define rb_time64_new rb_time_new
+#else
+VALUE rb_time64_new(int64_t sec, long usec);
+#endif
 
 /**
  * Identical  to  rb_time_new(), except  it  accepts  the time  in  nanoseconds
@@ -68,6 +73,11 @@ VALUE rb_time_new(time_t sec, long usec);
  * @return     An allocated instance of ::rb_cTime.
  */
 VALUE rb_time_nano_new(time_t sec, long nsec);
+#if (SIZEOF_INT64_T <= SIZEOF_TIME_T) && defined(NEGATIVE_TIME_T)
+# define rb_time64_nano_new rb_time_nano_new
+#else
+VALUE rb_time64_nano_new(int64_t sec, long nsec);
+#endif
 
 RBIMPL_ATTR_NONNULL(())
 /**

time.c

@@ -645,7 +645,7 @@ split_second(wideval_t timew, wideval_t *timew_p, VALUE *subsecx_p)
 }
 
 static wideval_t
-timet2wv(time_t t)
+timet2wv(wideint_t t)
 {
 #if WIDEVALUE_IS_WIDER
     if (TIMET_MIN == 0) {
@@ -661,7 +661,7 @@ timet2wv(time_t t)
         }
     }
 #endif
-    return v2w(TIMET2NUM(t));
+    return WINT2WV(t);
 }
 #define TIMET2WV(t) timet2wv(t)
 
@@ -1981,7 +1981,7 @@ time_modify(VALUE time)
 }
 
 static wideval_t
-timenano2timew(time_t sec, long nsec)
+timenano2timew(wideint_t sec, long nsec)
 {
     wideval_t timew;
 
@@ -2760,9 +2760,9 @@ time_init_parse(rb_execution_context_t *ec, VALUE time, VALUE str, VALUE zone, V
 }
 
 static void
-subsec_normalize(time_t *secp, long *subsecp, const long maxsubsec)
+subsec_normalize(wideint_t *secp, long *subsecp, const long maxsubsec)
 {
-    time_t sec = *secp;
+    wideint_t sec = *secp;
     long subsec = *subsecp;
     long sec2;
 
@@ -2794,12 +2794,18 @@ subsec_normalize(time_t *secp, long *subsecp, const long maxsubsec)
 #define time_nsec_normalize(secp, nsecp) subsec_normalize(secp, nsecp, 1000000000)
 
 static wideval_t
-nsec2timew(time_t sec, long nsec)
+nsec2timew(wideint_t sec, long nsec)
 {
     time_nsec_normalize(&sec, &nsec);
     return timenano2timew(sec, nsec);
 }
 
+static wideint_t
+tv2wi(time_t t)
+{
+    return (wideint_t)t;
+}
+
 static VALUE
 time_new_timew(VALUE klass, wideval_t timew)
 {
@@ -2813,25 +2819,48 @@ time_new_timew(VALUE klass, wideval_t timew)
     return time;
 }
 
+#ifdef rb_time64_new
+#undef rb_time64_new
+static VALUE rb_time64_new(int64_t isec, long usec);
+#endif
 VALUE
 rb_time_new(time_t sec, long usec)
 {
+    return rb_time64_new(sec, usec);
+}
+
+VALUE
+rb_time64_new(int64_t isec, long usec)
+{
+    wideint_t sec = (wideint_t)isec;
     time_usec_normalize(&sec, &usec);
     return time_new_timew(rb_cTime, timenano2timew(sec, usec * 1000));
 }
 
 /* returns localtime time object */
+
+#ifdef rb_time64_nano_new
+#undef rb_time64_nano_new
+static VALUE rb_time64_nano_new(int64_t isec, long nsec);
+#endif
 VALUE
 rb_time_nano_new(time_t sec, long nsec)
 {
+    return rb_time64_nano_new(sec, nsec);
+}
+
+VALUE
+rb_time64_nano_new(int64_t isec, long nsec)
+{
+    wideint_t sec = (wideint_t)isec;
     return time_new_timew(rb_cTime, nsec2timew(sec, nsec));
 }
 
 VALUE
 rb_time_timespec_new(const struct timespec *ts, int offset)
 {
     struct time_object *tobj;
-    VALUE time = time_new_timew(rb_cTime, nsec2timew(ts->tv_sec, ts->tv_nsec));
+    VALUE time = time_new_timew(rb_cTime, nsec2timew(tv2wi(ts->tv_sec), ts->tv_nsec));
 
     if (-86400 < offset && offset <  86400) { /* fixoff */
         GetTimeval(time, tobj);