2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
time.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Tue Dec 28 14:31:59 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <time.h>
|
2008-04-21 05:07:00 +04:00
|
|
|
#include <errno.h>
|
2008-02-29 12:19:15 +03:00
|
|
|
#include "ruby/encoding.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
2002-09-17 17:52:45 +04:00
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
#include <float.h>
|
2001-12-21 12:23:28 +03:00
|
|
|
#include <math.h>
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
#include "timev.h"
|
|
|
|
|
2009-03-10 22:47:46 +03:00
|
|
|
#ifndef TYPEOF_TIMEVAL_TV_SEC
|
|
|
|
# define TYPEOF_TIMEVAL_TV_SEC time_t
|
|
|
|
#endif
|
2009-04-22 04:27:33 +04:00
|
|
|
#ifndef TYPEOF_TIMEVAL_TV_USEC
|
|
|
|
# if INT_MAX >= 1000000
|
|
|
|
# define TYPEOF_TIMEVAL_TV_USEC int
|
|
|
|
# else
|
|
|
|
# define TYPEOF_TIMEVAL_TV_USEC long
|
|
|
|
# endif
|
|
|
|
#endif
|
2009-03-10 22:47:46 +03:00
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
#if SIZEOF_TIME_T == SIZEOF_LONG
|
|
|
|
typedef unsigned long unsigned_time_t;
|
|
|
|
#elif SIZEOF_TIME_T == SIZEOF_INT
|
|
|
|
typedef unsigned int unsigned_time_t;
|
|
|
|
#elif SIZEOF_TIME_T == SIZEOF_LONG_LONG
|
|
|
|
typedef unsigned LONG_LONG unsigned_time_t;
|
|
|
|
#else
|
|
|
|
# error cannot find integer type which size is same as time_t.
|
|
|
|
#endif
|
|
|
|
|
2009-08-29 22:18:37 +04:00
|
|
|
#define TIMET_MAX (~(time_t)0 <= 0 ? (time_t)((~(unsigned_time_t)0) >> 1) : (~(unsigned_time_t)0))
|
|
|
|
#define TIMET_MIN (~(time_t)0 <= 0 ? (time_t)(((unsigned_time_t)1) << (sizeof(time_t) * CHAR_BIT - 1)) : (time_t)0)
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cTime;
|
2006-07-27 13:14:38 +04:00
|
|
|
static VALUE time_utc_offset _((VALUE));
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
static int obj2int(VALUE obj);
|
2009-05-12 16:07:49 +04:00
|
|
|
static VALUE obj2vint(VALUE obj);
|
|
|
|
static int month_arg(VALUE arg);
|
2009-07-01 16:11:53 +04:00
|
|
|
static void validate_utc_offset(VALUE utc_offset);
|
2009-05-12 16:07:49 +04:00
|
|
|
static void validate_vtm(struct vtm *vtm);
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static VALUE time_gmtime(VALUE);
|
|
|
|
static VALUE time_localtime(VALUE);
|
2009-05-12 16:07:49 +04:00
|
|
|
static VALUE time_fixoff(VALUE);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static time_t timegm_noleapsecond(struct tm *tm);
|
|
|
|
static int tmcmp(struct tm *a, struct tm *b);
|
|
|
|
static int vtmcmp(struct vtm *a, struct vtm *b);
|
2009-04-21 19:32:19 +04:00
|
|
|
static const char *find_time_t(struct tm *tptr, int utc_p, time_t *tp);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
static struct vtm *localtimexv(VALUE timexv, struct vtm *result);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
static int leap_year_p(long y);
|
2009-05-12 16:07:49 +04:00
|
|
|
#define leap_year_v_p(y) leap_year_p(NUM2LONG(mod(v, INT2FIX(400))))
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
#define NDIV(x,y) (-(-((x)+1)/(y))-1)
|
|
|
|
#define NMOD(x,y) ((y)-(-((x)+1)%(y))-1)
|
|
|
|
#define DIV(n,d) ((n)<0 ? NDIV((n),(d)) : (n)/(d))
|
|
|
|
|
|
|
|
#ifdef HAVE_GMTIME_R
|
|
|
|
#define IF_HAVE_GMTIME_R(x) x
|
|
|
|
#define ASCTIME(tm, buf) asctime_r((tm), (buf))
|
|
|
|
#define GMTIME(tm, result) gmtime_r((tm), &(result))
|
|
|
|
#define LOCALTIME(tm, result) (tzset(),localtime_r((tm), &(result)))
|
|
|
|
#else
|
|
|
|
#define IF_HAVE_GMTIME_R(x) /* nothing */
|
|
|
|
#define ASCTIME(tm, buf) asctime(tm)
|
2009-05-25 22:41:32 +04:00
|
|
|
#define GMTIME(tm, result) rb_gmtime((tm), &(result))
|
|
|
|
#define LOCALTIME(tm, result) rb_localtime((tm), &(result))
|
|
|
|
|
|
|
|
static inline struct tm *
|
|
|
|
rb_gmtime(const time_t *tm, struct tm *result)
|
|
|
|
{
|
|
|
|
struct tm *t = gmtime(tm);
|
|
|
|
if (t) *result = *t;
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct tm *
|
|
|
|
rb_localtime(const time_t *tm, struct tm *result)
|
|
|
|
{
|
|
|
|
struct tm *t = localtime(tm);
|
|
|
|
if (t) *result = *t;
|
|
|
|
return t;
|
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
static ID id_divmod, id_mul, id_submicro, id_subnano;
|
|
|
|
static ID id_eq, id_ne, id_quo, id_div, id_cmp, id_lshift;
|
|
|
|
|
2009-08-30 05:26:56 +04:00
|
|
|
#define eq(x,y) (RTEST(rb_funcall((x), id_eq, 1, (y))))
|
|
|
|
#define ne(x,y) (RTEST(rb_funcall((x), id_ne, 1, (y))))
|
2009-04-21 18:56:59 +04:00
|
|
|
#define lt(x,y) (RTEST(rb_funcall((x), '<', 1, (y))))
|
|
|
|
#define gt(x,y) (RTEST(rb_funcall((x), '>', 1, (y))))
|
|
|
|
#define le(x,y) (!gt(x,y))
|
|
|
|
#define ge(x,y) (!lt(x,y))
|
2009-08-30 05:26:56 +04:00
|
|
|
|
|
|
|
static VALUE
|
|
|
|
add(VALUE x, VALUE y)
|
|
|
|
{
|
2009-08-30 08:01:42 +04:00
|
|
|
if (FIXNUM_P(x) && FIXNUM_P(y)) {
|
|
|
|
long l = FIX2LONG(x) + FIX2LONG(y);
|
|
|
|
if (FIXABLE(l)) return LONG2FIX(l);
|
|
|
|
return LONG2NUM(l);
|
2009-08-30 05:26:56 +04:00
|
|
|
}
|
2009-08-30 08:01:42 +04:00
|
|
|
if (TYPE(x) == T_BIGNUM) return rb_big_plus(x, y);
|
|
|
|
return rb_funcall(x, '+', 1, y);
|
2009-08-30 05:26:56 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sub(VALUE x, VALUE y)
|
|
|
|
{
|
2009-08-30 08:01:42 +04:00
|
|
|
if (FIXNUM_P(x) && FIXNUM_P(y)) {
|
|
|
|
long l = FIX2LONG(x) - FIX2LONG(y);
|
|
|
|
if (FIXABLE(l)) return LONG2FIX(l);
|
|
|
|
return LONG2NUM(l);
|
2009-08-30 05:26:56 +04:00
|
|
|
}
|
2009-08-30 08:01:42 +04:00
|
|
|
if (TYPE(x) == T_BIGNUM) return rb_big_minus(x, y);
|
|
|
|
return rb_funcall(x, '-', 1, y);
|
2009-08-30 05:26:56 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
mul(VALUE x, VALUE y)
|
|
|
|
{
|
2009-08-30 08:01:42 +04:00
|
|
|
if (FIXNUM_P(x) && FIXNUM_P(y)) {
|
|
|
|
#if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
|
|
|
|
LONG_LONG ll = (LONG_LONG)FIX2LONG(x) * FIX2LONG(y);
|
|
|
|
if (FIXABLE(ll)) return LONG2FIX(ll);
|
|
|
|
return LL2NUM(ll);
|
|
|
|
#else
|
|
|
|
long a, b, c;
|
|
|
|
a = FIX2LONG(x);
|
|
|
|
if (a == 0) return x;
|
|
|
|
b = FIX2LONG(y);
|
|
|
|
c = a * b;
|
|
|
|
if (c / a == b && FIXABLE(c)) return LONG2FIX(c);
|
|
|
|
#endif
|
2009-08-30 05:26:56 +04:00
|
|
|
}
|
2009-08-30 08:01:42 +04:00
|
|
|
if (TYPE(x) == T_BIGNUM) return rb_big_mul(x, y);
|
|
|
|
return rb_funcall(x, '*', 1, y);
|
2009-08-30 05:26:56 +04:00
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
#define div(x,y) (rb_funcall((x), id_div, 1, (y)))
|
2009-08-30 05:26:56 +04:00
|
|
|
|
|
|
|
static VALUE
|
|
|
|
mod(VALUE x, VALUE y)
|
|
|
|
{
|
|
|
|
switch (TYPE(x)) {
|
|
|
|
case T_BIGNUM: return rb_big_modulo(x, y);
|
|
|
|
default: return rb_funcall(x, '%', 1, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
#define neg(x) (sub(INT2FIX(0), (x)))
|
|
|
|
#define cmp(x,y) (rb_funcall((x), id_cmp, 1, (y)))
|
|
|
|
#define lshift(x,y) (rb_funcall((x), id_lshift, 1, (y)))
|
|
|
|
|
2009-07-02 00:17:00 +04:00
|
|
|
static VALUE
|
|
|
|
quo(VALUE x, VALUE y)
|
|
|
|
{
|
|
|
|
VALUE ret;
|
|
|
|
ret = rb_funcall((x), id_quo, 1, (y));
|
|
|
|
if (TYPE(ret) == T_RATIONAL &&
|
|
|
|
((struct RRational *)ret)->den == INT2FIX(1)) {
|
|
|
|
ret = ((struct RRational *)ret)->num;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
#define mulquo(x,y,z) ((y == z) ? x : quo(mul(x,y),z))
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static void
|
|
|
|
divmodv(VALUE n, VALUE d, VALUE *q, VALUE *r)
|
|
|
|
{
|
|
|
|
VALUE tmp, ary;
|
|
|
|
tmp = rb_funcall(n, id_divmod, 1, d);
|
|
|
|
ary = rb_check_array_type(tmp);
|
|
|
|
if (NIL_P(ary)) {
|
|
|
|
rb_raise(rb_eTypeError, "unexpected divmod result: into %s",
|
|
|
|
rb_obj_classname(tmp));
|
|
|
|
}
|
|
|
|
*q = rb_ary_entry(ary, 0);
|
|
|
|
*r = rb_ary_entry(ary, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
num_exact(VALUE v)
|
|
|
|
{
|
|
|
|
switch (TYPE(v)) {
|
|
|
|
case T_FIXNUM:
|
|
|
|
case T_BIGNUM:
|
|
|
|
case T_RATIONAL:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case T_FLOAT:
|
2009-07-02 00:38:57 +04:00
|
|
|
v = rb_convert_type(v, T_RATIONAL, "Rational", "to_r");
|
2009-04-21 18:56:59 +04:00
|
|
|
break;
|
|
|
|
|
2009-12-04 10:37:10 +03:00
|
|
|
case T_STRING:
|
2009-04-21 18:56:59 +04:00
|
|
|
case T_NIL:
|
|
|
|
goto typeerror;
|
|
|
|
|
2009-07-02 03:04:46 +04:00
|
|
|
default: {
|
2009-04-21 18:56:59 +04:00
|
|
|
VALUE tmp;
|
2009-12-04 10:37:10 +03:00
|
|
|
if (!NIL_P(tmp = rb_check_convert_type(v, T_RATIONAL, "Rational", "to_r"))) {
|
|
|
|
if (rb_respond_to(v, rb_intern("to_str"))) goto typeerror;
|
2009-04-21 18:56:59 +04:00
|
|
|
v = tmp;
|
2009-12-04 10:37:10 +03:00
|
|
|
}
|
2009-07-02 03:04:46 +04:00
|
|
|
else if (!NIL_P(tmp = rb_check_to_integer(v, "to_int")))
|
2009-04-21 18:56:59 +04:00
|
|
|
v = tmp;
|
|
|
|
else {
|
|
|
|
typeerror:
|
|
|
|
rb_raise(rb_eTypeError, "can't convert %s into an exact number",
|
2009-12-04 10:37:10 +03:00
|
|
|
NIL_P(v) ? "nil" : rb_obj_classname(v));
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
static VALUE
|
|
|
|
rb_time_magnify(VALUE v)
|
|
|
|
{
|
|
|
|
return mul(v, INT2FIX(TIME_SCALE));
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_time_unmagnify(VALUE v)
|
|
|
|
{
|
|
|
|
return quo(v, INT2FIX(TIME_SCALE));
|
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static const int common_year_yday_offset[] = {
|
|
|
|
-1,
|
|
|
|
-1 + 31,
|
|
|
|
-1 + 31 + 28,
|
|
|
|
-1 + 31 + 28 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
|
|
|
|
/* 1 2 3 4 5 6 7 8 9 10 11 */
|
|
|
|
};
|
|
|
|
static const int leap_year_yday_offset[] = {
|
|
|
|
-1,
|
|
|
|
-1 + 31,
|
|
|
|
-1 + 31 + 29,
|
|
|
|
-1 + 31 + 29 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
|
|
|
|
-1 + 31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30
|
|
|
|
/* 1 2 3 4 5 6 7 8 9 10 11 */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const int common_year_days_in_month[] = {
|
|
|
|
31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
|
|
|
|
};
|
|
|
|
static const int leap_year_days_in_month[] = {
|
|
|
|
31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
2009-08-29 23:06:29 +04:00
|
|
|
timegmxv_noleapsecond(struct vtm *vtm)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
|
|
|
VALUE year1900;
|
|
|
|
VALUE q400, r400;
|
|
|
|
int year_mod400;
|
|
|
|
int yday = vtm->mday;
|
|
|
|
long days_in400;
|
|
|
|
VALUE ret;
|
|
|
|
|
|
|
|
year1900 = sub(vtm->year, INT2FIX(1900));
|
|
|
|
|
|
|
|
divmodv(year1900, INT2FIX(400), &q400, &r400);
|
|
|
|
year_mod400 = NUM2INT(r400);
|
|
|
|
|
|
|
|
if (leap_year_p(year_mod400 + 1900))
|
|
|
|
yday += leap_year_yday_offset[vtm->mon-1];
|
|
|
|
else
|
|
|
|
yday += common_year_yday_offset[vtm->mon-1];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* `Seconds Since the Epoch' in SUSv3:
|
|
|
|
* tm_sec + tm_min*60 + tm_hour*3600 + tm_yday*86400 +
|
|
|
|
* (tm_year-70)*31536000 + ((tm_year-69)/4)*86400 -
|
|
|
|
* ((tm_year-1)/100)*86400 + ((tm_year+299)/400)*86400
|
|
|
|
*/
|
|
|
|
ret = LONG2NUM(vtm->sec
|
|
|
|
+ vtm->min*60
|
|
|
|
+ vtm->hour*3600);
|
|
|
|
days_in400 = yday
|
|
|
|
- 70*365
|
|
|
|
+ DIV(year_mod400 - 69, 4)
|
|
|
|
- DIV(year_mod400 - 1, 100)
|
|
|
|
+ (year_mod400 + 299) / 400;
|
|
|
|
ret = add(ret, mul(LONG2NUM(days_in400), INT2FIX(86400)));
|
|
|
|
ret = add(ret, mul(q400, INT2FIX(97*86400)));
|
|
|
|
ret = add(ret, mul(year1900, INT2FIX(365*86400)));
|
2009-08-29 23:06:29 +04:00
|
|
|
ret = add(rb_time_magnify(ret), vtm->subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static st_table *zone_table;
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
zone_str(const char *s)
|
|
|
|
{
|
|
|
|
st_data_t k, v;
|
|
|
|
|
|
|
|
if (!zone_table)
|
|
|
|
zone_table = st_init_strtable();
|
|
|
|
|
|
|
|
k = (st_data_t)s;
|
|
|
|
if (st_lookup(zone_table, k, &v)) {
|
|
|
|
return (const char *)v;
|
|
|
|
}
|
|
|
|
s = strdup(s);
|
|
|
|
k = (st_data_t)s;
|
|
|
|
st_add_direct(zone_table, k, k);
|
|
|
|
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-08-29 23:06:29 +04:00
|
|
|
gmtimexv_noleapsecond(VALUE timexv, struct vtm *vtm)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
|
|
|
VALUE v;
|
|
|
|
int i, n, x, y;
|
|
|
|
const int *yday_offset;
|
|
|
|
int wday;
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timev;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
vtm->isdst = 0;
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
divmodv(timexv, INT2FIX(TIME_SCALE), &timev, &vtm->subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
divmodv(timev, INT2FIX(86400), &timev, &v);
|
|
|
|
|
|
|
|
wday = NUM2INT(mod(timev, INT2FIX(7)));
|
|
|
|
vtm->wday = (wday + 4) % 7;
|
|
|
|
|
|
|
|
n = NUM2INT(v);
|
|
|
|
vtm->sec = n % 60; n = n / 60;
|
|
|
|
vtm->min = n % 60; n = n / 60;
|
|
|
|
vtm->hour = n;
|
|
|
|
|
|
|
|
/* 97 leap days in the 400 year cycle */
|
|
|
|
divmodv(timev, INT2FIX(400*365 + 97), &timev, &v);
|
|
|
|
vtm->year = mul(timev, INT2FIX(400));
|
|
|
|
|
|
|
|
/* n is the days in the 400 year cycle.
|
|
|
|
* the start of the cycle is 1970-01-01. */
|
|
|
|
|
|
|
|
n = NUM2INT(v);
|
|
|
|
y = 1970;
|
|
|
|
|
|
|
|
/* 30 years including 7 leap days (1972, 1976, ... 1996),
|
|
|
|
* 31 days in January 2000 and
|
2009-11-03 20:46:28 +03:00
|
|
|
* 29 days in February 2000
|
2009-04-21 18:56:59 +04:00
|
|
|
* from 1970-01-01 to 2000-02-29 */
|
|
|
|
if (30*365+7+31+29-1 <= n) {
|
|
|
|
/* 2000-02-29 or after */
|
|
|
|
if (n < 31*365+8) {
|
|
|
|
/* 2000-02-29 to 2000-12-31 */
|
|
|
|
y += 30;
|
|
|
|
n -= 30*365+7;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* 2001-01-01 or after */
|
|
|
|
n -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
x = n / (365*100 + 24);
|
|
|
|
n = n % (365*100 + 24);
|
|
|
|
y += x * 100;
|
|
|
|
if (30*365+7+31+29-1 <= n) {
|
|
|
|
if (n < 31*365+7) {
|
|
|
|
y += 30;
|
|
|
|
n -= 30*365+7;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
n += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
x = n / (365*4 + 1);
|
|
|
|
n = n % (365*4 + 1);
|
|
|
|
y += x * 4;
|
|
|
|
if (365*2+31+29-1 <= n) {
|
|
|
|
if (n < 365*2+366) {
|
|
|
|
y += 2;
|
|
|
|
n -= 365*2;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
n -= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
x = n / 365;
|
|
|
|
n = n % 365;
|
|
|
|
y += x;
|
|
|
|
|
|
|
|
found:
|
|
|
|
vtm->yday = n+1;
|
|
|
|
vtm->year = add(vtm->year, INT2NUM(y));
|
|
|
|
|
|
|
|
if (leap_year_p(y))
|
|
|
|
yday_offset = leap_year_yday_offset;
|
|
|
|
else
|
|
|
|
yday_offset = common_year_yday_offset;
|
|
|
|
|
|
|
|
for (i = 0; i < 12; i++) {
|
|
|
|
if (yday_offset[i] < n) {
|
|
|
|
vtm->mon = i+1;
|
|
|
|
vtm->mday = n - yday_offset[i];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
vtm->utc_offset = INT2FIX(0);
|
|
|
|
vtm->zone = "UTC";
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct tm *
|
|
|
|
gmtime_with_leapsecond(const time_t *timep, struct tm *result)
|
|
|
|
{
|
|
|
|
#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
|
|
|
|
/* 4.4BSD counts leap seconds only with localtime, not with gmtime. */
|
|
|
|
struct tm *t;
|
|
|
|
int sign;
|
2009-09-23 08:16:41 +04:00
|
|
|
int gmtoff_sec, gmtoff_min, gmtoff_hour, gmtoff_day;
|
|
|
|
long gmtoff;
|
2009-04-21 18:56:59 +04:00
|
|
|
t = localtime_r(timep, result);
|
|
|
|
if (t == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* subtract gmtoff */
|
|
|
|
if (t->tm_gmtoff < 0) {
|
|
|
|
sign = 1;
|
|
|
|
gmtoff = -t->tm_gmtoff;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sign = -1;
|
|
|
|
gmtoff = t->tm_gmtoff;
|
|
|
|
}
|
2009-09-23 08:16:41 +04:00
|
|
|
gmtoff_sec = (int)(gmtoff % 60);
|
2009-04-21 18:56:59 +04:00
|
|
|
gmtoff = gmtoff / 60;
|
2009-09-23 08:16:41 +04:00
|
|
|
gmtoff_min = (int)(gmtoff % 60);
|
2009-04-21 18:56:59 +04:00
|
|
|
gmtoff = gmtoff / 60;
|
2009-09-23 08:16:41 +04:00
|
|
|
gmtoff_hour = (int)gmtoff; /* <= 12 */
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
gmtoff_sec *= sign;
|
|
|
|
gmtoff_min *= sign;
|
|
|
|
gmtoff_hour *= sign;
|
|
|
|
|
|
|
|
gmtoff_day = 0;
|
|
|
|
|
|
|
|
if (gmtoff_sec) {
|
|
|
|
/* If gmtoff_sec == 0, don't change result->tm_sec.
|
|
|
|
* It may be 60 which is a leap second. */
|
|
|
|
result->tm_sec += gmtoff_sec;
|
|
|
|
if (result->tm_sec < 0) {
|
|
|
|
result->tm_sec += 60;
|
|
|
|
gmtoff_min -= 1;
|
|
|
|
}
|
|
|
|
if (60 <= result->tm_sec) {
|
|
|
|
result->tm_sec -= 60;
|
|
|
|
gmtoff_min += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (gmtoff_min) {
|
|
|
|
result->tm_min += gmtoff_min;
|
|
|
|
if (result->tm_min < 0) {
|
|
|
|
result->tm_min += 60;
|
|
|
|
gmtoff_hour -= 1;
|
|
|
|
}
|
|
|
|
if (60 <= result->tm_min) {
|
|
|
|
result->tm_min -= 60;
|
|
|
|
gmtoff_hour += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (gmtoff_hour) {
|
|
|
|
result->tm_hour += gmtoff_hour;
|
|
|
|
if (result->tm_hour < 0) {
|
|
|
|
result->tm_hour += 24;
|
|
|
|
gmtoff_day = -1;
|
|
|
|
}
|
|
|
|
if (24 <= result->tm_hour) {
|
|
|
|
result->tm_hour -= 24;
|
|
|
|
gmtoff_day = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (gmtoff_day) {
|
|
|
|
if (gmtoff_day < 0) {
|
|
|
|
if (result->tm_yday == 0) {
|
|
|
|
result->tm_mday = 31;
|
|
|
|
result->tm_mon = 11; /* December */
|
|
|
|
result->tm_year--;
|
|
|
|
result->tm_yday = leap_year_p(result->tm_year + 1900) ? 365 : 364;
|
|
|
|
}
|
|
|
|
else if (result->tm_mday == 1) {
|
|
|
|
const int *days_in_month = leap_year_p(result->tm_year + 1900) ?
|
|
|
|
leap_year_days_in_month :
|
|
|
|
common_year_days_in_month;
|
|
|
|
result->tm_mon--;
|
|
|
|
result->tm_mday = days_in_month[result->tm_mon];
|
|
|
|
result->tm_yday--;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
result->tm_mday--;
|
|
|
|
result->tm_yday--;
|
|
|
|
}
|
|
|
|
result->tm_wday = (result->tm_wday + 6) % 7;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int leap = leap_year_p(result->tm_year + 1900);
|
|
|
|
if (result->tm_yday == (leap ? 365 : 364)) {
|
|
|
|
result->tm_year++;
|
|
|
|
result->tm_mon = 0; /* January */
|
|
|
|
result->tm_mday = 1;
|
|
|
|
result->tm_yday = 0;
|
|
|
|
}
|
|
|
|
else if (result->tm_mday == (leap ? leap_year_days_in_month :
|
|
|
|
common_year_days_in_month)[result->tm_mon]) {
|
|
|
|
result->tm_mon++;
|
|
|
|
result->tm_mday = 1;
|
|
|
|
result->tm_yday++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
result->tm_mday++;
|
|
|
|
result->tm_yday++;
|
|
|
|
}
|
|
|
|
result->tm_wday = (result->tm_wday + 1) % 7;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result->tm_isdst = 0;
|
|
|
|
result->tm_gmtoff = 0;
|
|
|
|
#if defined(HAVE_TM_ZONE)
|
2009-04-22 04:27:33 +04:00
|
|
|
result->tm_zone = (char *)"UTC";
|
2009-04-21 18:56:59 +04:00
|
|
|
#endif
|
|
|
|
return result;
|
|
|
|
#else
|
|
|
|
return GMTIME(timep, *result);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static long this_year = 0;
|
|
|
|
static time_t known_leap_seconds_limit;
|
|
|
|
static int number_of_leap_seconds_known;
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_leap_second_info()
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* leap seconds are determined by IERS.
|
|
|
|
* It is announced 6 months before the leap second.
|
|
|
|
* So no one knows leap seconds in the future after the next year.
|
|
|
|
*/
|
|
|
|
if (this_year == 0) {
|
2009-08-29 22:18:37 +04:00
|
|
|
time_t now;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct tm *tm, result;
|
|
|
|
struct vtm vtm;
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timexv;
|
2009-04-21 18:56:59 +04:00
|
|
|
now = time(NULL);
|
|
|
|
gmtime(&now);
|
|
|
|
tm = gmtime_with_leapsecond(&now, &result);
|
2009-07-22 19:09:50 +04:00
|
|
|
if (!tm) return;
|
2009-04-21 18:56:59 +04:00
|
|
|
this_year = tm->tm_year;
|
|
|
|
|
2009-08-29 22:18:37 +04:00
|
|
|
if (TIMET_MAX - now < (time_t)(366*86400))
|
|
|
|
known_leap_seconds_limit = TIMET_MAX;
|
2009-04-21 18:56:59 +04:00
|
|
|
else
|
|
|
|
known_leap_seconds_limit = now + (time_t)(366*86400);
|
|
|
|
|
|
|
|
gmtime_with_leapsecond(&known_leap_seconds_limit, &result);
|
|
|
|
|
|
|
|
vtm.year = LONG2NUM(result.tm_year + 1900);
|
|
|
|
vtm.mon = result.tm_mon + 1;
|
|
|
|
vtm.mday = result.tm_mday;
|
|
|
|
vtm.hour = result.tm_hour;
|
|
|
|
vtm.min = result.tm_min;
|
|
|
|
vtm.sec = result.tm_sec;
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm.subsecx = INT2FIX(0);
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm.utc_offset = INT2FIX(0);
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = timegmxv_noleapsecond(&vtm);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
number_of_leap_seconds_known = NUM2INT(sub(TIMET2NUM(known_leap_seconds_limit), rb_time_unmagnify(timexv)));
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2009-08-29 23:06:29 +04:00
|
|
|
timegmxv(struct vtm *vtm)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timexv;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct tm tm;
|
|
|
|
time_t t;
|
2009-04-21 19:32:19 +04:00
|
|
|
const char *errmsg;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
/* The first leap second is 1972-06-30 23:59:60 UTC.
|
|
|
|
* No leap seconds before. */
|
|
|
|
if (RTEST(gt(INT2FIX(1972), vtm->year)))
|
2009-08-29 23:06:29 +04:00
|
|
|
return timegmxv_noleapsecond(vtm);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
init_leap_second_info();
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = timegmxv_noleapsecond(vtm);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (RTEST(lt(rb_time_magnify(TIMET2NUM(known_leap_seconds_limit)), timexv))) {
|
|
|
|
return add(timexv, rb_time_magnify(INT2NUM(number_of_leap_seconds_known)));
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
tm.tm_year = rb_long2int(NUM2LONG(vtm->year) - 1900);
|
2009-04-21 18:56:59 +04:00
|
|
|
tm.tm_mon = vtm->mon - 1;
|
|
|
|
tm.tm_mday = vtm->mday;
|
|
|
|
tm.tm_hour = vtm->hour;
|
|
|
|
tm.tm_min = vtm->min;
|
|
|
|
tm.tm_sec = vtm->sec;
|
|
|
|
tm.tm_isdst = 0;
|
|
|
|
|
|
|
|
errmsg = find_time_t(&tm, 1, &t);
|
|
|
|
if (errmsg)
|
|
|
|
rb_raise(rb_eArgError, "%s", errmsg);
|
2009-08-29 23:06:29 +04:00
|
|
|
return add(rb_time_magnify(TIMET2NUM(t)), vtm->subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct vtm *
|
2009-08-29 23:06:29 +04:00
|
|
|
gmtimexv(VALUE timexv, struct vtm *result)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
|
|
|
time_t t;
|
|
|
|
struct tm tm;
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE subsecx;
|
|
|
|
VALUE timev;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (RTEST(lt(timexv, INT2FIX(0)))) {
|
|
|
|
gmtimexv_noleapsecond(timexv, result);
|
2009-04-21 18:56:59 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
init_leap_second_info();
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (RTEST(lt(rb_time_magnify(LONG2NUM(known_leap_seconds_limit)), timexv))) {
|
|
|
|
timexv = sub(timexv, rb_time_magnify(INT2NUM(number_of_leap_seconds_known)));
|
|
|
|
gmtimexv_noleapsecond(timexv, result);
|
2009-04-21 18:56:59 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
divmodv(timexv, INT2FIX(TIME_SCALE), &timev, &subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
t = NUM2TIMET(timev);
|
|
|
|
if (!gmtime_with_leapsecond(&t, &tm))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
result->year = LONG2NUM((long)tm.tm_year + 1900);
|
|
|
|
result->mon = tm.tm_mon + 1;
|
|
|
|
result->mday = tm.tm_mday;
|
|
|
|
result->hour = tm.tm_hour;
|
|
|
|
result->min = tm.tm_min;
|
|
|
|
result->sec = tm.tm_sec;
|
2009-08-29 23:06:29 +04:00
|
|
|
result->subsecx = subsecx;
|
2009-04-21 18:56:59 +04:00
|
|
|
result->utc_offset = INT2FIX(0);
|
|
|
|
result->wday = tm.tm_wday;
|
|
|
|
result->yday = tm.tm_yday+1;
|
|
|
|
result->isdst = tm.tm_isdst;
|
|
|
|
result->zone = "UTC";
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct tm *localtime_with_gmtoff(const time_t *t, struct tm *result, long *gmtoff);
|
|
|
|
|
|
|
|
/*
|
2009-04-21 21:41:24 +04:00
|
|
|
* The idea is come from Perl:
|
|
|
|
* http://use.perl.org/articles/08/02/07/197204.shtml
|
|
|
|
*
|
2009-04-21 18:56:59 +04:00
|
|
|
* compat_common_month_table is generated by following program.
|
|
|
|
* This table finds the last month which start the same day of a week.
|
|
|
|
* The year 2037 is not used because
|
|
|
|
* http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=522949
|
|
|
|
*
|
|
|
|
* #!/usr/bin/ruby
|
|
|
|
*
|
|
|
|
* require 'date'
|
|
|
|
*
|
|
|
|
* h = {}
|
|
|
|
* 2036.downto(2010) {|y|
|
|
|
|
* 1.upto(12) {|m|
|
|
|
|
* next if m == 2 && y % 4 == 0
|
|
|
|
* d = Date.new(y,m,1)
|
|
|
|
* h[m] ||= {}
|
|
|
|
* h[m][d.wday] ||= y
|
|
|
|
* }
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* 1.upto(12) {|m|
|
|
|
|
* print "{"
|
|
|
|
* 0.upto(6) {|w|
|
|
|
|
* y = h[m][w]
|
|
|
|
* print " #{y},"
|
|
|
|
* }
|
|
|
|
* puts "},"
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static int compat_common_month_table[12][7] = {
|
|
|
|
/* Sun Mon Tue Wed Thu Fri Sat */
|
|
|
|
{ 2034, 2035, 2036, 2031, 2032, 2027, 2033 }, /* January */
|
|
|
|
{ 2026, 2027, 2033, 2034, 2035, 2030, 2031 }, /* February */
|
|
|
|
{ 2026, 2032, 2033, 2034, 2035, 2030, 2036 }, /* March */
|
|
|
|
{ 2035, 2030, 2036, 2026, 2032, 2033, 2034 }, /* April */
|
|
|
|
{ 2033, 2034, 2035, 2030, 2036, 2026, 2032 }, /* May */
|
|
|
|
{ 2036, 2026, 2032, 2033, 2034, 2035, 2030 }, /* June */
|
|
|
|
{ 2035, 2030, 2036, 2026, 2032, 2033, 2034 }, /* July */
|
|
|
|
{ 2032, 2033, 2034, 2035, 2030, 2036, 2026 }, /* August */
|
|
|
|
{ 2030, 2036, 2026, 2032, 2033, 2034, 2035 }, /* September */
|
|
|
|
{ 2034, 2035, 2030, 2036, 2026, 2032, 2033 }, /* October */
|
|
|
|
{ 2026, 2032, 2033, 2034, 2035, 2030, 2036 }, /* November */
|
|
|
|
{ 2030, 2036, 2026, 2032, 2033, 2034, 2035 }, /* December */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* compat_leap_month_table is generated by following program.
|
|
|
|
*
|
|
|
|
* #!/usr/bin/ruby
|
|
|
|
*
|
|
|
|
* require 'date'
|
|
|
|
*
|
|
|
|
* h = {}
|
|
|
|
* 2037.downto(2010) {|y|
|
|
|
|
* 1.upto(12) {|m|
|
|
|
|
* next unless m == 2 && y % 4 == 0
|
|
|
|
* d = Date.new(y,m,1)
|
|
|
|
* h[m] ||= {}
|
|
|
|
* h[m][d.wday] ||= y
|
|
|
|
* }
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* 2.upto(2) {|m|
|
|
|
|
* 0.upto(6) {|w|
|
|
|
|
* y = h[m][w]
|
|
|
|
* print " #{y},"
|
|
|
|
* }
|
|
|
|
* puts
|
|
|
|
* }
|
|
|
|
*/
|
|
|
|
static int compat_leap_month_table[7] = {
|
|
|
|
/* Sun Mon Tue Wed Thu Fri Sat */
|
|
|
|
2032, 2016, 2028, 2012, 2024, 2036, 2020, /* February */
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
calc_wday(int year, int month, int day)
|
|
|
|
{
|
|
|
|
int a, y, m;
|
|
|
|
int wday;
|
|
|
|
|
|
|
|
a = (14 - month) / 12;
|
|
|
|
y = year + 4800 - a;
|
|
|
|
m = month + 12 * a - 3;
|
|
|
|
wday = day + (153*m+2)/5 + 365*y + y/4 - y/100 + y/400 + 2;
|
|
|
|
wday = wday % 7;
|
|
|
|
return wday;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
guess_local_offset(struct vtm *vtm_utc)
|
|
|
|
{
|
|
|
|
VALUE off = INT2FIX(0);
|
|
|
|
struct tm tm;
|
|
|
|
long gmtoff;
|
|
|
|
time_t t;
|
|
|
|
struct vtm vtm2;
|
|
|
|
VALUE timev;
|
|
|
|
int y, wday;
|
|
|
|
|
|
|
|
# if defined(NEGATIVE_TIME_T)
|
|
|
|
/* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t. */
|
|
|
|
if (localtime_with_gmtoff((t = (time_t)0x80000000, &t), &tm, &gmtoff))
|
2009-04-22 04:27:33 +04:00
|
|
|
off = LONG2FIX(gmtoff);
|
2009-04-21 18:56:59 +04:00
|
|
|
else
|
|
|
|
# endif
|
|
|
|
/* 1970-01-01 00:00:00 UTC : The Unix epoch - the oldest time in portable time_t. */
|
|
|
|
if (localtime_with_gmtoff((t = 0, &t), &tm, &gmtoff))
|
2009-04-22 04:27:33 +04:00
|
|
|
off = LONG2FIX(gmtoff);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
/* The first DST is at 1916 in German.
|
|
|
|
* So we don't need to care DST before that. */
|
|
|
|
if (lt(vtm_utc->year, INT2FIX(1916)))
|
|
|
|
return off;
|
|
|
|
|
|
|
|
/* It is difficult to guess future. */
|
|
|
|
|
|
|
|
vtm2 = *vtm_utc;
|
|
|
|
|
|
|
|
/* guess using a year before 2038. */
|
|
|
|
y = NUM2INT(mod(vtm_utc->year, INT2FIX(400)));
|
|
|
|
wday = calc_wday(y, vtm_utc->mon, 1);
|
|
|
|
if (vtm_utc->mon == 2 && leap_year_p(y))
|
|
|
|
vtm2.year = INT2FIX(compat_leap_month_table[wday]);
|
|
|
|
else
|
|
|
|
vtm2.year = INT2FIX(compat_common_month_table[vtm_utc->mon-1][wday]);
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
timev = rb_time_unmagnify(timegmxv(&vtm2));
|
2009-04-21 18:56:59 +04:00
|
|
|
t = NUM2TIMET(timev);
|
|
|
|
if (localtime_with_gmtoff(&t, &tm, &gmtoff))
|
|
|
|
return LONG2FIX(gmtoff);
|
|
|
|
|
|
|
|
{
|
|
|
|
/* Use the current time offset as a last resort. */
|
|
|
|
static time_t now = 0;
|
|
|
|
static long now_gmtoff = 0;
|
|
|
|
if (now == 0) {
|
|
|
|
now = time(NULL);
|
|
|
|
localtime_with_gmtoff(&now, &tm, &now_gmtoff);
|
|
|
|
}
|
|
|
|
return LONG2FIX(now_gmtoff);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
small_vtm_sub(struct vtm *vtm1, struct vtm *vtm2)
|
|
|
|
{
|
|
|
|
int off;
|
|
|
|
|
|
|
|
off = vtm1->sec - vtm2->sec;
|
|
|
|
off += (vtm1->min - vtm2->min) * 60;
|
|
|
|
off += (vtm1->hour - vtm2->hour) * 3600;
|
|
|
|
if (ne(vtm1->year, vtm2->year))
|
|
|
|
off += lt(vtm1->year, vtm2->year) ? -24*3600 : 24*3600;
|
|
|
|
else if (vtm1->mon != vtm2->mon)
|
|
|
|
off += vtm1->mon < vtm2->mon ? -24*3600 : 24*3600;
|
|
|
|
else if (vtm1->mday != vtm2->mday)
|
|
|
|
off += vtm1->mday < vtm2->mday ? -24*3600 : 24*3600;
|
|
|
|
|
|
|
|
return INT2FIX(off);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2009-08-29 23:06:29 +04:00
|
|
|
timelocalxv(struct vtm *vtm)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
|
|
|
time_t t;
|
1998-01-16 15:13:05 +03:00
|
|
|
struct tm tm;
|
2009-04-21 18:56:59 +04:00
|
|
|
VALUE v;
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timexv1, timexv2;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct vtm vtm1, vtm2;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
if (FIXNUM_P(vtm->year)) {
|
|
|
|
long l = FIX2LONG(vtm->year) - 1900;
|
|
|
|
if (l < INT_MIN || INT_MAX < l)
|
|
|
|
goto no_localtime;
|
2009-09-23 08:16:41 +04:00
|
|
|
tm.tm_year = (int)l;
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
v = sub(vtm->year, INT2FIX(1900));
|
|
|
|
if (lt(v, INT2NUM(INT_MIN)) || lt(INT2NUM(INT_MAX), v))
|
|
|
|
goto no_localtime;
|
|
|
|
tm.tm_year = NUM2INT(v);
|
|
|
|
}
|
|
|
|
|
|
|
|
tm.tm_mon = vtm->mon-1;
|
|
|
|
tm.tm_mday = vtm->mday;
|
|
|
|
tm.tm_hour = vtm->hour;
|
|
|
|
tm.tm_min = vtm->min;
|
|
|
|
tm.tm_sec = vtm->sec;
|
|
|
|
tm.tm_isdst = vtm->isdst;
|
|
|
|
|
|
|
|
if (find_time_t(&tm, 0, &t))
|
|
|
|
goto no_localtime;
|
2009-08-29 23:06:29 +04:00
|
|
|
return add(rb_time_magnify(TIMET2NUM(t)), vtm->subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
no_localtime:
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv1 = timegmxv(vtm);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!localtimexv(timexv1, &vtm1))
|
|
|
|
rb_raise(rb_eArgError, "localtimexv error");
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
n = vtmcmp(vtm, &vtm1);
|
|
|
|
if (n == 0) {
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv1 = sub(timexv1, rb_time_magnify(INT2FIX(12*3600)));
|
|
|
|
if (!localtimexv(timexv1, &vtm1))
|
|
|
|
rb_raise(rb_eArgError, "localtimexv error");
|
2009-04-21 18:56:59 +04:00
|
|
|
n = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n < 0) {
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv2 = timexv1;
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm2 = vtm1;
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv1 = sub(timexv1, rb_time_magnify(INT2FIX(24*3600)));
|
|
|
|
if (!localtimexv(timexv1, &vtm1))
|
|
|
|
rb_raise(rb_eArgError, "localtimexv error");
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
else {
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv2 = add(timexv1, rb_time_magnify(INT2FIX(24*3600)));
|
|
|
|
if (!localtimexv(timexv2, &vtm2))
|
|
|
|
rb_raise(rb_eArgError, "localtimexv error");
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv1 = add(timexv1, rb_time_magnify(small_vtm_sub(vtm, &vtm1)));
|
|
|
|
timexv2 = add(timexv2, rb_time_magnify(small_vtm_sub(vtm, &vtm2)));
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (eq(timexv1, timexv2))
|
|
|
|
return timexv1;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!localtimexv(timexv1, &vtm1))
|
|
|
|
rb_raise(rb_eArgError, "localtimexv error");
|
2009-04-21 18:56:59 +04:00
|
|
|
if (vtm->hour != vtm1.hour || vtm->min != vtm1.min || vtm->sec != vtm1.sec)
|
2009-08-29 23:06:29 +04:00
|
|
|
return timexv2;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!localtimexv(timexv2, &vtm2))
|
|
|
|
rb_raise(rb_eArgError, "localtimexv error");
|
2009-04-21 18:56:59 +04:00
|
|
|
if (vtm->hour != vtm2.hour || vtm->min != vtm2.min || vtm->sec != vtm2.sec)
|
2009-08-29 23:06:29 +04:00
|
|
|
return timexv1;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
if (vtm->isdst)
|
2009-08-29 23:06:29 +04:00
|
|
|
return lt(vtm1.utc_offset, vtm2.utc_offset) ? timexv2 : timexv1;
|
2009-04-21 18:56:59 +04:00
|
|
|
else
|
2009-08-29 23:06:29 +04:00
|
|
|
return lt(vtm1.utc_offset, vtm2.utc_offset) ? timexv1 : timexv2;
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct tm *
|
|
|
|
localtime_with_gmtoff(const time_t *t, struct tm *result, long *gmtoff)
|
|
|
|
{
|
|
|
|
struct tm tm;
|
|
|
|
|
|
|
|
if (LOCALTIME(t, tm)) {
|
|
|
|
#if defined(HAVE_STRUCT_TM_TM_GMTOFF)
|
|
|
|
*gmtoff = tm.tm_gmtoff;
|
|
|
|
#else
|
|
|
|
struct tm *u, *l;
|
|
|
|
long off;
|
2009-04-22 06:13:44 +04:00
|
|
|
struct tm tmbuf;
|
2009-04-21 18:56:59 +04:00
|
|
|
l = &tm;
|
2009-04-22 04:27:33 +04:00
|
|
|
u = GMTIME(t, tmbuf);
|
2009-04-21 18:56:59 +04:00
|
|
|
if (!u)
|
2009-04-22 04:27:33 +04:00
|
|
|
return NULL;
|
2009-04-21 18:56:59 +04:00
|
|
|
if (l->tm_year != u->tm_year)
|
|
|
|
off = l->tm_year < u->tm_year ? -1 : 1;
|
|
|
|
else if (l->tm_mon != u->tm_mon)
|
|
|
|
off = l->tm_mon < u->tm_mon ? -1 : 1;
|
|
|
|
else if (l->tm_mday != u->tm_mday)
|
|
|
|
off = l->tm_mday < u->tm_mday ? -1 : 1;
|
|
|
|
else
|
|
|
|
off = 0;
|
|
|
|
off = off * 24 + l->tm_hour - u->tm_hour;
|
|
|
|
off = off * 60 + l->tm_min - u->tm_min;
|
|
|
|
off = off * 60 + l->tm_sec - u->tm_sec;
|
|
|
|
*gmtoff = off;
|
|
|
|
#endif
|
|
|
|
*result = tm;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct vtm *
|
2009-08-29 23:06:29 +04:00
|
|
|
localtimexv(VALUE timexv, struct vtm *result)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timev, subsecx, offset;
|
|
|
|
divmodv(timexv, INT2FIX(TIME_SCALE), &timev, &subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
if (le(TIMET2NUM(TIMET_MIN), timev) &&
|
|
|
|
le(timev, TIMET2NUM(TIMET_MAX))) {
|
|
|
|
time_t t;
|
|
|
|
struct tm tm;
|
|
|
|
long gmtoff;
|
|
|
|
t = NUM2TIMET(timev);
|
|
|
|
|
|
|
|
if (localtime_with_gmtoff(&t, &tm, &gmtoff)) {
|
|
|
|
result->year = LONG2NUM((long)tm.tm_year + 1900);
|
|
|
|
result->mon = tm.tm_mon + 1;
|
|
|
|
result->mday = tm.tm_mday;
|
|
|
|
result->hour = tm.tm_hour;
|
|
|
|
result->min = tm.tm_min;
|
|
|
|
result->sec = tm.tm_sec;
|
2009-08-29 23:06:29 +04:00
|
|
|
result->subsecx = subsecx;
|
2009-04-21 18:56:59 +04:00
|
|
|
result->wday = tm.tm_wday;
|
|
|
|
result->yday = tm.tm_yday+1;
|
|
|
|
result->isdst = tm.tm_isdst;
|
|
|
|
result->utc_offset = LONG2NUM(gmtoff);
|
|
|
|
#if defined(HAVE_TM_ZONE)
|
|
|
|
result->zone = zone_str(tm.tm_zone);
|
|
|
|
#elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT)
|
|
|
|
/* this needs tzset or localtime, instead of localtime_r */
|
|
|
|
result->zone = zone_str(tzname[daylight && tm.tm_isdst]);
|
|
|
|
#else
|
|
|
|
{
|
|
|
|
char buf[64];
|
|
|
|
strftime(buf, sizeof(buf), "%Z", &tm);
|
|
|
|
result->zone = zone_str(buf);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!gmtimexv(timexv, result))
|
2009-04-21 18:56:59 +04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
offset = guess_local_offset(result);
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!gmtimexv(add(timexv, rb_time_magnify(offset)), result))
|
2009-04-21 18:56:59 +04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
result->utc_offset = offset;
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct time_object {
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timexv;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct vtm vtm;
|
1998-01-16 15:13:05 +03:00
|
|
|
int gmt;
|
|
|
|
int tm_got;
|
|
|
|
};
|
|
|
|
|
2002-04-18 12:46:18 +04:00
|
|
|
#define GetTimeval(obj, tobj) \
|
2009-09-09 07:43:48 +04:00
|
|
|
TypedData_Get_Struct(obj, struct time_object, &time_data_type, tobj)
|
|
|
|
|
|
|
|
#define IsTimeval(obj) rb_typeddata_is_kind_of(obj, &time_data_type)
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-04-25 10:25:06 +04:00
|
|
|
#define TIME_UTC_P(tobj) ((tobj)->gmt == 1)
|
|
|
|
#define TIME_SET_UTC(tobj) ((tobj)->gmt = 1)
|
|
|
|
|
|
|
|
#define TIME_LOCALTIME_P(tobj) ((tobj)->gmt == 0)
|
|
|
|
#define TIME_SET_LOCALTIME(tobj) ((tobj)->gmt = 0)
|
|
|
|
|
2009-05-12 16:07:49 +04:00
|
|
|
#define TIME_FIXOFF_P(tobj) ((tobj)->gmt == 2)
|
|
|
|
#define TIME_SET_FIXOFF(tobj, off) \
|
|
|
|
((tobj)->gmt = 2, \
|
|
|
|
(tobj)->vtm.utc_offset = (off), \
|
|
|
|
(tobj)->vtm.zone = NULL)
|
|
|
|
|
2009-04-25 11:04:02 +04:00
|
|
|
#define TIME_COPY_GMT(tobj1, tobj2) ((tobj1)->gmt = (tobj2)->gmt)
|
|
|
|
|
2009-04-25 10:48:39 +04:00
|
|
|
static VALUE time_get_tm(VALUE, struct time_object *);
|
2009-04-25 10:25:06 +04:00
|
|
|
#define MAKE_TM(time, tobj) \
|
|
|
|
do { \
|
|
|
|
if ((tobj)->tm_got == 0) { \
|
2009-04-25 10:48:39 +04:00
|
|
|
time_get_tm((time), (tobj)); \
|
2009-04-25 10:25:06 +04:00
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static void
|
|
|
|
time_mark(void *ptr)
|
|
|
|
{
|
|
|
|
struct time_object *tobj = ptr;
|
|
|
|
if (!tobj) return;
|
2009-08-29 23:06:29 +04:00
|
|
|
rb_gc_mark(tobj->timexv);
|
2009-04-21 18:56:59 +04:00
|
|
|
rb_gc_mark(tobj->vtm.year);
|
2009-08-29 23:06:29 +04:00
|
|
|
rb_gc_mark(tobj->vtm.subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
rb_gc_mark(tobj->vtm.utc_offset);
|
|
|
|
}
|
|
|
|
|
2002-08-27 12:31:08 +04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_free(void *tobj)
|
2002-08-27 12:31:08 +04:00
|
|
|
{
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
if (tobj) xfree(tobj);
|
2002-08-27 12:31:08 +04:00
|
|
|
}
|
|
|
|
|
2009-09-09 07:43:48 +04:00
|
|
|
static size_t
|
|
|
|
time_memsize(const void *tobj)
|
|
|
|
{
|
|
|
|
return tobj ? sizeof(struct time_object) : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const rb_data_type_t time_data_type = {
|
|
|
|
"time",
|
|
|
|
time_mark, time_free, time_memsize,
|
|
|
|
};
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_s_alloc(VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE obj;
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
2009-09-09 07:43:48 +04:00
|
|
|
obj = TypedData_Make_Struct(klass, struct time_object, &time_data_type, tobj);
|
1998-01-16 15:13:05 +03:00
|
|
|
tobj->tm_got=0;
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = INT2FIX(0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_modify(VALUE time)
|
2002-03-08 10:03:09 +03:00
|
|
|
{
|
2009-04-21 18:56:59 +04:00
|
|
|
rb_check_frozen(time);
|
|
|
|
if (!OBJ_UNTRUSTED(time) && rb_safe_level() >= 4)
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't modify Time");
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2009-08-29 23:06:29 +04:00
|
|
|
timespec2timexv(struct timespec *ts)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timexv;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = rb_time_magnify(TIMET2NUM(ts->tv_sec));
|
2009-04-21 18:56:59 +04:00
|
|
|
if (ts->tv_nsec)
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = add(timexv, mulquo(LONG2NUM(ts->tv_nsec), INT2FIX(TIME_SCALE), INT2FIX(1000000000)));
|
|
|
|
return timexv;
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct timespec
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv2timespec(VALUE timexv)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timev, subsecx;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct timespec ts;
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
divmodv(timexv, INT2FIX(TIME_SCALE), &timev, &subsecx);
|
2009-04-21 18:56:59 +04:00
|
|
|
if (lt(timev, TIMET2NUM(TIMET_MIN)) || lt(TIMET2NUM(TIMET_MAX), timev))
|
|
|
|
rb_raise(rb_eArgError, "time out of system range");
|
|
|
|
ts.tv_sec = NUM2TIMET(timev);
|
2009-08-29 23:06:29 +04:00
|
|
|
ts.tv_nsec = NUM2LONG(mulquo(subsecx, INT2FIX(1000000000), INT2FIX(TIME_SCALE)));
|
2009-04-21 18:56:59 +04:00
|
|
|
return ts;
|
2002-03-08 10:03:09 +03:00
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* Document-method: now
|
|
|
|
*
|
|
|
|
* Synonym for <code>Time.new</code>. Returns a +Time+ object
|
2007-12-15 04:14:25 +03:00
|
|
|
* initialized to the current system time.
|
2003-12-30 19:38:32 +03:00
|
|
|
*/
|
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
static VALUE
|
2009-05-12 16:07:49 +04:00
|
|
|
time_init_0(VALUE time)
|
2003-10-02 12:25:00 +04:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct timespec ts;
|
2003-10-02 12:25:00 +04:00
|
|
|
|
|
|
|
time_modify(time);
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
tobj->tm_got=0;
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = INT2FIX(0);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
#ifdef HAVE_CLOCK_GETTIME
|
2009-04-21 18:56:59 +04:00
|
|
|
if (clock_gettime(CLOCK_REALTIME, &ts) == -1) {
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
rb_sys_fail("clock_gettime");
|
2003-10-02 12:25:00 +04:00
|
|
|
}
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
#else
|
|
|
|
{
|
2009-02-22 17:23:33 +03:00
|
|
|
struct timeval tv;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (gettimeofday(&tv, 0) < 0) {
|
|
|
|
rb_sys_fail("gettimeofday");
|
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
ts.tv_sec = tv.tv_sec;
|
|
|
|
ts.tv_nsec = tv.tv_usec * 1000;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
#endif
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = timespec2timexv(&ts);
|
2003-10-02 12:25:00 +04:00
|
|
|
|
|
|
|
return time;
|
|
|
|
}
|
2002-03-08 10:03:09 +03:00
|
|
|
|
2009-05-12 16:07:49 +04:00
|
|
|
static VALUE
|
|
|
|
time_set_utc_offset(VALUE time, VALUE off)
|
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
off = num_exact(off);
|
|
|
|
|
|
|
|
time_modify(time);
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
|
|
|
|
tobj->tm_got = 0;
|
|
|
|
TIME_SET_FIXOFF(tobj, off);
|
|
|
|
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
vtm_add_offset(struct vtm *vtm, VALUE off)
|
|
|
|
{
|
|
|
|
int sign;
|
|
|
|
VALUE subsec, v;
|
|
|
|
int sec, min, hour;
|
|
|
|
int day;
|
|
|
|
|
|
|
|
vtm->utc_offset = sub(vtm->utc_offset, off);
|
|
|
|
|
|
|
|
if (RTEST(lt(off, INT2FIX(0)))) {
|
|
|
|
sign = -1;
|
|
|
|
off = neg(off);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
sign = 1;
|
|
|
|
}
|
|
|
|
divmodv(off, INT2FIX(1), &off, &subsec);
|
|
|
|
divmodv(off, INT2FIX(60), &off, &v);
|
|
|
|
sec = NUM2INT(v);
|
|
|
|
divmodv(off, INT2FIX(60), &off, &v);
|
|
|
|
min = NUM2INT(v);
|
|
|
|
divmodv(off, INT2FIX(24), &off, &v);
|
|
|
|
hour = NUM2INT(v);
|
|
|
|
|
|
|
|
if (sign < 0) {
|
|
|
|
subsec = neg(subsec);
|
|
|
|
sec = -sec;
|
|
|
|
min = -min;
|
|
|
|
hour = -hour;
|
|
|
|
}
|
|
|
|
|
|
|
|
day = 0;
|
|
|
|
|
|
|
|
if (!rb_equal(subsec, INT2FIX(0))) {
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm->subsecx = add(vtm->subsecx, rb_time_magnify(subsec));
|
|
|
|
if (lt(vtm->subsecx, INT2FIX(0))) {
|
|
|
|
vtm->subsecx = add(vtm->subsecx, INT2FIX(TIME_SCALE));
|
2009-05-12 16:07:49 +04:00
|
|
|
sec -= 1;
|
|
|
|
}
|
2009-08-29 23:06:29 +04:00
|
|
|
if (le(INT2FIX(TIME_SCALE), vtm->subsecx)) {
|
|
|
|
vtm->subsecx = sub(vtm->subsecx, INT2FIX(TIME_SCALE));
|
2009-05-12 16:07:49 +04:00
|
|
|
sec += 1;
|
|
|
|
}
|
|
|
|
goto not_zero_sec;
|
|
|
|
}
|
|
|
|
if (sec) {
|
|
|
|
not_zero_sec:
|
|
|
|
/* If sec + subsec == 0, don't change vtm->sec.
|
|
|
|
* It may be 60 which is a leap second. */
|
|
|
|
vtm->sec += sec;
|
|
|
|
if (vtm->sec < 0) {
|
|
|
|
vtm->sec += 60;
|
|
|
|
min -= 1;
|
|
|
|
}
|
|
|
|
if (60 <= vtm->sec) {
|
|
|
|
vtm->sec -= 60;
|
|
|
|
min += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (min) {
|
|
|
|
vtm->min += min;
|
|
|
|
if (vtm->min < 0) {
|
|
|
|
vtm->min += 60;
|
|
|
|
hour -= 1;
|
|
|
|
}
|
|
|
|
if (60 <= vtm->min) {
|
|
|
|
vtm->min -= 60;
|
|
|
|
hour += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (hour) {
|
|
|
|
vtm->hour += hour;
|
|
|
|
if (vtm->hour < 0) {
|
|
|
|
vtm->hour += 24;
|
|
|
|
day = -1;
|
|
|
|
}
|
|
|
|
if (24 <= vtm->hour) {
|
|
|
|
vtm->hour -= 24;
|
|
|
|
day = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (day) {
|
|
|
|
if (day < 0) {
|
|
|
|
if (vtm->mon == 1 && vtm->mday == 1) {
|
|
|
|
vtm->mday = 31;
|
|
|
|
vtm->mon = 12; /* December */
|
|
|
|
vtm->year = sub(vtm->year, INT2FIX(1));
|
|
|
|
vtm->yday = leap_year_v_p(vtm->year) ? 365 : 364;
|
|
|
|
}
|
|
|
|
else if (vtm->mday == 1) {
|
|
|
|
const int *days_in_month = leap_year_v_p(vtm->year) ?
|
|
|
|
leap_year_days_in_month :
|
|
|
|
common_year_days_in_month;
|
|
|
|
vtm->mon--;
|
|
|
|
vtm->mday = days_in_month[vtm->mon-1];
|
|
|
|
vtm->yday--;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
vtm->mday--;
|
|
|
|
vtm->yday--;
|
|
|
|
}
|
|
|
|
vtm->wday = (vtm->wday + 6) % 7;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
int leap = leap_year_v_p(vtm->year);
|
|
|
|
if (vtm->mon == 12 && vtm->mday == 31) {
|
|
|
|
vtm->year = add(vtm->year, INT2FIX(1));
|
|
|
|
vtm->mon = 1; /* January */
|
|
|
|
vtm->mday = 1;
|
|
|
|
vtm->yday = 1;
|
|
|
|
}
|
|
|
|
else if (vtm->mday == (leap ? leap_year_days_in_month :
|
|
|
|
common_year_days_in_month)[vtm->mon-1]) {
|
|
|
|
vtm->mon++;
|
|
|
|
vtm->mday = 1;
|
|
|
|
vtm->yday++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
vtm->mday++;
|
|
|
|
vtm->yday++;
|
|
|
|
}
|
|
|
|
vtm->wday = (vtm->wday + 1) % 7;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
utc_offset_arg(VALUE arg)
|
|
|
|
{
|
|
|
|
VALUE tmp;
|
|
|
|
if (!NIL_P(tmp = rb_check_string_type(arg))) {
|
|
|
|
int n;
|
|
|
|
char *s = RSTRING_PTR(tmp);
|
|
|
|
if (!rb_enc_str_asciicompat_p(tmp) ||
|
|
|
|
RSTRING_LEN(tmp) != 6 ||
|
|
|
|
(s[0] != '+' && s[0] != '-') ||
|
|
|
|
!ISDIGIT(s[1]) ||
|
|
|
|
!ISDIGIT(s[2]) ||
|
|
|
|
s[3] != ':' ||
|
|
|
|
!ISDIGIT(s[4]) ||
|
|
|
|
!ISDIGIT(s[5]))
|
|
|
|
rb_raise(rb_eArgError, "\"+HH:MM\" or \"-HH:MM\" expected for utc_offset");
|
2009-09-23 08:16:41 +04:00
|
|
|
n = (s[1] * 10 + s[2] - '0' * 11) * 3600;
|
|
|
|
n += (s[4] * 10 + s[5] - '0' * 11) * 60;
|
2009-05-12 16:07:49 +04:00
|
|
|
if (s[0] == '-')
|
|
|
|
n = -n;
|
|
|
|
return INT2FIX(n);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return num_exact(arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_init_1(int argc, VALUE *argv, VALUE time)
|
|
|
|
{
|
|
|
|
struct vtm vtm;
|
|
|
|
VALUE v[7];
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
vtm.wday = -1;
|
|
|
|
vtm.yday = 0;
|
|
|
|
vtm.zone = "";
|
|
|
|
|
|
|
|
/* year mon mday hour min sec off */
|
|
|
|
rb_scan_args(argc, argv, "16", &v[0],&v[1],&v[2],&v[3],&v[4],&v[5],&v[6]);
|
|
|
|
|
|
|
|
vtm.year = obj2vint(v[0]);
|
|
|
|
|
|
|
|
vtm.mon = NIL_P(v[1]) ? 1 : month_arg(v[1]);
|
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
vtm.mday = NIL_P(v[2]) ? 1 : obj2int(v[2]);
|
2009-05-12 16:07:49 +04:00
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
vtm.hour = NIL_P(v[3]) ? 0 : obj2int(v[3]);
|
2009-05-12 16:07:49 +04:00
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
vtm.min = NIL_P(v[4]) ? 0 : obj2int(v[4]);
|
2009-05-12 16:07:49 +04:00
|
|
|
|
|
|
|
vtm.sec = 0;
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm.subsecx = INT2FIX(0);
|
2009-05-12 16:07:49 +04:00
|
|
|
if (!NIL_P(v[5])) {
|
|
|
|
VALUE sec = num_exact(v[5]);
|
|
|
|
VALUE subsec;
|
|
|
|
divmodv(sec, INT2FIX(1), &sec, &subsec);
|
|
|
|
vtm.sec = NUM2INT(sec);
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm.subsecx = rb_time_magnify(subsec);
|
2009-05-12 16:07:49 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
vtm.isdst = -1;
|
|
|
|
vtm.utc_offset = Qnil;
|
|
|
|
if (!NIL_P(v[6])) {
|
|
|
|
VALUE arg = v[6];
|
|
|
|
if (arg == ID2SYM(rb_intern("dst")))
|
|
|
|
vtm.isdst = 1;
|
|
|
|
else if (arg == ID2SYM(rb_intern("std")))
|
|
|
|
vtm.isdst = 0;
|
|
|
|
else
|
|
|
|
vtm.utc_offset = utc_offset_arg(arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
validate_vtm(&vtm);
|
|
|
|
|
|
|
|
time_modify(time);
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
tobj->tm_got=0;
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = INT2FIX(0);
|
2009-05-12 16:07:49 +04:00
|
|
|
|
|
|
|
if (!NIL_P(vtm.utc_offset)) {
|
|
|
|
VALUE off = vtm.utc_offset;
|
|
|
|
vtm_add_offset(&vtm, neg(off));
|
|
|
|
vtm.utc_offset = Qnil;
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = timegmxv(&vtm);
|
2009-05-12 16:07:49 +04:00
|
|
|
return time_set_utc_offset(time, off);
|
|
|
|
}
|
|
|
|
else {
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = timelocalxv(&vtm);
|
2009-05-12 16:07:49 +04:00
|
|
|
return time_localtime(time);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time.new -> time
|
|
|
|
* Time.new(year) -> time
|
|
|
|
* Time.new(year, month) -> time
|
|
|
|
* Time.new(year, month, day) -> time
|
|
|
|
* Time.new(year, month, day, hour) -> time
|
|
|
|
* Time.new(year, month, day, hour, min) -> time
|
|
|
|
* Time.new(year, month, day, hour, min, sec) -> time
|
|
|
|
* Time.new(year, month, day, hour, min, sec, utc_offset) -> time
|
|
|
|
*
|
|
|
|
* Returns a <code>Time</code> object.
|
|
|
|
*
|
|
|
|
* It is initialized to the current system time if no argument.
|
|
|
|
* <b>Note:</b> The object created will be created using the
|
|
|
|
* resolution available on your system clock, and so may include
|
|
|
|
* fractional seconds.
|
|
|
|
*
|
|
|
|
* If one or more arguments specified, the time is initialized
|
|
|
|
* to the specified time.
|
|
|
|
* _sec_ may have fraction if it is a rational.
|
|
|
|
*
|
|
|
|
* _utc_offset_ is the offset from UTC.
|
|
|
|
* It is a string such as "+09:00" or a number of seconds such as 32400.
|
|
|
|
*
|
|
|
|
* a = Time.new #=> 2007-11-19 07:50:02 -0600
|
|
|
|
* b = Time.new #=> 2007-11-19 07:50:02 -0600
|
|
|
|
* a == b #=> false
|
|
|
|
* "%.6f" % a.to_f #=> "1195480202.282373"
|
|
|
|
* "%.6f" % b.to_f #=> "1195480202.283415"
|
|
|
|
*
|
|
|
|
* Time.new(2008,6,21, 13,30,0, "+09:00") #=> 2008-06-21 13:30:00 +0900
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_init(int argc, VALUE *argv, VALUE time)
|
|
|
|
{
|
|
|
|
if (argc == 0)
|
|
|
|
return time_init_0(time);
|
|
|
|
else
|
|
|
|
return time_init_1(argc, argv, time);
|
|
|
|
}
|
|
|
|
|
2005-10-18 21:35:18 +04:00
|
|
|
static void
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
time_overflow_p(time_t *secp, long *nsecp)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
time_t tmp, sec = *secp;
|
|
|
|
long nsec = *nsecp;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (nsec >= 1000000000) { /* nsec positive overflow */
|
|
|
|
tmp = sec + nsec / 1000000000;
|
|
|
|
nsec %= 1000000000;
|
2001-12-21 12:23:28 +03:00
|
|
|
if (sec > 0 && tmp < 0) {
|
|
|
|
rb_raise(rb_eRangeError, "out of Time range");
|
|
|
|
}
|
|
|
|
sec = tmp;
|
2001-12-03 13:07:48 +03:00
|
|
|
}
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (nsec < 0) { /* nsec negative overflow */
|
|
|
|
tmp = sec + NDIV(nsec,1000000000); /* negative div */
|
|
|
|
nsec = NMOD(nsec,1000000000); /* negative mod */
|
2001-12-21 12:23:28 +03:00
|
|
|
if (sec < 0 && tmp > 0) {
|
|
|
|
rb_raise(rb_eRangeError, "out of Time range");
|
|
|
|
}
|
|
|
|
sec = tmp;
|
2001-12-03 13:07:48 +03:00
|
|
|
}
|
2001-02-20 10:42:03 +03:00
|
|
|
#ifndef NEGATIVE_TIME_T
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (sec < 0)
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eArgError, "time must be positive");
|
2001-02-20 10:42:03 +03:00
|
|
|
#endif
|
2004-01-18 10:46:51 +03:00
|
|
|
*secp = sec;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
*nsecp = nsec;
|
2003-10-02 12:25:00 +04:00
|
|
|
}
|
2000-03-07 11:37:59 +03:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
static VALUE nsec2timexv(time_t sec, long nsec)
|
2009-07-01 16:11:53 +04:00
|
|
|
{
|
|
|
|
struct timespec ts;
|
|
|
|
time_overflow_p(&sec, &nsec);
|
|
|
|
ts.tv_sec = sec;
|
|
|
|
ts.tv_nsec = nsec;
|
2009-08-29 23:06:29 +04:00
|
|
|
return timespec2timexv(&ts);
|
2009-07-01 16:11:53 +04:00
|
|
|
}
|
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
static VALUE
|
2009-08-29 23:06:29 +04:00
|
|
|
time_new_internal(VALUE klass, VALUE timexv)
|
2003-10-02 12:25:00 +04:00
|
|
|
{
|
|
|
|
VALUE time = time_s_alloc(klass);
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = num_exact(timexv);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
return time;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
rb_time_new(time_t sec, long usec)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
return time_new_internal(rb_cTime, nsec2timexv(sec, usec * 1000));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
VALUE
|
|
|
|
rb_time_nano_new(time_t sec, long nsec)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
return time_new_internal(rb_cTime, nsec2timexv(sec, nsec));
|
2009-07-01 16:11:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_time_num_new(VALUE timev, VALUE off)
|
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE time = time_new_internal(rb_cTime, rb_time_magnify(timev));
|
2009-07-01 16:11:53 +04:00
|
|
|
|
|
|
|
if (!NIL_P(off)) {
|
|
|
|
off = utc_offset_arg(off);
|
|
|
|
validate_utc_offset(off);
|
|
|
|
time_set_utc_offset(time, off);
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
|
|
|
return time;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static VALUE
|
2009-08-29 23:06:29 +04:00
|
|
|
time_new_timexv(VALUE klass, VALUE timexv)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
|
|
|
VALUE time = time_s_alloc(klass);
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = timexv;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
static struct timespec
|
|
|
|
time_timespec(VALUE num, int interval)
|
|
|
|
{
|
|
|
|
struct timespec t;
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
const char *tstr = interval ? "time interval" : "time";
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
VALUE i, f, ary;
|
2001-02-27 10:52:11 +03:00
|
|
|
|
|
|
|
#ifndef NEGATIVE_TIME_T
|
|
|
|
interval = 1;
|
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
switch (TYPE(num)) {
|
1998-01-16 15:13:05 +03:00
|
|
|
case T_FIXNUM:
|
2009-03-23 16:02:12 +03:00
|
|
|
t.tv_sec = NUM2TIMET(num);
|
2001-02-27 10:52:11 +03:00
|
|
|
if (interval && t.tv_sec < 0)
|
|
|
|
rb_raise(rb_eArgError, "%s must be positive", tstr);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
t.tv_nsec = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_FLOAT:
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (interval && RFLOAT_VALUE(num) < 0.0)
|
2001-02-27 10:52:11 +03:00
|
|
|
rb_raise(rb_eArgError, "%s must be positive", tstr);
|
2001-12-21 12:23:28 +03:00
|
|
|
else {
|
|
|
|
double f, d;
|
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
d = modf(RFLOAT_VALUE(num), &f);
|
2009-07-12 20:18:18 +04:00
|
|
|
if (d >= 0) {
|
|
|
|
t.tv_nsec = (int)(d*1e9+0.5);
|
|
|
|
}
|
|
|
|
else if ((t.tv_nsec = (int)(-d*1e9+0.5)) > 0) {
|
|
|
|
t.tv_nsec = 1000000000 - t.tv_nsec;
|
|
|
|
f -= 1;
|
|
|
|
}
|
2001-12-21 12:23:28 +03:00
|
|
|
t.tv_sec = (time_t)f;
|
|
|
|
if (f != t.tv_sec) {
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
rb_raise(rb_eRangeError, "%f out of Time range", RFLOAT_VALUE(num));
|
2001-12-21 12:23:28 +03:00
|
|
|
}
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_BIGNUM:
|
2009-03-23 16:02:12 +03:00
|
|
|
t.tv_sec = NUM2TIMET(num);
|
2001-02-27 10:52:11 +03:00
|
|
|
if (interval && t.tv_sec < 0)
|
|
|
|
rb_raise(rb_eArgError, "%s must be positive", tstr);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
t.tv_nsec = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2008-05-03 13:12:13 +04:00
|
|
|
if (rb_respond_to(num, id_divmod)) {
|
|
|
|
ary = rb_check_array_type(rb_funcall(num, id_divmod, 1, INT2FIX(1)));
|
|
|
|
if (NIL_P(ary)) {
|
|
|
|
goto typeerror;
|
|
|
|
}
|
|
|
|
i = rb_ary_entry(ary, 0);
|
|
|
|
f = rb_ary_entry(ary, 1);
|
2009-03-23 16:02:12 +03:00
|
|
|
t.tv_sec = NUM2TIMET(i);
|
2008-05-03 13:12:13 +04:00
|
|
|
if (interval && t.tv_sec < 0)
|
|
|
|
rb_raise(rb_eArgError, "%s must be positive", tstr);
|
|
|
|
f = rb_funcall(f, id_mul, 1, INT2FIX(1000000000));
|
|
|
|
t.tv_nsec = NUM2LONG(f);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
typeerror:
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
rb_raise(rb_eTypeError, "can't convert %s into %s",
|
|
|
|
rb_obj_classname(num), tstr);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
static struct timeval
|
|
|
|
time_timeval(VALUE num, int interval)
|
|
|
|
{
|
|
|
|
struct timespec ts;
|
|
|
|
struct timeval tv;
|
|
|
|
|
|
|
|
ts = time_timespec(num, interval);
|
2009-03-10 22:47:46 +03:00
|
|
|
tv.tv_sec = (TYPEOF_TIMEVAL_TV_SEC)ts.tv_sec;
|
2009-04-22 04:27:33 +04:00
|
|
|
tv.tv_usec = (TYPEOF_TIMEVAL_TV_USEC)(ts.tv_nsec / 1000);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
|
|
|
|
return tv;
|
|
|
|
}
|
|
|
|
|
2000-08-31 09:29:54 +04:00
|
|
|
struct timeval
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
rb_time_interval(VALUE num)
|
2000-08-31 09:29:54 +04:00
|
|
|
{
|
2009-09-23 08:16:41 +04:00
|
|
|
return time_timeval(num, TRUE);
|
2000-08-31 09:29:54 +04:00
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
struct timeval
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_time_timeval(VALUE time)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
struct timeval t;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct timespec ts;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2009-09-09 08:06:37 +04:00
|
|
|
if (IsTimeval(time)) {
|
1999-08-13 09:45:20 +04:00
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
ts = timexv2timespec(tobj->timexv);
|
2009-04-21 18:56:59 +04:00
|
|
|
t.tv_sec = (TYPEOF_TIMEVAL_TV_SEC)ts.tv_sec;
|
2009-04-22 04:27:33 +04:00
|
|
|
t.tv_usec = (TYPEOF_TIMEVAL_TV_USEC)(ts.tv_nsec / 1000);
|
1999-08-13 09:45:20 +04:00
|
|
|
return t;
|
|
|
|
}
|
2009-09-23 08:16:41 +04:00
|
|
|
return time_timeval(time, FALSE);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
struct timespec
|
|
|
|
rb_time_timespec(VALUE time)
|
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
struct timespec t;
|
|
|
|
|
2009-09-09 08:06:37 +04:00
|
|
|
if (IsTimeval(time)) {
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
t = timexv2timespec(tobj->timexv);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
return t;
|
|
|
|
}
|
2009-09-23 08:16:41 +04:00
|
|
|
return time_timespec(time, FALSE);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
|
2009-06-24 15:19:58 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time.now => time
|
|
|
|
*
|
|
|
|
* Creates a new time object for the current time.
|
|
|
|
*
|
|
|
|
* Time.now #=> 2009-06-24 12:39:54 +0900
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_s_now(VALUE klass)
|
|
|
|
{
|
|
|
|
return rb_class_new_instance(0, NULL, klass);
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-11-19 17:40:15 +03:00
|
|
|
* Time.at(time) => time
|
|
|
|
* Time.at(seconds_with_frac) => time
|
|
|
|
* Time.at(seconds, microseconds_with_frac) => time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* Creates a new time object with the value given by <i>time</i>,
|
|
|
|
* the given number of <i>seconds_with_frac</i>, or
|
|
|
|
* <i>seconds</i> and <i>microseconds_with_frac</i> from the Epoch.
|
|
|
|
* <i>seconds_with_frac</i> and <i>microseconds_with_frac</i>
|
|
|
|
* can be Integer, Float, Rational, or other Numeric.
|
|
|
|
* non-portable feature allows the offset to be negative on some systems.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* Time.at(0) #=> 1969-12-31 18:00:00 -0600
|
|
|
|
* Time.at(Time.at(0)) #=> 1969-12-31 18:00:00 -0600
|
|
|
|
* Time.at(946702800) #=> 1999-12-31 23:00:00 -0600
|
|
|
|
* Time.at(-284061600) #=> 1960-12-31 00:00:00 -0600
|
|
|
|
* Time.at(946684800.2).usec #=> 200000
|
|
|
|
* Time.at(946684800, 123456.789).nsec #=> 123456789
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_s_at(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE time, t, timexv;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-10-29 13:25:48 +04:00
|
|
|
if (rb_scan_args(argc, argv, "11", &time, &t) == 2) {
|
2009-04-21 18:56:59 +04:00
|
|
|
time = num_exact(time);
|
|
|
|
t = num_exact(t);
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = add(rb_time_magnify(time), mulquo(t, INT2FIX(TIME_SCALE), INT2FIX(1000000)));
|
|
|
|
t = time_new_timexv(klass, timexv);
|
1999-10-29 13:25:48 +04:00
|
|
|
}
|
2009-09-09 07:43:48 +04:00
|
|
|
else if (IsTimeval(time)) {
|
1999-08-13 09:45:20 +04:00
|
|
|
struct time_object *tobj, *tobj2;
|
2009-04-21 18:56:59 +04:00
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
t = time_new_timexv(klass, tobj->timexv);
|
1999-08-13 09:45:20 +04:00
|
|
|
GetTimeval(t, tobj2);
|
2009-04-25 11:04:02 +04:00
|
|
|
TIME_COPY_GMT(tobj2, tobj);
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
else {
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = rb_time_magnify(num_exact(time));
|
|
|
|
t = time_new_timexv(klass, timexv);
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
return t;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-06-01 23:55:25 +04:00
|
|
|
static const char months[][4] = {
|
1998-01-16 15:13:05 +03:00
|
|
|
"jan", "feb", "mar", "apr", "may", "jun",
|
|
|
|
"jul", "aug", "sep", "oct", "nov", "dec",
|
|
|
|
};
|
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
static int
|
|
|
|
obj2int(VALUE obj)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
if (TYPE(obj) == T_STRING) {
|
2009-09-23 08:16:41 +04:00
|
|
|
obj = rb_str_to_inum(obj, 10, FALSE);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
return NUM2INT(obj);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static VALUE
|
|
|
|
obj2vint(VALUE obj)
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
{
|
2009-04-21 18:56:59 +04:00
|
|
|
if (TYPE(obj) == T_STRING) {
|
2009-09-23 08:16:41 +04:00
|
|
|
obj = rb_str_to_inum(obj, 10, FALSE);
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
obj = rb_to_int(obj);
|
|
|
|
}
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
static int
|
2009-08-29 23:06:29 +04:00
|
|
|
obj2subsecx(VALUE obj, VALUE *subsecx)
|
2009-04-21 18:56:59 +04:00
|
|
|
{
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE subsec;
|
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (TYPE(obj) == T_STRING) {
|
2009-09-23 08:16:41 +04:00
|
|
|
obj = rb_str_to_inum(obj, 10, FALSE);
|
2009-08-29 23:06:29 +04:00
|
|
|
*subsecx = INT2FIX(0);
|
2009-09-23 08:16:41 +04:00
|
|
|
return NUM2INT(obj);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
divmodv(num_exact(obj), INT2FIX(1), &obj, &subsec);
|
|
|
|
*subsecx = rb_time_magnify(subsec);
|
2009-09-23 08:16:41 +04:00
|
|
|
return NUM2INT(obj);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static long
|
2009-08-29 23:06:29 +04:00
|
|
|
usec2subsecx(VALUE obj)
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
{
|
|
|
|
if (TYPE(obj) == T_STRING) {
|
2009-09-23 08:16:41 +04:00
|
|
|
obj = rb_str_to_inum(obj, 10, FALSE);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
return mulquo(num_exact(obj), INT2FIX(TIME_SCALE), INT2FIX(1000000));
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
|
2009-04-25 11:20:20 +04:00
|
|
|
static int
|
|
|
|
month_arg(VALUE arg)
|
|
|
|
{
|
|
|
|
int i, mon;
|
|
|
|
|
|
|
|
VALUE s = rb_check_string_type(arg);
|
|
|
|
if (!NIL_P(s)) {
|
|
|
|
mon = 0;
|
|
|
|
for (i=0; i<12; i++) {
|
|
|
|
if (RSTRING_LEN(s) == 3 &&
|
|
|
|
STRCASECMP(months[i], RSTRING_PTR(s)) == 0) {
|
|
|
|
mon = i+1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (mon == 0) {
|
|
|
|
char c = RSTRING_PTR(s)[0];
|
|
|
|
|
|
|
|
if ('0' <= c && c <= '9') {
|
2009-09-23 08:16:41 +04:00
|
|
|
mon = obj2int(s);
|
2009-04-25 11:20:20 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2009-09-23 08:16:41 +04:00
|
|
|
mon = obj2int(arg);
|
2009-04-25 11:20:20 +04:00
|
|
|
}
|
|
|
|
return mon;
|
|
|
|
}
|
|
|
|
|
2009-05-12 16:07:49 +04:00
|
|
|
static void
|
|
|
|
validate_utc_offset(VALUE utc_offset)
|
|
|
|
{
|
|
|
|
if (le(utc_offset, INT2FIX(-86400)) || ge(utc_offset, INT2FIX(86400)))
|
|
|
|
rb_raise(rb_eArgError, "utc_offset out of range");
|
|
|
|
}
|
|
|
|
|
2009-04-25 11:20:20 +04:00
|
|
|
static void
|
|
|
|
validate_vtm(struct vtm *vtm)
|
|
|
|
{
|
|
|
|
if ( vtm->mon < 1 || vtm->mon > 12
|
|
|
|
|| vtm->mday < 1 || vtm->mday > 31
|
|
|
|
|| vtm->hour < 0 || vtm->hour > 24
|
|
|
|
|| (vtm->hour == 24 && (vtm->min > 0 || vtm->sec > 0))
|
|
|
|
|| vtm->min < 0 || vtm->min > 59
|
|
|
|
|| vtm->sec < 0 || vtm->sec > 60
|
2009-08-29 23:06:29 +04:00
|
|
|
|| lt(vtm->subsecx, INT2FIX(0)) || ge(vtm->subsecx, INT2FIX(TIME_SCALE))
|
2009-05-12 16:07:49 +04:00
|
|
|
|| (!NIL_P(vtm->utc_offset) && (validate_utc_offset(vtm->utc_offset), 0)))
|
2009-04-25 11:20:20 +04:00
|
|
|
rb_raise(rb_eArgError, "argument out of range");
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static void
|
2009-04-21 18:56:59 +04:00
|
|
|
time_arg(int argc, VALUE *argv, struct vtm *vtm)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-01-23 06:39:25 +03:00
|
|
|
VALUE v[8];
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
vtm->year = INT2FIX(0);
|
|
|
|
vtm->mon = 0;
|
|
|
|
vtm->mday = 0;
|
|
|
|
vtm->hour = 0;
|
|
|
|
vtm->min = 0;
|
|
|
|
vtm->sec = 0;
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm->subsecx = INT2FIX(0);
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm->utc_offset = Qnil;
|
|
|
|
vtm->wday = 0;
|
|
|
|
vtm->yday = 0;
|
|
|
|
vtm->isdst = 0;
|
|
|
|
vtm->zone = "";
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if (argc == 10) {
|
|
|
|
v[0] = argv[5];
|
|
|
|
v[1] = argv[4];
|
|
|
|
v[2] = argv[3];
|
|
|
|
v[3] = argv[2];
|
|
|
|
v[4] = argv[1];
|
|
|
|
v[5] = argv[0];
|
2003-06-23 08:47:30 +04:00
|
|
|
v[6] = Qnil;
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm->isdst = RTEST(argv[8]) ? 1 : 0;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
else {
|
2003-01-23 06:39:25 +03:00
|
|
|
rb_scan_args(argc, argv, "17", &v[0],&v[1],&v[2],&v[3],&v[4],&v[5],&v[6],&v[7]);
|
|
|
|
/* v[6] may be usec or zone (parsedate) */
|
|
|
|
/* v[7] is wday (parsedate; ignored) */
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm->wday = -1;
|
|
|
|
vtm->isdst = -1;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-04-21 20:43:15 +04:00
|
|
|
vtm->year = obj2vint(v[0]);
|
2001-12-17 09:45:37 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if (NIL_P(v[1])) {
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm->mon = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2003-01-23 06:39:25 +03:00
|
|
|
else {
|
2009-04-25 11:20:20 +04:00
|
|
|
vtm->mon = month_arg(v[1]);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if (NIL_P(v[2])) {
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm->mday = 1;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else {
|
2009-09-23 08:16:41 +04:00
|
|
|
vtm->mday = obj2int(v[2]);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
vtm->hour = NIL_P(v[3])?0:obj2int(v[3]);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-09-23 08:16:41 +04:00
|
|
|
vtm->min = NIL_P(v[4])?0:obj2int(v[4]);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (!NIL_P(v[6]) && argc == 7) {
|
2009-09-23 08:16:41 +04:00
|
|
|
vtm->sec = NIL_P(v[5])?0:obj2int(v[5]);
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm->subsecx = usec2subsecx(v[6]);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
else {
|
2004-06-23 16:59:01 +04:00
|
|
|
/* when argc == 8, v[6] is timezone, but ignored */
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm->sec = NIL_P(v[5])?0:obj2subsecx(v[5], &vtm->subsecx);
|
2003-01-23 06:39:25 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-04-25 11:20:20 +04:00
|
|
|
validate_vtm(vtm);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-03-31 14:27:58 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
leap_year_p(long y)
|
2004-03-31 14:27:58 +04:00
|
|
|
{
|
2004-06-23 16:59:01 +04:00
|
|
|
return ((y % 4 == 0) && (y % 100 != 0)) || (y % 400 == 0);
|
2004-03-31 14:27:58 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static time_t
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
timegm_noleapsecond(struct tm *tm)
|
2004-03-31 14:27:58 +04:00
|
|
|
{
|
|
|
|
long tm_year = tm->tm_year;
|
|
|
|
int tm_yday = tm->tm_mday;
|
|
|
|
if (leap_year_p(tm_year + 1900))
|
2004-06-23 16:59:01 +04:00
|
|
|
tm_yday += leap_year_yday_offset[tm->tm_mon];
|
2004-03-31 14:27:58 +04:00
|
|
|
else
|
2004-06-23 16:59:01 +04:00
|
|
|
tm_yday += common_year_yday_offset[tm->tm_mon];
|
2004-03-31 14:27:58 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* `Seconds Since the Epoch' in SUSv3:
|
|
|
|
* tm_sec + tm_min*60 + tm_hour*3600 + tm_yday*86400 +
|
|
|
|
* (tm_year-70)*31536000 + ((tm_year-69)/4)*86400 -
|
|
|
|
* ((tm_year-1)/100)*86400 + ((tm_year+299)/400)*86400
|
|
|
|
*/
|
|
|
|
return tm->tm_sec + tm->tm_min*60 + tm->tm_hour*3600 +
|
2004-06-23 16:59:01 +04:00
|
|
|
(time_t)(tm_yday +
|
|
|
|
(tm_year-70)*365 +
|
|
|
|
DIV(tm_year-69,4) -
|
|
|
|
DIV(tm_year-1,100) +
|
|
|
|
DIV(tm_year+299,400))*86400;
|
2004-03-31 14:27:58 +04:00
|
|
|
}
|
|
|
|
|
2009-07-02 21:53:21 +04:00
|
|
|
#if 0
|
|
|
|
#define DEBUG_FIND_TIME_NUMGUESS
|
2009-07-03 17:49:41 +04:00
|
|
|
#define DEBUG_GUESSRANGE
|
2009-07-02 21:53:21 +04:00
|
|
|
#endif
|
|
|
|
|
2009-07-03 17:49:41 +04:00
|
|
|
#ifdef DEBUG_GUESSRANGE
|
|
|
|
#define DEBUG_REPORT_GUESSRANGE fprintf(stderr, "find time guess range: %ld - %ld : %lu\n", guess_lo, guess_hi, (unsigned_time_t)(guess_hi-guess_lo))
|
|
|
|
#else
|
2009-07-02 21:53:21 +04:00
|
|
|
#define DEBUG_REPORT_GUESSRANGE
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef DEBUG_FIND_TIME_NUMGUESS
|
|
|
|
#define DEBUG_FIND_TIME_NUMGUESS_INC find_time_numguess++,
|
2009-07-02 19:37:06 +04:00
|
|
|
static unsigned long long find_time_numguess;
|
|
|
|
|
|
|
|
static VALUE find_time_numguess_getter(void)
|
|
|
|
{
|
|
|
|
return ULL2NUM(find_time_numguess);
|
|
|
|
}
|
2009-07-02 21:53:21 +04:00
|
|
|
#else
|
|
|
|
#define DEBUG_FIND_TIME_NUMGUESS_INC
|
2009-07-02 19:37:06 +04:00
|
|
|
#endif
|
|
|
|
|
2009-04-21 19:32:19 +04:00
|
|
|
static const char *
|
2009-04-21 18:56:59 +04:00
|
|
|
find_time_t(struct tm *tptr, int utc_p, time_t *tp)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-07-02 21:53:21 +04:00
|
|
|
time_t guess, guess0, guess_lo, guess_hi;
|
2009-07-05 19:11:27 +04:00
|
|
|
struct tm *tm, tm0, tm_lo, tm_hi;
|
2009-07-02 19:37:06 +04:00
|
|
|
int d;
|
2001-05-30 13:12:34 +04:00
|
|
|
int find_dst;
|
2009-04-22 05:40:09 +04:00
|
|
|
struct tm result;
|
2009-07-02 21:53:21 +04:00
|
|
|
int status;
|
2009-07-02 19:37:06 +04:00
|
|
|
|
2009-07-02 21:53:21 +04:00
|
|
|
#define GUESS(p) (DEBUG_FIND_TIME_NUMGUESS_INC (utc_p ? gmtime_with_leapsecond(p, &result) : LOCALTIME(p, result)))
|
2001-05-30 13:12:34 +04:00
|
|
|
|
2009-07-05 19:11:27 +04:00
|
|
|
guess_lo = TIMET_MIN;
|
|
|
|
guess_hi = TIMET_MAX;
|
|
|
|
|
2001-12-17 09:45:37 +03:00
|
|
|
find_dst = 0 < tptr->tm_isdst;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-08-30 18:44:54 +04:00
|
|
|
#if defined(HAVE_MKTIME)
|
|
|
|
tm0 = *tptr;
|
|
|
|
if (!utc_p && (guess = mktime(&tm0)) != -1) {
|
|
|
|
tm = GUESS(&guess);
|
|
|
|
if (tm && tmcmp(tptr, tm) == 0) {
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-07-05 19:11:27 +04:00
|
|
|
tm0 = *tptr;
|
|
|
|
if (tm0.tm_mon < 0) {
|
|
|
|
tm0.tm_mon = 0;
|
|
|
|
tm0.tm_mday = 1;
|
|
|
|
tm0.tm_hour = 0;
|
|
|
|
tm0.tm_min = 0;
|
|
|
|
tm0.tm_sec = 0;
|
|
|
|
}
|
|
|
|
else if (11 < tm0.tm_mon) {
|
|
|
|
tm0.tm_mon = 11;
|
|
|
|
tm0.tm_mday = 31;
|
|
|
|
tm0.tm_hour = 23;
|
|
|
|
tm0.tm_min = 59;
|
|
|
|
tm0.tm_sec = 60;
|
|
|
|
}
|
|
|
|
else if (tm0.tm_mday < 1) {
|
|
|
|
tm0.tm_mday = 1;
|
|
|
|
tm0.tm_hour = 0;
|
|
|
|
tm0.tm_min = 0;
|
|
|
|
tm0.tm_sec = 0;
|
|
|
|
}
|
|
|
|
else if ((d = (leap_year_p(1900 + tm0.tm_year) ?
|
|
|
|
leap_year_days_in_month :
|
|
|
|
common_year_days_in_month)[tm0.tm_mon]) < tm0.tm_mday) {
|
|
|
|
tm0.tm_mday = d;
|
|
|
|
tm0.tm_hour = 23;
|
|
|
|
tm0.tm_min = 59;
|
|
|
|
tm0.tm_sec = 60;
|
|
|
|
}
|
|
|
|
else if (tm0.tm_hour < 0) {
|
|
|
|
tm0.tm_hour = 0;
|
|
|
|
tm0.tm_min = 0;
|
|
|
|
tm0.tm_sec = 0;
|
|
|
|
}
|
|
|
|
else if (23 < tm0.tm_hour) {
|
|
|
|
tm0.tm_hour = 23;
|
|
|
|
tm0.tm_min = 59;
|
|
|
|
tm0.tm_sec = 60;
|
|
|
|
}
|
|
|
|
else if (tm0.tm_min < 0) {
|
|
|
|
tm0.tm_min = 0;
|
|
|
|
tm0.tm_sec = 0;
|
|
|
|
}
|
|
|
|
else if (59 < tm0.tm_min) {
|
|
|
|
tm0.tm_min = 59;
|
|
|
|
tm0.tm_sec = 60;
|
|
|
|
}
|
|
|
|
else if (tm0.tm_sec < 0) {
|
|
|
|
tm0.tm_sec = 0;
|
|
|
|
}
|
|
|
|
else if (60 < tm0.tm_sec) {
|
|
|
|
tm0.tm_sec = 60;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-07-02 21:53:21 +04:00
|
|
|
DEBUG_REPORT_GUESSRANGE;
|
2009-07-05 19:11:27 +04:00
|
|
|
guess0 = guess = timegm_noleapsecond(&tm0);
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = GUESS(&guess);
|
2004-03-31 14:27:58 +04:00
|
|
|
if (tm) {
|
2004-06-23 16:59:01 +04:00
|
|
|
d = tmcmp(tptr, tm);
|
2009-04-21 18:56:59 +04:00
|
|
|
if (d == 0) { goto found; }
|
2004-06-23 16:59:01 +04:00
|
|
|
if (d < 0) {
|
|
|
|
guess_hi = guess;
|
|
|
|
guess -= 24 * 60 * 60;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
guess_lo = guess;
|
|
|
|
guess += 24 * 60 * 60;
|
|
|
|
}
|
2009-07-02 21:53:21 +04:00
|
|
|
DEBUG_REPORT_GUESSRANGE;
|
2008-08-22 05:52:42 +04:00
|
|
|
if (guess_lo < guess && guess < guess_hi && (tm = GUESS(&guess)) != NULL) {
|
2004-06-23 16:59:01 +04:00
|
|
|
d = tmcmp(tptr, tm);
|
2009-04-21 18:56:59 +04:00
|
|
|
if (d == 0) { goto found; }
|
2004-06-23 16:59:01 +04:00
|
|
|
if (d < 0)
|
|
|
|
guess_hi = guess;
|
|
|
|
else
|
|
|
|
guess_lo = guess;
|
2009-07-02 21:53:21 +04:00
|
|
|
DEBUG_REPORT_GUESSRANGE;
|
2004-06-23 16:59:01 +04:00
|
|
|
}
|
2004-03-30 15:31:44 +04:00
|
|
|
}
|
|
|
|
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = GUESS(&guess_lo);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (!tm) goto error;
|
2001-05-24 10:10:36 +04:00
|
|
|
d = tmcmp(tptr, tm);
|
|
|
|
if (d < 0) goto out_of_range;
|
2009-04-21 18:56:59 +04:00
|
|
|
if (d == 0) { guess = guess_lo; goto found; }
|
2001-05-24 10:10:36 +04:00
|
|
|
tm_lo = *tm;
|
2001-05-02 08:22:21 +04:00
|
|
|
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = GUESS(&guess_hi);
|
2001-05-24 10:10:36 +04:00
|
|
|
if (!tm) goto error;
|
|
|
|
d = tmcmp(tptr, tm);
|
|
|
|
if (d > 0) goto out_of_range;
|
2009-04-21 18:56:59 +04:00
|
|
|
if (d == 0) { guess = guess_hi; goto found; }
|
2001-05-24 10:10:36 +04:00
|
|
|
tm_hi = *tm;
|
|
|
|
|
2009-07-02 21:53:21 +04:00
|
|
|
DEBUG_REPORT_GUESSRANGE;
|
2001-05-30 13:12:34 +04:00
|
|
|
|
2009-07-02 21:53:21 +04:00
|
|
|
status = 1;
|
2004-06-23 16:59:01 +04:00
|
|
|
|
2009-07-02 21:53:21 +04:00
|
|
|
while (guess_lo + 1 < guess_hi) {
|
|
|
|
if (status == 0) {
|
|
|
|
binsearch:
|
2009-07-02 19:37:06 +04:00
|
|
|
guess = guess_lo / 2 + guess_hi / 2;
|
|
|
|
if (guess <= guess_lo)
|
|
|
|
guess = guess_lo + 1;
|
|
|
|
else if (guess >= guess_hi)
|
|
|
|
guess = guess_hi - 1;
|
2009-07-02 21:53:21 +04:00
|
|
|
status = 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (status == 1) {
|
|
|
|
time_t guess0_hi = timegm_noleapsecond(&tm_hi);
|
|
|
|
guess = guess_hi - (guess0_hi - guess0);
|
2009-07-03 17:49:41 +04:00
|
|
|
if (guess == guess_hi) /* hh:mm:60 tends to cause this condition. */
|
|
|
|
guess--;
|
2009-07-02 21:53:21 +04:00
|
|
|
status = 2;
|
|
|
|
}
|
|
|
|
else if (status == 2) {
|
|
|
|
time_t guess0_lo = timegm_noleapsecond(&tm_lo);
|
|
|
|
guess = guess_lo + (guess0 - guess0_lo);
|
2009-07-03 17:49:41 +04:00
|
|
|
if (guess == guess_lo)
|
|
|
|
guess++;
|
2009-07-02 21:53:21 +04:00
|
|
|
status = 0;
|
|
|
|
}
|
|
|
|
if (guess <= guess_lo || guess_hi <= guess) {
|
|
|
|
/* Precious guess is invalid. try binary search. */
|
2009-07-03 17:49:41 +04:00
|
|
|
#ifdef DEBUG_GUESSRANGE
|
|
|
|
if (guess <= guess_lo) fprintf(stderr, "too small guess: %ld <= %ld\n", guess, guess_lo);
|
|
|
|
if (guess_hi <= guess) fprintf(stderr, "too big guess: %ld <= %ld\n", guess_hi, guess);
|
|
|
|
#endif
|
2009-07-02 21:53:21 +04:00
|
|
|
goto binsearch;
|
|
|
|
}
|
2009-07-02 19:37:06 +04:00
|
|
|
}
|
2004-06-23 16:59:01 +04:00
|
|
|
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = GUESS(&guess);
|
2004-06-23 16:59:01 +04:00
|
|
|
if (!tm) goto error;
|
2009-02-22 17:23:33 +03:00
|
|
|
|
2004-06-23 16:59:01 +04:00
|
|
|
d = tmcmp(tptr, tm);
|
2009-07-02 19:37:06 +04:00
|
|
|
|
|
|
|
if (d < 0) {
|
|
|
|
guess_hi = guess;
|
|
|
|
tm_hi = *tm;
|
2009-07-02 21:53:21 +04:00
|
|
|
DEBUG_REPORT_GUESSRANGE;
|
2009-07-02 19:37:06 +04:00
|
|
|
}
|
|
|
|
else if (d > 0) {
|
|
|
|
guess_lo = guess;
|
|
|
|
tm_lo = *tm;
|
2009-07-02 21:53:21 +04:00
|
|
|
DEBUG_REPORT_GUESSRANGE;
|
2009-07-02 19:37:06 +04:00
|
|
|
}
|
|
|
|
else {
|
2009-04-21 18:56:59 +04:00
|
|
|
found:
|
2004-06-23 16:59:01 +04:00
|
|
|
if (!utc_p) {
|
|
|
|
/* If localtime is nonmonotonic, another result may exist. */
|
|
|
|
time_t guess2;
|
|
|
|
if (find_dst) {
|
|
|
|
guess2 = guess - 2 * 60 * 60;
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = LOCALTIME(&guess2, result);
|
2004-06-23 16:59:01 +04:00
|
|
|
if (tm) {
|
|
|
|
if (tptr->tm_hour != (tm->tm_hour + 2) % 24 ||
|
|
|
|
tptr->tm_min != tm->tm_min ||
|
2009-04-21 18:56:59 +04:00
|
|
|
tptr->tm_sec != tm->tm_sec) {
|
2004-06-23 16:59:01 +04:00
|
|
|
guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 +
|
|
|
|
(tm->tm_min - tptr->tm_min) * 60 +
|
|
|
|
(tm->tm_sec - tptr->tm_sec);
|
|
|
|
if (tptr->tm_mday != tm->tm_mday)
|
|
|
|
guess2 += 24 * 60 * 60;
|
|
|
|
if (guess != guess2) {
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = LOCALTIME(&guess2, result);
|
2004-06-23 16:59:01 +04:00
|
|
|
if (tmcmp(tptr, tm) == 0) {
|
|
|
|
if (guess < guess2)
|
2009-04-21 18:56:59 +04:00
|
|
|
*tp = guess;
|
2004-06-23 16:59:01 +04:00
|
|
|
else
|
2009-04-21 18:56:59 +04:00
|
|
|
*tp = guess2;
|
|
|
|
return NULL;
|
2004-06-23 16:59:01 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
guess2 = guess + 2 * 60 * 60;
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = LOCALTIME(&guess2, result);
|
2004-06-23 16:59:01 +04:00
|
|
|
if (tm) {
|
|
|
|
if ((tptr->tm_hour + 2) % 24 != tm->tm_hour ||
|
|
|
|
tptr->tm_min != tm->tm_min ||
|
2009-04-21 18:56:59 +04:00
|
|
|
tptr->tm_sec != tm->tm_sec) {
|
2004-06-23 16:59:01 +04:00
|
|
|
guess2 -= (tm->tm_hour - tptr->tm_hour) * 60 * 60 +
|
|
|
|
(tm->tm_min - tptr->tm_min) * 60 +
|
|
|
|
(tm->tm_sec - tptr->tm_sec);
|
|
|
|
if (tptr->tm_mday != tm->tm_mday)
|
|
|
|
guess2 -= 24 * 60 * 60;
|
|
|
|
if (guess != guess2) {
|
2008-08-22 05:52:42 +04:00
|
|
|
tm = LOCALTIME(&guess2, result);
|
2004-06-23 16:59:01 +04:00
|
|
|
if (tmcmp(tptr, tm) == 0) {
|
|
|
|
if (guess < guess2)
|
2009-04-21 18:56:59 +04:00
|
|
|
*tp = guess2;
|
2004-06-23 16:59:01 +04:00
|
|
|
else
|
2009-04-21 18:56:59 +04:00
|
|
|
*tp = guess;
|
|
|
|
return NULL;
|
2004-06-23 16:59:01 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-05-30 13:12:34 +04:00
|
|
|
}
|
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
*tp = guess;
|
|
|
|
return NULL;
|
2001-05-16 13:05:54 +04:00
|
|
|
}
|
2001-05-24 10:10:36 +04:00
|
|
|
}
|
2001-05-30 13:12:34 +04:00
|
|
|
/* Given argument has no corresponding time_t. Let's outerpolation. */
|
|
|
|
if (tm_lo.tm_year == tptr->tm_year && tm_lo.tm_mon == tptr->tm_mon) {
|
2009-04-21 18:56:59 +04:00
|
|
|
*tp = guess_lo +
|
|
|
|
(tptr->tm_mday - tm_lo.tm_mday) * 24 * 60 * 60 +
|
|
|
|
(tptr->tm_hour - tm_lo.tm_hour) * 60 * 60 +
|
|
|
|
(tptr->tm_min - tm_lo.tm_min) * 60 +
|
|
|
|
(tptr->tm_sec - tm_lo.tm_sec);
|
|
|
|
return NULL;
|
2001-05-24 10:10:36 +04:00
|
|
|
}
|
2001-05-30 13:12:34 +04:00
|
|
|
else if (tm_hi.tm_year == tptr->tm_year && tm_hi.tm_mon == tptr->tm_mon) {
|
2009-04-21 18:56:59 +04:00
|
|
|
*tp = guess_hi +
|
|
|
|
(tptr->tm_mday - tm_hi.tm_mday) * 24 * 60 * 60 +
|
|
|
|
(tptr->tm_hour - tm_hi.tm_hour) * 60 * 60 +
|
|
|
|
(tptr->tm_min - tm_hi.tm_min) * 60 +
|
|
|
|
(tptr->tm_sec - tm_hi.tm_sec);
|
|
|
|
return NULL;
|
2000-06-12 11:48:31 +04:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
|
|
|
|
out_of_range:
|
2009-04-21 18:56:59 +04:00
|
|
|
return "time out of range";
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
error:
|
2009-04-21 18:56:59 +04:00
|
|
|
return "gmtime/localtime error";
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static int
|
|
|
|
vtmcmp(struct vtm *a, struct vtm *b)
|
|
|
|
{
|
|
|
|
if (ne(a->year, b->year))
|
|
|
|
return lt(a->year, b->year) ? -1 : 1;
|
|
|
|
else if (a->mon != b->mon)
|
|
|
|
return a->mon < b->mon ? -1 : 1;
|
|
|
|
else if (a->mday != b->mday)
|
|
|
|
return a->mday < b->mday ? -1 : 1;
|
|
|
|
else if (a->hour != b->hour)
|
|
|
|
return a->hour < b->hour ? -1 : 1;
|
|
|
|
else if (a->min != b->min)
|
|
|
|
return a->min < b->min ? -1 : 1;
|
|
|
|
else if (a->sec != b->sec)
|
|
|
|
return a->sec < b->sec ? -1 : 1;
|
2009-08-29 23:06:29 +04:00
|
|
|
else if (ne(a->subsecx, b->subsecx))
|
|
|
|
return lt(a->subsecx, b->subsecx) ? -1 : 1;
|
2009-04-21 18:56:59 +04:00
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
2008-08-22 05:52:42 +04:00
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static int
|
|
|
|
tmcmp(struct tm *a, struct tm *b)
|
|
|
|
{
|
|
|
|
if (a->tm_year != b->tm_year)
|
|
|
|
return a->tm_year < b->tm_year ? -1 : 1;
|
|
|
|
else if (a->tm_mon != b->tm_mon)
|
|
|
|
return a->tm_mon < b->tm_mon ? -1 : 1;
|
|
|
|
else if (a->tm_mday != b->tm_mday)
|
|
|
|
return a->tm_mday < b->tm_mday ? -1 : 1;
|
|
|
|
else if (a->tm_hour != b->tm_hour)
|
|
|
|
return a->tm_hour < b->tm_hour ? -1 : 1;
|
|
|
|
else if (a->tm_min != b->tm_min)
|
|
|
|
return a->tm_min < b->tm_min ? -1 : 1;
|
|
|
|
else if (a->tm_sec != b->tm_sec)
|
|
|
|
return a->tm_sec < b->tm_sec ? -1 : 1;
|
|
|
|
else
|
|
|
|
return 0;
|
2001-12-17 09:45:37 +03:00
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_utc_or_local(int argc, VALUE *argv, int utc_p, VALUE klass)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2009-04-21 18:56:59 +04:00
|
|
|
struct vtm vtm;
|
1999-08-13 09:45:20 +04:00
|
|
|
VALUE time;
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
time_arg(argc, argv, &vtm);
|
|
|
|
if (utc_p)
|
2009-08-29 23:06:29 +04:00
|
|
|
time = time_new_timexv(klass, timegmxv(&vtm));
|
2009-04-21 18:56:59 +04:00
|
|
|
else
|
2009-08-29 23:06:29 +04:00
|
|
|
time = time_new_timexv(klass, timelocalxv(&vtm));
|
2000-07-06 11:21:26 +04:00
|
|
|
if (utc_p) return time_gmtime(time);
|
1999-08-13 09:45:20 +04:00
|
|
|
return time_localtime(time);
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-11-19 17:40:15 +03:00
|
|
|
* Time.utc(year) => time
|
|
|
|
* Time.utc(year, month) => time
|
|
|
|
* Time.utc(year, month, day) => time
|
|
|
|
* Time.utc(year, month, day, hour) => time
|
|
|
|
* Time.utc(year, month, day, hour, min) => time
|
|
|
|
* Time.utc(year, month, day, hour, min, sec_with_frac) => time
|
|
|
|
* Time.utc(year, month, day, hour, min, sec, usec_with_frac) => time
|
|
|
|
* Time.utc(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time
|
|
|
|
* Time.gm(year) => time
|
|
|
|
* Time.gm(year, month) => time
|
|
|
|
* Time.gm(year, month, day) => time
|
|
|
|
* Time.gm(year, month, day, hour) => time
|
|
|
|
* Time.gm(year, month, day, hour, min) => time
|
|
|
|
* Time.gm(year, month, day, hour, min, sec_with_frac) => time
|
|
|
|
* Time.gm(year, month, day, hour, min, sec, usec_with_frac) => time
|
|
|
|
* Time.gm(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Creates a time based on given values, interpreted as UTC (GMT). The
|
|
|
|
* year must be specified. Other values default to the minimum value
|
|
|
|
* for that field (and may be <code>nil</code> or omitted). Months may
|
|
|
|
* be specified by numbers from 1 to 12, or by the three-letter English
|
|
|
|
* month names. Hours are specified on a 24-hour clock (0..23). Raises
|
|
|
|
* an <code>ArgumentError</code> if any values are out of range. Will
|
|
|
|
* also accept ten arguments in the order output by
|
|
|
|
* <code>Time#to_a</code>.
|
2007-11-19 17:40:15 +03:00
|
|
|
* <i>sec_with_frac</i> and <i>usec_with_frac</i> can have a fractional part.
|
2003-12-27 09:33:45 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* Time.utc(2000,"jan",1,20,15,1) #=> 2000-01-01 20:15:01 UTC
|
|
|
|
* Time.gm(2000,"jan",1,20,15,1) #=> 2000-01-01 20:15:01 UTC
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_s_mkutc(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-09-23 08:16:41 +04:00
|
|
|
return time_utc_or_local(argc, argv, TRUE, klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-11-19 17:40:15 +03:00
|
|
|
* Time.local(year) => time
|
|
|
|
* Time.local(year, month) => time
|
|
|
|
* Time.local(year, month, day) => time
|
|
|
|
* Time.local(year, month, day, hour) => time
|
|
|
|
* Time.local(year, month, day, hour, min) => time
|
|
|
|
* Time.local(year, month, day, hour, min, sec_with_frac) => time
|
|
|
|
* Time.local(year, month, day, hour, min, sec, usec_with_frac) => time
|
|
|
|
* Time.local(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time
|
|
|
|
* Time.mktime(year) => time
|
|
|
|
* Time.mktime(year, month) => time
|
|
|
|
* Time.mktime(year, month, day) => time
|
|
|
|
* Time.mktime(year, month, day, hour) => time
|
|
|
|
* Time.mktime(year, month, day, hour, min) => time
|
|
|
|
* Time.mktime(year, month, day, hour, min, sec_with_frac) => time
|
|
|
|
* Time.mktime(year, month, day, hour, min, sec, usec_with_frac) => time
|
|
|
|
* Time.mktime(sec, min, hour, day, month, year, wday, yday, isdst, tz) => time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Same as <code>Time::gm</code>, but interprets the values in the
|
|
|
|
* local time zone.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* Time.local(2000,"jan",1,20,15,1) #=> 2000-01-01 20:15:01 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_s_mktime(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-09-23 08:16:41 +04:00
|
|
|
return time_utc_or_local(argc, argv, FALSE, klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.to_i => int
|
|
|
|
* time.tv_sec => int
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the value of <i>time</i> as an integer number of seconds
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
* since the Epoch.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* t = Time.now
|
|
|
|
* "%10.5f" % t.to_f #=> "1049896564.17839"
|
|
|
|
* t.to_i #=> 1049896564
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_to_i(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
return div(tobj->timexv, INT2FIX(TIME_SCALE));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.to_f => float
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the value of <i>time</i> as a floating point number of
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
* seconds since the Epoch.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* t = Time.now
|
|
|
|
* "%10.5f" % t.to_f #=> "1049896564.13654"
|
|
|
|
* t.to_i #=> 1049896564
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
*
|
|
|
|
* Note that IEEE 754 double is not accurate enough to represent
|
|
|
|
* nanoseconds from the Epoch.
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_to_f(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
return rb_Float(rb_time_unmagnify(tobj->timexv));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-05-19 18:00:04 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.to_r => Rational
|
|
|
|
*
|
|
|
|
* Returns the value of <i>time</i> as a rational number of seconds
|
|
|
|
* since the Epoch.
|
|
|
|
*
|
|
|
|
* t = Time.now
|
|
|
|
* p t.to_r #=> (8807170717088293/8388608)
|
|
|
|
*
|
|
|
|
* This methods is intended to be used to get an accurate value
|
|
|
|
* representing nanoseconds from the Epoch. You can use this
|
|
|
|
* to convert time to another Epoch.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_to_r(VALUE time)
|
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
return rb_time_unmagnify(tobj->timexv);
|
2009-05-19 18:00:04 +04:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.usec => int
|
|
|
|
* time.tv_usec => int
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns just the number of microseconds for <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:03:26 -0600
|
|
|
|
* "%10.6f" % t.to_f #=> "1195481006.775195"
|
|
|
|
* t.usec #=> 775195
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_usec(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
return rb_to_int(mulquo(mod(tobj->timexv, INT2FIX(TIME_SCALE)), INT2FIX(1000000), INT2FIX(TIME_SCALE)));
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.nsec => int
|
|
|
|
* time.tv_nsec => int
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
* Returns just the number of nanoseconds for <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
* t = Time.now #=> 2007-11-17 15:18:03 +0900
|
|
|
|
* "%10.9f" % t.to_f #=> "1195280283.536151409"
|
|
|
|
* t.nsec #=> 536151406
|
|
|
|
*
|
|
|
|
* The lowest digit of to_f and nsec is different because
|
|
|
|
* IEEE 754 double is not accurate enough to represent
|
|
|
|
* nanoseconds from the Epoch.
|
2007-11-19 17:40:15 +03:00
|
|
|
* The accurate value is returned by nsec.
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_nsec(VALUE time)
|
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
return rb_to_int(mulquo(mod(tobj->timexv, INT2FIX(TIME_SCALE)), INT2FIX(1000000000), INT2FIX(TIME_SCALE)));
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.subsec => number
|
|
|
|
*
|
|
|
|
* Returns just the fraction for <i>time</i>.
|
|
|
|
*
|
|
|
|
* The result is possibly rational.
|
|
|
|
*
|
|
|
|
* t = Time.now #=> 2009-03-26 22:33:12 +0900
|
|
|
|
* "%10.9f" % t.to_f #=> "1238074392.940563917"
|
|
|
|
* t.subsec #=> (94056401/100000000)
|
|
|
|
*
|
|
|
|
* The lowest digit of to_f and subsec is different because
|
|
|
|
* IEEE 754 double is not accurate enough to represent
|
|
|
|
* the rational.
|
|
|
|
* The accurate value is returned by subsec.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_subsec(VALUE time)
|
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
return quo(mod(tobj->timexv, INT2FIX(TIME_SCALE)), INT2FIX(TIME_SCALE));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2009-10-28 07:50:09 +03:00
|
|
|
* time <=> other_time => -1, 0, +1 or nil
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2008-02-02 11:46:05 +03:00
|
|
|
* Comparison---Compares <i>time</i> with <i>other_time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:12:12 -0600
|
|
|
|
* t2 = t + 2592000 #=> 2007-12-19 08:12:12 -0600
|
|
|
|
* t <=> t2 #=> -1
|
|
|
|
* t2 <=> t #=> 1
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:13:38 -0600
|
|
|
|
* t2 = t + 0.1 #=> 2007-11-19 08:13:38 -0600
|
|
|
|
* t.nsec #=> 98222999
|
|
|
|
* t2.nsec #=> 198222999
|
2003-12-27 09:33:45 +03:00
|
|
|
* t <=> t2 #=> -1
|
|
|
|
* t2 <=> t #=> 1
|
|
|
|
* t <=> t #=> 0
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_cmp(VALUE time1, VALUE time2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj1, *tobj2;
|
2009-04-21 18:56:59 +04:00
|
|
|
int n;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
GetTimeval(time1, tobj1);
|
2009-09-09 07:43:48 +04:00
|
|
|
if (IsTimeval(time2)) {
|
2003-05-19 19:45:46 +04:00
|
|
|
GetTimeval(time2, tobj2);
|
2009-08-29 23:06:29 +04:00
|
|
|
n = rb_cmpint(cmp(tobj1->timexv, tobj2->timexv), tobj1->timexv, tobj2->timexv);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-08-13 11:13:27 +04:00
|
|
|
else {
|
|
|
|
VALUE cmp;
|
|
|
|
|
|
|
|
cmp = rb_funcall(time2, rb_intern("<=>"), 1, time1);
|
|
|
|
if (NIL_P(cmp)) return Qnil;
|
2003-05-16 09:13:17 +04:00
|
|
|
|
2009-03-26 19:35:18 +03:00
|
|
|
n = -rb_cmpint(cmp, time1, time2);
|
2008-08-13 11:13:27 +04:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
if (n == 0) return INT2FIX(0);
|
|
|
|
if (n > 0) return INT2FIX(1);
|
|
|
|
return INT2FIX(-1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.eql?(other_time)
|
|
|
|
*
|
|
|
|
* Return <code>true</code> if <i>time</i> and <i>other_time</i> are
|
|
|
|
* both <code>Time</code> objects with the same seconds and fractional
|
|
|
|
* seconds.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_eql(VALUE time1, VALUE time2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj1, *tobj2;
|
|
|
|
|
|
|
|
GetTimeval(time1, tobj1);
|
2009-09-09 07:43:48 +04:00
|
|
|
if (IsTimeval(time2)) {
|
1998-01-16 15:13:05 +03:00
|
|
|
GetTimeval(time2, tobj2);
|
2009-08-29 23:06:29 +04:00
|
|
|
return rb_equal(tobj1->timexv, tobj2->timexv);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.utc? => true or false
|
|
|
|
* time.gmt? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents a time in UTC
|
|
|
|
* (GMT).
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:15:23 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.utc? #=> false
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.gm(2000,"jan",1,20,15,1) #=> 2000-01-01 20:15:01 UTC
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.utc? #=> true
|
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:16:03 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.gmt? #=> false
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.gm(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 UTC
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.gmt? #=> true
|
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_utc_p(VALUE time)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
if (TIME_UTC_P(tobj)) return Qtrue;
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.hash => fixnum
|
|
|
|
*
|
|
|
|
* Return a hash code for this time object.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_hash(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
return rb_hash(tobj->timexv);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-01-18 17:16:47 +03:00
|
|
|
/* :nodoc: */
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_init_copy(VALUE copy, VALUE time)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2002-08-27 12:31:08 +04:00
|
|
|
struct time_object *tobj, *tcopy;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2002-09-03 09:20:14 +04:00
|
|
|
if (copy == time) return copy;
|
|
|
|
time_modify(copy);
|
1999-08-13 09:45:20 +04:00
|
|
|
GetTimeval(time, tobj);
|
2002-08-27 12:31:08 +04:00
|
|
|
GetTimeval(copy, tcopy);
|
|
|
|
MEMCPY(tcopy, tobj, struct time_object, 1);
|
|
|
|
|
|
|
|
return copy;
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2002-08-27 12:31:08 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_dup(VALUE time)
|
2002-08-27 12:31:08 +04:00
|
|
|
{
|
2006-10-31 11:08:46 +03:00
|
|
|
VALUE dup = time_s_alloc(CLASS_OF(time));
|
2003-05-19 09:41:08 +04:00
|
|
|
time_init_copy(dup, time);
|
2002-08-27 12:31:08 +04:00
|
|
|
return dup;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_localtime(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct vtm vtm;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
if (TIME_LOCALTIME_P(tobj)) {
|
2001-12-03 13:07:48 +03:00
|
|
|
if (tobj->tm_got)
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
else {
|
2001-10-29 08:07:26 +03:00
|
|
|
time_modify(time);
|
2000-06-19 12:38:11 +04:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!localtimexv(tobj->timexv, &vtm))
|
2001-12-17 09:45:37 +03:00
|
|
|
rb_raise(rb_eArgError, "localtime error");
|
2009-04-21 18:56:59 +04:00
|
|
|
tobj->vtm = vtm;
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
tobj->tm_got = 1;
|
2009-04-25 10:25:06 +04:00
|
|
|
TIME_SET_LOCALTIME(tobj);
|
1998-01-16 15:13:05 +03:00
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
2009-05-12 16:07:49 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.localtime => time
|
|
|
|
* time.localtime(utc_offset) => time
|
|
|
|
*
|
|
|
|
* Converts <i>time</i> to local time (using the local time zone in
|
|
|
|
* effect for this process) modifying the receiver.
|
|
|
|
*
|
|
|
|
* If _utc_offset_ is given, it is used instead of the local time.
|
|
|
|
*
|
|
|
|
* t = Time.utc(2000, "jan", 1, 20, 15, 1) #=> 2000-01-01 20:15:01 UTC
|
|
|
|
* t.utc? #=> true
|
|
|
|
*
|
|
|
|
* t.localtime #=> 2000-01-01 14:15:01 -0600
|
|
|
|
* t.utc? #=> false
|
|
|
|
*
|
|
|
|
* t.localtime("+09:00") #=> 2000-01-02 05:15:01 +0900
|
|
|
|
* t.utc? #=> false
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_localtime_m(int argc, VALUE *argv, VALUE time)
|
|
|
|
{
|
|
|
|
VALUE off;
|
|
|
|
rb_scan_args(argc, argv, "01", &off);
|
|
|
|
|
|
|
|
if (!NIL_P(off)) {
|
|
|
|
off = utc_offset_arg(off);
|
|
|
|
validate_utc_offset(off);
|
|
|
|
|
|
|
|
time_set_utc_offset(time, off);
|
|
|
|
return time_fixoff(time);
|
|
|
|
}
|
|
|
|
|
|
|
|
return time_localtime(time);
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.gmtime => time
|
|
|
|
* time.utc => time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Converts <i>time</i> to UTC (GMT), modifying the receiver.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:18:31 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.gmt? #=> false
|
2007-11-19 17:40:15 +03:00
|
|
|
* t.gmtime #=> 2007-11-19 14:18:31 UTC
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.gmt? #=> true
|
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:18:51 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.utc? #=> false
|
2007-11-19 17:40:15 +03:00
|
|
|
* t.utc #=> 2007-11-19 14:18:51 UTC
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.utc? #=> true
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_gmtime(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct vtm vtm;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
if (TIME_UTC_P(tobj)) {
|
2001-12-03 13:07:48 +03:00
|
|
|
if (tobj->tm_got)
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
else {
|
2001-10-29 08:07:26 +03:00
|
|
|
time_modify(time);
|
2000-06-19 12:38:11 +04:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!gmtimexv(tobj->timexv, &vtm))
|
2001-12-17 09:45:37 +03:00
|
|
|
rb_raise(rb_eArgError, "gmtime error");
|
2009-04-21 18:56:59 +04:00
|
|
|
tobj->vtm = vtm;
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
tobj->tm_got = 1;
|
2009-04-25 10:25:06 +04:00
|
|
|
TIME_SET_UTC(tobj);
|
1998-01-16 15:13:05 +03:00
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
2009-05-12 16:07:49 +04:00
|
|
|
static VALUE
|
|
|
|
time_fixoff(VALUE time)
|
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
struct vtm vtm;
|
|
|
|
VALUE off;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
if (TIME_FIXOFF_P(tobj)) {
|
|
|
|
if (tobj->tm_got)
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
time_modify(time);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (TIME_FIXOFF_P(tobj))
|
|
|
|
off = tobj->vtm.utc_offset;
|
|
|
|
else
|
|
|
|
off = INT2FIX(0);
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
if (!gmtimexv(tobj->timexv, &vtm))
|
2009-05-12 16:07:49 +04:00
|
|
|
rb_raise(rb_eArgError, "gmtime error");
|
|
|
|
|
|
|
|
tobj->vtm = vtm;
|
|
|
|
vtm_add_offset(&tobj->vtm, off);
|
|
|
|
|
|
|
|
tobj->tm_got = 1;
|
|
|
|
TIME_SET_FIXOFF(tobj, off);
|
|
|
|
return time;
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.getlocal => new_time
|
2009-05-12 16:07:49 +04:00
|
|
|
* time.getlocal(utc_offset) => new_time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns a new <code>new_time</code> object representing <i>time</i> in
|
|
|
|
* local time (using the local time zone in effect for this process).
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2009-05-12 16:07:49 +04:00
|
|
|
* If _utc_offset_ is given, it is used instead of the local time.
|
|
|
|
*
|
|
|
|
* t = Time.utc(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 UTC
|
|
|
|
* t.utc? #=> true
|
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* l = t.getlocal #=> 2000-01-01 14:15:01 -0600
|
2009-05-12 16:07:49 +04:00
|
|
|
* l.utc? #=> false
|
2003-12-27 09:33:45 +03:00
|
|
|
* t == l #=> true
|
2009-05-12 16:07:49 +04:00
|
|
|
*
|
|
|
|
* j = t.getlocal("+09:00") #=> 2000-01-02 05:15:01 +0900
|
|
|
|
* j.utc? #=> false
|
|
|
|
* t == j #=> true
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
static VALUE
|
2009-05-12 16:07:49 +04:00
|
|
|
time_getlocaltime(int argc, VALUE *argv, VALUE time)
|
2001-12-10 10:18:16 +03:00
|
|
|
{
|
2009-05-12 16:07:49 +04:00
|
|
|
VALUE off;
|
|
|
|
rb_scan_args(argc, argv, "01", &off);
|
|
|
|
|
|
|
|
if (!NIL_P(off)) {
|
|
|
|
off = utc_offset_arg(off);
|
|
|
|
validate_utc_offset(off);
|
|
|
|
|
|
|
|
time = time_dup(time);
|
|
|
|
time_set_utc_offset(time, off);
|
|
|
|
return time_fixoff(time);
|
|
|
|
}
|
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
return time_localtime(time_dup(time));
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.getgm => new_time
|
|
|
|
* time.getutc => new_time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns a new <code>new_time</code> object representing <i>time</i> in
|
|
|
|
* UTC.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.local(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.gmt? #=> false
|
2007-11-19 17:40:15 +03:00
|
|
|
* y = t.getgm #=> 2000-01-02 02:15:01 UTC
|
2003-12-27 09:33:45 +03:00
|
|
|
* y.gmt? #=> true
|
|
|
|
* t == y #=> true
|
|
|
|
*/
|
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_getgmtime(VALUE time)
|
2001-12-10 10:18:16 +03:00
|
|
|
{
|
|
|
|
return time_gmtime(time_dup(time));
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
2009-04-25 10:48:39 +04:00
|
|
|
time_get_tm(VALUE time, struct time_object *tobj)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2009-04-25 10:48:39 +04:00
|
|
|
if (TIME_UTC_P(tobj)) return time_gmtime(time);
|
2009-05-12 16:07:49 +04:00
|
|
|
if (TIME_FIXOFF_P(tobj)) return time_fixoff(time);
|
1999-08-13 09:45:20 +04:00
|
|
|
return time_localtime(time);
|
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static VALUE strftimev(const char *fmt, VALUE time);
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.asctime => string
|
|
|
|
* time.ctime => string
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns a canonical string representation of <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Time.now.asctime #=> "Wed Apr 9 08:56:03 2003"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_asctime(VALUE time)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return strftimev("%a %b %e %T %Y", time);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.inspect => string
|
|
|
|
* time.to_s => string
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns a string representing <i>time</i>. Equivalent to calling
|
2007-10-05 11:12:54 +04:00
|
|
|
* <code>Time#strftime</code> with a format string of
|
|
|
|
* ``<code>%Y-%m-%d</code> <code>%H:%M:%S</code> <code>%z</code>''
|
|
|
|
* for a local time and
|
|
|
|
* ``<code>%Y-%m-%d</code> <code>%H:%M:%S</code> <code>UTC</code>''
|
|
|
|
* for a UTC time.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-10-05 11:12:54 +04:00
|
|
|
* Time.now.to_s #=> "2007-10-05 16:09:51 +0900"
|
|
|
|
* Time.now.utc.to_s #=> "2007-10-05 07:09:51 UTC"
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_to_s(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
if (TIME_UTC_P(tobj))
|
2009-04-21 18:56:59 +04:00
|
|
|
return strftimev("%Y-%m-%d %H:%M:%S UTC", time);
|
|
|
|
else
|
|
|
|
return strftimev("%Y-%m-%d %H:%M:%S %z", time);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-04-06 11:48:38 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_add(struct time_object *tobj, VALUE offset, int sign)
|
2004-04-06 11:48:38 +04:00
|
|
|
{
|
|
|
|
VALUE result;
|
2009-04-21 18:56:59 +04:00
|
|
|
offset = num_exact(offset);
|
|
|
|
if (sign < 0)
|
2009-08-29 23:06:29 +04:00
|
|
|
result = time_new_timexv(rb_cTime, sub(tobj->timexv, rb_time_magnify(offset)));
|
2009-04-21 18:56:59 +04:00
|
|
|
else
|
2009-08-29 23:06:29 +04:00
|
|
|
result = time_new_timexv(rb_cTime, add(tobj->timexv, rb_time_magnify(offset)));
|
2009-04-25 10:25:06 +04:00
|
|
|
if (TIME_UTC_P(tobj)) {
|
2004-04-06 11:48:38 +04:00
|
|
|
GetTimeval(result, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
TIME_SET_UTC(tobj);
|
2004-04-06 11:48:38 +04:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time + numeric => time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Addition---Adds some number of seconds (possibly fractional) to
|
|
|
|
* <i>time</i> and returns that value as a new time.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:22:21 -0600
|
|
|
|
* t + (60 * 60 * 24) #=> 2007-11-20 08:22:21 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_plus(VALUE time1, VALUE time2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
struct time_object *tobj;
|
|
|
|
GetTimeval(time1, tobj);
|
|
|
|
|
2009-09-09 07:43:48 +04:00
|
|
|
if (IsTimeval(time2)) {
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eTypeError, "time + time?");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-04-06 11:48:38 +04:00
|
|
|
return time_add(tobj, time2, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time - other_time => float
|
|
|
|
* time - numeric => time
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Difference---Returns a new time that represents the difference
|
|
|
|
* between two times, or subtracts the given number of seconds in
|
|
|
|
* <i>numeric</i> from <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:23:10 -0600
|
|
|
|
* t2 = t + 2592000 #=> 2007-12-19 08:23:10 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* t2 - t #=> 2592000.0
|
2007-11-19 17:40:15 +03:00
|
|
|
* t2 - 2592000 #=> 2007-11-19 08:23:10 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_minus(VALUE time1, VALUE time2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
struct time_object *tobj;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
GetTimeval(time1, tobj);
|
2009-09-09 07:43:48 +04:00
|
|
|
if (IsTimeval(time2)) {
|
1999-08-13 09:45:20 +04:00
|
|
|
struct time_object *tobj2;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
GetTimeval(time2, tobj2);
|
2009-08-29 23:06:29 +04:00
|
|
|
return rb_Float(rb_time_unmagnify(sub(tobj->timexv, tobj2->timexv)));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-04-06 11:48:38 +04:00
|
|
|
return time_add(tobj, time2, -1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.succ => new_time
|
|
|
|
*
|
|
|
|
* Return a new time object, one second later than <code>time</code>.
|
2009-09-30 12:32:43 +04:00
|
|
|
* Time#succ is obsolete since 1.9.2 for time is not a discrete value.
|
2007-11-19 17:40:15 +03:00
|
|
|
*
|
|
|
|
* t = Time.now #=> 2007-11-19 08:23:57 -0600
|
|
|
|
* t.succ #=> 2007-11-19 08:23:58 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
2009-09-30 12:32:43 +04:00
|
|
|
VALUE
|
|
|
|
rb_time_succ(VALUE time)
|
2003-11-28 17:23:33 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
2009-04-25 10:40:59 +04:00
|
|
|
struct time_object *tobj2;
|
2003-11-28 17:23:33 +03:00
|
|
|
|
2009-09-30 12:32:43 +04:00
|
|
|
rb_warn("Time#succ is obsolete; use time + 1");
|
2003-11-28 17:23:33 +03:00
|
|
|
GetTimeval(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
time = time_new_timexv(rb_cTime, add(tobj->timexv, INT2FIX(TIME_SCALE)));
|
2009-04-25 10:40:59 +04:00
|
|
|
GetTimeval(time, tobj2);
|
2009-04-25 11:04:02 +04:00
|
|
|
TIME_COPY_GMT(tobj2, tobj);
|
2007-07-18 03:55:17 +04:00
|
|
|
return time;
|
2003-11-28 17:23:33 +03:00
|
|
|
}
|
|
|
|
|
2009-09-30 12:32:43 +04:00
|
|
|
#define time_succ rb_time_succ
|
|
|
|
|
2007-11-19 17:40:15 +03:00
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.sec => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the second of the minute (0..60)<em>[Yes, seconds really can
|
|
|
|
* range from zero to 60. This allows the system to inject leap seconds
|
|
|
|
* every now and then to correct for the fact that years are not really
|
|
|
|
* a convenient number of hours long.]</em> for <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:25:02 -0600
|
|
|
|
* t.sec #=> 2
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_sec(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return INT2FIX(tobj->vtm.sec);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.min => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the minute of the hour (0..59) for <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:25:51 -0600
|
|
|
|
* t.min #=> 25
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_min(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return INT2FIX(tobj->vtm.min);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.hour => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the hour of the day (0..23) for <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:26:20 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.hour #=> 8
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_hour(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return INT2FIX(tobj->vtm.hour);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.day => fixnum
|
|
|
|
* time.mday => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the day of the month (1..n) for <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:27:03 -0600
|
|
|
|
* t.day #=> 19
|
|
|
|
* t.mday #=> 19
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_mday(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return INT2FIX(tobj->vtm.mday);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.mon => fixnum
|
|
|
|
* time.month => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the month of the year (1..12) for <i>time</i>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:27:30 -0600
|
|
|
|
* t.mon #=> 11
|
|
|
|
* t.month #=> 11
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_mon(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return INT2FIX(tobj->vtm.mon);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.year => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the year for <i>time</i> (including the century).
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:27:51 -0600
|
|
|
|
* t.year #=> 2007
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_year(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return tobj->vtm.year;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.wday => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns an integer representing the day of the week, 0..6, with
|
|
|
|
* Sunday == 0.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-20 13:55:22 +03:00
|
|
|
* t = Time.now #=> 2007-11-20 02:35:35 -0600
|
|
|
|
* t.wday #=> 2
|
|
|
|
* t.sunday? #=> false
|
|
|
|
* t.monday? #=> false
|
|
|
|
* t.tuesday? #=> true
|
|
|
|
* t.wednesday? #=> false
|
|
|
|
* t.thursday? #=> false
|
|
|
|
* t.friday? #=> false
|
|
|
|
* t.saturday? #=> false
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_wday(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return INT2FIX(tobj->vtm.wday);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2005-10-27 12:18:38 +04:00
|
|
|
#define wday_p(n) {\
|
|
|
|
struct time_object *tobj;\
|
|
|
|
GetTimeval(time, tobj);\
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);\
|
2009-04-21 18:56:59 +04:00
|
|
|
return (tobj->vtm.wday == (n)) ? Qtrue : Qfalse;\
|
2005-10-27 12:18:38 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.sunday? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2005-10-27 12:18:38 +04:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents Sunday.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-20 13:55:22 +03:00
|
|
|
* t = Time.local(1990, 4, 1) #=> 1990-04-01 00:00:00 -0600
|
|
|
|
* t.sunday? #=> true
|
2005-10-27 12:18:38 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_sunday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.monday? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2005-10-27 12:18:38 +04:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents Monday.
|
2007-11-19 17:40:15 +03:00
|
|
|
*
|
2007-11-20 13:55:22 +03:00
|
|
|
* t = Time.local(2003, 8, 4) #=> 2003-08-04 00:00:00 -0500
|
|
|
|
* p t.monday? #=> true
|
2005-10-27 12:18:38 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_monday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.tuesday? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2005-10-27 12:18:38 +04:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents Tuesday.
|
2007-11-20 13:55:22 +03:00
|
|
|
*
|
|
|
|
* t = Time.local(1991, 2, 19) #=> 1991-02-19 00:00:00 -0600
|
|
|
|
* p t.tuesday? #=> true
|
2005-10-27 12:18:38 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_tuesday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.wednesday? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2005-10-27 12:18:38 +04:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents Wednesday.
|
2007-11-20 13:55:22 +03:00
|
|
|
*
|
|
|
|
* t = Time.local(1993, 2, 24) #=> 1993-02-24 00:00:00 -0600
|
|
|
|
* p t.wednesday? #=> true
|
2005-10-27 12:18:38 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_wednesday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(3);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.thursday? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2005-10-27 12:18:38 +04:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents Thursday.
|
2007-11-20 13:55:22 +03:00
|
|
|
*
|
|
|
|
* t = Time.local(1995, 12, 21) #=> 1995-12-21 00:00:00 -0600
|
|
|
|
* p t.thursday? #=> true
|
2005-10-27 12:18:38 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_thursday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(4);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.friday? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2005-10-27 12:18:38 +04:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents Friday.
|
2007-11-20 13:55:22 +03:00
|
|
|
*
|
|
|
|
* t = Time.local(1987, 12, 18) #=> 1987-12-18 00:00:00 -0600
|
|
|
|
* t.friday? #=> true
|
2005-10-27 12:18:38 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_friday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(5);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.saturday? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2005-10-27 12:18:38 +04:00
|
|
|
* Returns <code>true</code> if <i>time</i> represents Saturday.
|
2007-11-20 13:55:22 +03:00
|
|
|
*
|
|
|
|
* t = Time.local(2006, 6, 10) #=> 2006-06-10 00:00:00 -0500
|
|
|
|
* t.saturday? #=> true
|
2005-10-27 12:18:38 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
time_saturday(VALUE time)
|
|
|
|
{
|
|
|
|
wday_p(6);
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.yday => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns an integer representing the day of the year, 1..366.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:32:31 -0600
|
|
|
|
* t.yday #=> 323
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_yday(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return INT2FIX(tobj->vtm.yday);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.isdst => true or false
|
|
|
|
* time.dst? => true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns <code>true</code> if <i>time</i> occurs during Daylight
|
|
|
|
* Saving Time in its time zone.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* # CST6CDT:
|
2007-11-20 13:55:22 +03:00
|
|
|
* Time.local(2000, 1, 1).zone #=> "CST"
|
2003-12-27 09:33:45 +03:00
|
|
|
* Time.local(2000, 1, 1).isdst #=> false
|
2007-11-20 13:55:22 +03:00
|
|
|
* Time.local(2000, 1, 1).dst? #=> false
|
|
|
|
* Time.local(2000, 7, 1).zone #=> "CDT"
|
|
|
|
* Time.local(2000, 7, 1).isdst #=> true
|
2003-12-27 09:33:45 +03:00
|
|
|
* Time.local(2000, 7, 1).dst? #=> true
|
2007-11-20 13:55:22 +03:00
|
|
|
*
|
2008-03-09 04:04:46 +03:00
|
|
|
* # Asia/Tokyo:
|
2007-11-20 13:55:22 +03:00
|
|
|
* Time.local(2000, 1, 1).zone #=> "JST"
|
|
|
|
* Time.local(2000, 1, 1).isdst #=> false
|
2003-12-27 09:33:45 +03:00
|
|
|
* Time.local(2000, 1, 1).dst? #=> false
|
2007-11-20 13:55:22 +03:00
|
|
|
* Time.local(2000, 7, 1).zone #=> "JST"
|
|
|
|
* Time.local(2000, 7, 1).isdst #=> false
|
|
|
|
* Time.local(2000, 7, 1).dst? #=> false
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_isdst(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-04-21 18:56:59 +04:00
|
|
|
return tobj->vtm.isdst ? Qtrue : Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.zone => string
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the name of the time zone used for <i>time</i>. As of Ruby
|
|
|
|
* 1.8, returns ``UTC'' rather than ``GMT'' for UTC times.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* t = Time.gm(2000, "jan", 1, 20, 15, 1)
|
|
|
|
* t.zone #=> "UTC"
|
|
|
|
* t = Time.local(2000, "jan", 1, 20, 15, 1)
|
|
|
|
* t.zone #=> "CST"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_zone(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
2009-02-22 17:23:33 +03:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-04-25 10:25:06 +04:00
|
|
|
if (TIME_UTC_P(tobj)) {
|
2001-03-21 06:41:45 +03:00
|
|
|
return rb_str_new2("UTC");
|
|
|
|
}
|
2009-05-12 16:07:49 +04:00
|
|
|
if (tobj->vtm.zone == NULL)
|
|
|
|
return Qnil;
|
2009-04-21 18:56:59 +04:00
|
|
|
return rb_str_new2(tobj->vtm.zone);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.gmt_offset => fixnum
|
|
|
|
* time.gmtoff => fixnum
|
|
|
|
* time.utc_offset => fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns the offset in seconds between the timezone of <i>time</i>
|
|
|
|
* and UTC.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.gm(2000,1,1,20,15,1) #=> 2000-01-01 20:15:01 UTC
|
2003-12-27 09:33:45 +03:00
|
|
|
* t.gmt_offset #=> 0
|
2007-11-19 17:40:15 +03:00
|
|
|
* l = t.getlocal #=> 2000-01-01 14:15:01 -0600
|
2003-12-27 09:33:45 +03:00
|
|
|
* l.gmt_offset #=> -21600
|
|
|
|
*/
|
|
|
|
|
2001-12-17 09:45:37 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_utc_offset(VALUE time)
|
2001-12-17 09:45:37 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2001-12-17 09:45:37 +03:00
|
|
|
|
2009-04-25 10:25:06 +04:00
|
|
|
if (TIME_UTC_P(tobj)) {
|
2001-12-17 09:45:37 +03:00
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
else {
|
2009-04-21 18:56:59 +04:00
|
|
|
return tobj->vtm.utc_offset;
|
2001-12-17 09:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.to_a => array
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Returns a ten-element <i>array</i> of values for <i>time</i>:
|
|
|
|
* {<code>[ sec, min, hour, day, month, year, wday, yday, isdst, zone
|
|
|
|
* ]</code>}. See the individual methods for an explanation of the
|
|
|
|
* valid ranges of each value. The ten elements can be passed directly
|
|
|
|
* to <code>Time::utc</code> or <code>Time::local</code> to create a
|
|
|
|
* new <code>Time</code>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:36:01 -0600
|
|
|
|
* now = t.to_a #=> [1, 36, 8, 19, 11, 2007, 1, 323, false, "CST"]
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_to_a(VALUE time)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_ary_new3(10,
|
2009-04-21 18:56:59 +04:00
|
|
|
INT2FIX(tobj->vtm.sec),
|
|
|
|
INT2FIX(tobj->vtm.min),
|
|
|
|
INT2FIX(tobj->vtm.hour),
|
|
|
|
INT2FIX(tobj->vtm.mday),
|
|
|
|
INT2FIX(tobj->vtm.mon),
|
|
|
|
tobj->vtm.year,
|
|
|
|
INT2FIX(tobj->vtm.wday),
|
|
|
|
INT2FIX(tobj->vtm.yday),
|
|
|
|
tobj->vtm.isdst?Qtrue:Qfalse,
|
1999-01-20 07:59:39 +03:00
|
|
|
time_zone(time));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
size_t
|
|
|
|
rb_strftime(char *s, size_t maxsize, const char *format,
|
|
|
|
const struct vtm *vtm, VALUE timev,
|
|
|
|
int gmt);
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
#define SMALLBUF 100
|
2009-09-23 08:16:41 +04:00
|
|
|
static size_t
|
2008-08-20 19:30:28 +04:00
|
|
|
rb_strftime_alloc(char **buf, const char *format,
|
2009-04-21 18:56:59 +04:00
|
|
|
struct vtm *vtm, VALUE timev, int gmt)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2009-09-23 08:16:41 +04:00
|
|
|
size_t size, len, flen;
|
1998-01-16 15:19:22 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
(*buf)[0] = '\0';
|
|
|
|
flen = strlen(format);
|
|
|
|
if (flen == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
2008-04-21 04:59:43 +04:00
|
|
|
errno = 0;
|
2009-04-21 18:56:59 +04:00
|
|
|
len = rb_strftime(*buf, SMALLBUF, format, vtm, timev, gmt);
|
2008-04-21 04:59:43 +04:00
|
|
|
if (len != 0 || (**buf == '\0' && errno != ERANGE)) return len;
|
1999-08-13 09:45:20 +04:00
|
|
|
for (size=1024; ; size*=2) {
|
|
|
|
*buf = xmalloc(size);
|
|
|
|
(*buf)[0] = '\0';
|
2009-04-21 18:56:59 +04:00
|
|
|
len = rb_strftime(*buf, size, format, vtm, timev, gmt);
|
1999-08-13 09:45:20 +04:00
|
|
|
/*
|
|
|
|
* buflen can be zero EITHER because there's not enough
|
|
|
|
* room in the string, or because the control command
|
|
|
|
* goes to the empty string. Make a reasonable guess that
|
|
|
|
* if the buffer is 1024 times bigger than the length of the
|
|
|
|
* format string, it's not failing for lack of room.
|
|
|
|
*/
|
2009-09-23 08:16:41 +04:00
|
|
|
if (len > 0 || size >= 1024 * flen) break;
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
xfree(*buf);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
2009-09-23 08:16:41 +04:00
|
|
|
return len;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
static VALUE
|
|
|
|
strftimev(const char *fmt, VALUE time)
|
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
|
|
|
char buffer[SMALLBUF], *buf = buffer;
|
|
|
|
long len;
|
|
|
|
VALUE str;
|
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
len = rb_strftime_alloc(&buf, fmt, &tobj->vtm, rb_time_unmagnify(tobj->timexv), TIME_UTC_P(tobj));
|
2009-04-21 18:56:59 +04:00
|
|
|
str = rb_str_new(buf, len);
|
|
|
|
if (buf != buffer) xfree(buf);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time.strftime( string ) => string
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-27 09:33:45 +03:00
|
|
|
* Formats <i>time</i> according to the directives in the given format
|
|
|
|
* string. Any text not listed as a directive will be passed through
|
|
|
|
* to the output string.
|
|
|
|
*
|
|
|
|
* Format meaning:
|
|
|
|
* %a - The abbreviated weekday name (``Sun'')
|
|
|
|
* %A - The full weekday name (``Sunday'')
|
|
|
|
* %b - The abbreviated month name (``Jan'')
|
|
|
|
* %B - The full month name (``January'')
|
|
|
|
* %c - The preferred local date and time representation
|
2009-05-27 22:44:54 +04:00
|
|
|
* %C - Century (20 in 2009)
|
2003-12-27 09:33:45 +03:00
|
|
|
* %d - Day of the month (01..31)
|
2009-05-27 22:44:54 +04:00
|
|
|
* %D - Date (%m/%d/%y)
|
|
|
|
* %e - Day of the month, blank-padded ( 1..31)
|
2008-08-21 18:57:35 +04:00
|
|
|
* %F - Equivalent to %Y-%m-%d (the ISO 8601 date format)
|
2009-05-27 22:44:54 +04:00
|
|
|
* %h - Equivalent to %b
|
2003-12-27 09:33:45 +03:00
|
|
|
* %H - Hour of the day, 24-hour clock (00..23)
|
|
|
|
* %I - Hour of the day, 12-hour clock (01..12)
|
|
|
|
* %j - Day of the year (001..366)
|
2009-05-27 22:44:54 +04:00
|
|
|
* %k - hour, 24-hour clock, blank-padded ( 0..23)
|
|
|
|
* %l - hour, 12-hour clock, blank-padded ( 0..12)
|
2008-08-20 19:30:28 +04:00
|
|
|
* %L - Millisecond of the second (000..999)
|
2003-12-27 09:33:45 +03:00
|
|
|
* %m - Month of the year (01..12)
|
|
|
|
* %M - Minute of the hour (00..59)
|
2009-05-27 22:44:54 +04:00
|
|
|
* %n - Newline (\n)
|
2008-08-21 18:57:35 +04:00
|
|
|
* %N - Fractional seconds digits, default is 9 digits (nanosecond)
|
|
|
|
* %3N millisecond (3 digits)
|
|
|
|
* %6N microsecond (6 digits)
|
|
|
|
* %9N nanosecond (9 digits)
|
2003-12-27 09:33:45 +03:00
|
|
|
* %p - Meridian indicator (``AM'' or ``PM'')
|
2008-08-28 21:06:20 +04:00
|
|
|
* %P - Meridian indicator (``am'' or ``pm'')
|
2009-05-27 22:44:54 +04:00
|
|
|
* %r - time, 12-hour (same as %I:%M:%S %p)
|
|
|
|
* %R - time, 24-hour (%H:%M)
|
2008-08-28 21:06:20 +04:00
|
|
|
* %s - Number of seconds since 1970-01-01 00:00:00 UTC.
|
2003-12-27 09:33:45 +03:00
|
|
|
* %S - Second of the minute (00..60)
|
2009-05-27 22:44:54 +04:00
|
|
|
* %t - Tab character (\t)
|
|
|
|
* %T - time, 24-hour (%H:%M:%S)
|
|
|
|
* %u - Day of the week as a decimal, Monday being 1. (1..7)
|
2003-12-27 09:33:45 +03:00
|
|
|
* %U - Week number of the current year,
|
|
|
|
* starting with the first Sunday as the first
|
|
|
|
* day of the first week (00..53)
|
2009-05-27 22:44:54 +04:00
|
|
|
* %v - VMS date (%e-%b-%Y)
|
|
|
|
* %V - Week number of year according to ISO 8601 (01..53)
|
2003-12-27 09:33:45 +03:00
|
|
|
* %W - Week number of the current year,
|
|
|
|
* starting with the first Monday as the first
|
|
|
|
* day of the first week (00..53)
|
|
|
|
* %w - Day of the week (Sunday is 0, 0..6)
|
|
|
|
* %x - Preferred representation for the date alone, no time
|
|
|
|
* %X - Preferred representation for the time alone, no date
|
|
|
|
* %y - Year without a century (00..99)
|
|
|
|
* %Y - Year with century
|
2009-05-27 22:44:54 +04:00
|
|
|
* %z - Time zone as hour offset from UTC (e.g. +0900)
|
2003-12-27 09:33:45 +03:00
|
|
|
* %Z - Time zone name
|
|
|
|
* %% - Literal ``%'' character
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2007-11-19 17:40:15 +03:00
|
|
|
* t = Time.now #=> 2007-11-19 08:37:48 -0600
|
|
|
|
* t.strftime("Printed on %m/%d/%Y") #=> "Printed on 11/19/2007"
|
|
|
|
* t.strftime("at %I:%M%p") #=> "at 08:37AM"
|
2003-12-27 09:33:45 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_strftime(VALUE time, VALUE format)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-01-23 09:25:06 +03:00
|
|
|
void rb_enc_copy(VALUE, VALUE);
|
1998-01-16 15:13:05 +03:00
|
|
|
struct time_object *tobj;
|
2005-10-22 08:27:48 +04:00
|
|
|
char buffer[SMALLBUF], *buf = buffer;
|
|
|
|
const char *fmt;
|
2002-08-21 19:47:54 +04:00
|
|
|
long len;
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE str;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
2009-04-25 10:25:06 +04:00
|
|
|
MAKE_TM(time, tobj);
|
2001-05-02 08:22:21 +04:00
|
|
|
StringValue(format);
|
2008-02-29 12:19:15 +03:00
|
|
|
if (!rb_enc_str_asciicompat_p(format)) {
|
|
|
|
rb_raise(rb_eArgError, "format should have ASCII compatible encoding");
|
|
|
|
}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
format = rb_str_new4(format);
|
2006-08-31 14:47:44 +04:00
|
|
|
fmt = RSTRING_PTR(format);
|
|
|
|
len = RSTRING_LEN(format);
|
1999-08-13 09:45:20 +04:00
|
|
|
if (len == 0) {
|
|
|
|
rb_warning("strftime called with empty format string");
|
|
|
|
}
|
2009-03-10 22:47:46 +03:00
|
|
|
else if (memchr(fmt, '\0', len)) {
|
1998-01-16 15:19:22 +03:00
|
|
|
/* Ruby string may contain \0's. */
|
2005-10-22 08:27:48 +04:00
|
|
|
const char *p = fmt, *pe = fmt + len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
str = rb_str_new(0, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (p < pe) {
|
2009-08-29 23:06:29 +04:00
|
|
|
len = rb_strftime_alloc(&buf, p, &tobj->vtm, rb_time_unmagnify(tobj->timexv), TIME_UTC_P(tobj));
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_str_cat(str, buf, len);
|
2006-09-04 16:14:47 +04:00
|
|
|
p += strlen(p);
|
2001-12-10 10:18:16 +03:00
|
|
|
if (buf != buffer) {
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
xfree(buf);
|
2001-12-10 10:18:16 +03:00
|
|
|
buf = buffer;
|
|
|
|
}
|
2005-10-22 08:27:48 +04:00
|
|
|
for (fmt = p; p < pe && !*p; ++p);
|
|
|
|
if (p > fmt) rb_str_cat(str, fmt, p - fmt);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
2003-04-09 19:27:39 +04:00
|
|
|
else {
|
2008-08-20 19:30:28 +04:00
|
|
|
len = rb_strftime_alloc(&buf, RSTRING_PTR(format),
|
2009-11-26 08:25:08 +03:00
|
|
|
&tobj->vtm, rb_time_unmagnify(tobj->timexv), TIME_UTC_P(tobj));
|
2003-04-09 19:27:39 +04:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
str = rb_str_new(buf, len);
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
if (buf != buffer) xfree(buf);
|
2008-01-23 09:25:06 +03:00
|
|
|
rb_enc_copy(str, format);
|
1998-01-16 15:19:22 +03:00
|
|
|
return str;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* undocumented
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_mdump(VALUE time)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
struct time_object *tobj;
|
1999-08-13 09:45:20 +04:00
|
|
|
unsigned long p, s;
|
2003-08-16 18:58:34 +04:00
|
|
|
char buf[8];
|
1999-01-20 07:59:39 +03:00
|
|
|
int i;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
VALUE str;
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
struct vtm vtm;
|
|
|
|
long year;
|
|
|
|
long usec, nsec;
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE subsecx, nano, subnano, v;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
gmtimexv(tobj->timexv, &vtm);
|
2009-04-21 18:56:59 +04:00
|
|
|
|
|
|
|
if (FIXNUM_P(vtm.year)) {
|
|
|
|
year = FIX2LONG(vtm.year);
|
|
|
|
if (year < 1900 || 1900+0xffff < year)
|
2009-09-16 19:36:30 +04:00
|
|
|
rb_raise(rb_eArgError, "year too big to marshal: %ld UTC", year);
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eArgError, "year too big to marshal");
|
|
|
|
}
|
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
subsecx = vtm.subsecx;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
nano = mulquo(subsecx, INT2FIX(1000000000), INT2FIX(TIME_SCALE));
|
|
|
|
divmodv(nano, INT2FIX(1), &v, &subnano);
|
2009-04-21 18:56:59 +04:00
|
|
|
nsec = FIX2LONG(v);
|
|
|
|
usec = nsec / 1000;
|
|
|
|
nsec = nsec % 1000;
|
2006-12-31 18:02:22 +03:00
|
|
|
|
2009-04-25 10:25:06 +04:00
|
|
|
p = 0x1UL << 31 | /* 1 */
|
|
|
|
TIME_UTC_P(tobj) << 30 | /* 1 */
|
|
|
|
(year-1900) << 14 | /* 16 */
|
|
|
|
(vtm.mon-1) << 10 | /* 4 */
|
|
|
|
vtm.mday << 5 | /* 5 */
|
|
|
|
vtm.hour; /* 5 */
|
|
|
|
s = vtm.min << 26 | /* 6 */
|
|
|
|
vtm.sec << 20 | /* 6 */
|
2009-04-21 18:56:59 +04:00
|
|
|
usec; /* 20 */
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
for (i=0; i<4; i++) {
|
2009-03-10 22:47:46 +03:00
|
|
|
buf[i] = (unsigned char)p;
|
1999-08-13 09:45:20 +04:00
|
|
|
p = RSHIFT(p, 8);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
for (i=4; i<8; i++) {
|
2009-03-10 22:47:46 +03:00
|
|
|
buf[i] = (unsigned char)s;
|
1999-08-13 09:45:20 +04:00
|
|
|
s = RSHIFT(s, 8);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
str = rb_str_new(buf, 8);
|
|
|
|
rb_copy_generic_ivar(str, time);
|
|
|
|
if (nsec) {
|
|
|
|
/*
|
|
|
|
* submicro is formatted in fixed-point packed BCD (without sign).
|
|
|
|
* It represent digits under microsecond.
|
|
|
|
* For nanosecond resolution, 3 digits (2 bytes) are used.
|
|
|
|
* However it can be longer.
|
|
|
|
* Extra digits are ignored for loading.
|
|
|
|
*/
|
2009-09-23 08:16:41 +04:00
|
|
|
char buf[2];
|
|
|
|
int len = (int)sizeof(buf);
|
|
|
|
buf[1] = (char)((nsec % 10) << 4);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
nsec /= 10;
|
2009-09-23 08:16:41 +04:00
|
|
|
buf[0] = (char)(nsec % 10);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
nsec /= 10;
|
2009-09-23 08:16:41 +04:00
|
|
|
buf[0] |= (char)((nsec % 10) << 4);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
if (buf[1] == 0)
|
|
|
|
len = 1;
|
2009-09-23 08:16:41 +04:00
|
|
|
rb_ivar_set(str, id_submicro, rb_str_new(buf, len));
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
if (!rb_equal(subnano, INT2FIX(0))) {
|
|
|
|
rb_ivar_set(str, id_subnano, subnano);
|
|
|
|
}
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
return str;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* time._dump => string
|
|
|
|
*
|
|
|
|
* Dump _time_ for marshaling.
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_dump(int argc, VALUE *argv, VALUE time)
|
2003-10-02 12:25:00 +04:00
|
|
|
{
|
2003-10-09 21:45:53 +04:00
|
|
|
VALUE str;
|
2003-10-02 12:25:00 +04:00
|
|
|
|
2003-10-09 21:45:53 +04:00
|
|
|
rb_scan_args(argc, argv, "01", 0);
|
2009-02-22 17:23:33 +03:00
|
|
|
str = time_mdump(time);
|
2003-10-09 21:45:53 +04:00
|
|
|
|
|
|
|
return str;
|
2003-10-02 12:25:00 +04:00
|
|
|
}
|
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* undocumented
|
|
|
|
*/
|
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_mload(VALUE time, VALUE str)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2003-10-02 12:25:00 +04:00
|
|
|
struct time_object *tobj;
|
1999-08-13 09:45:20 +04:00
|
|
|
unsigned long p, s;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
time_t sec;
|
|
|
|
long usec;
|
1999-01-20 07:59:39 +03:00
|
|
|
unsigned char *buf;
|
2009-04-21 18:56:59 +04:00
|
|
|
struct vtm vtm;
|
2004-05-14 20:39:15 +04:00
|
|
|
int i, gmt;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
long nsec;
|
2009-08-29 23:06:29 +04:00
|
|
|
VALUE timexv, submicro, subnano;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
time_modify(time);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
|
|
|
|
submicro = rb_attr_get(str, id_submicro);
|
|
|
|
if (submicro != Qnil) {
|
|
|
|
st_delete(rb_generic_ivar_table(str), (st_data_t*)&id_submicro, 0);
|
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
subnano = rb_attr_get(str, id_subnano);
|
|
|
|
if (subnano != Qnil) {
|
|
|
|
st_delete(rb_generic_ivar_table(str), (st_data_t*)&id_subnano, 0);
|
|
|
|
}
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
rb_copy_generic_ivar(time, str);
|
|
|
|
|
2001-05-02 08:22:21 +04:00
|
|
|
StringValue(str);
|
2006-08-31 14:47:44 +04:00
|
|
|
buf = (unsigned char *)RSTRING_PTR(str);
|
|
|
|
if (RSTRING_LEN(str) != 8) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eTypeError, "marshaled time format differ");
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
p = s = 0;
|
1999-01-20 07:59:39 +03:00
|
|
|
for (i=0; i<4; i++) {
|
1999-08-13 09:45:20 +04:00
|
|
|
p |= buf[i]<<(8*i);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
for (i=4; i<8; i++) {
|
1999-08-13 09:45:20 +04:00
|
|
|
s |= buf[i]<<(8*(i-4));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2006-07-04 00:07:10 +04:00
|
|
|
if ((p & (1UL<<31)) == 0) {
|
2005-09-25 03:45:46 +04:00
|
|
|
gmt = 0;
|
2003-10-02 12:25:00 +04:00
|
|
|
sec = p;
|
|
|
|
usec = s;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
nsec = usec * 1000;
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = add(rb_time_magnify(TIMET2NUM(sec)), mulquo(LONG2FIX(usec), INT2FIX(TIME_SCALE), LONG2FIX(1000000)));
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2003-10-02 12:25:00 +04:00
|
|
|
else {
|
2006-07-04 00:07:10 +04:00
|
|
|
p &= ~(1UL<<31);
|
2009-09-23 08:16:41 +04:00
|
|
|
gmt = (int)((p >> 30) & 0x1);
|
|
|
|
|
|
|
|
vtm.year = INT2FIX(((int)(p >> 14) & 0xffff) + 1900);
|
|
|
|
vtm.mon = ((int)(p >> 10) & 0xf) + 1;
|
|
|
|
vtm.mday = (int)(p >> 5) & 0x1f;
|
|
|
|
vtm.hour = (int) p & 0x1f;
|
|
|
|
vtm.min = (int)(s >> 26) & 0x3f;
|
|
|
|
vtm.sec = (int)(s >> 20) & 0x3f;
|
2009-04-21 18:56:59 +04:00
|
|
|
vtm.utc_offset = INT2FIX(0);
|
|
|
|
vtm.yday = vtm.wday = 0;
|
|
|
|
vtm.isdst = 0;
|
|
|
|
vtm.zone = "";
|
|
|
|
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
usec = (long)(s & 0xfffff);
|
|
|
|
nsec = usec * 1000;
|
|
|
|
|
|
|
|
if (submicro != Qnil) {
|
2007-11-20 15:50:29 +03:00
|
|
|
unsigned char *ptr;
|
|
|
|
long len;
|
|
|
|
int digit;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
ptr = (unsigned char*)StringValuePtr(submicro);
|
|
|
|
len = RSTRING_LEN(submicro);
|
|
|
|
if (0 < len) {
|
2007-11-20 15:50:29 +03:00
|
|
|
if (10 <= (digit = ptr[0] >> 4)) goto end_submicro;
|
|
|
|
nsec += digit * 100;
|
|
|
|
if (10 <= (digit = ptr[0] & 0xf)) goto end_submicro;
|
|
|
|
nsec += digit * 10;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
|
|
|
if (1 < len) {
|
2007-11-20 15:50:29 +03:00
|
|
|
if (10 <= (digit = ptr[1] >> 4)) goto end_submicro;
|
|
|
|
nsec += digit;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
2007-11-20 15:50:29 +03:00
|
|
|
end_submicro: ;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
2009-04-21 18:56:59 +04:00
|
|
|
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm.subsecx = mulquo(LONG2FIX(nsec), INT2FIX(TIME_SCALE), LONG2FIX(1000000000));
|
2009-04-21 18:56:59 +04:00
|
|
|
if (subnano != Qnil) {
|
|
|
|
subnano = num_exact(subnano);
|
2009-08-29 23:06:29 +04:00
|
|
|
vtm.subsecx = add(vtm.subsecx, mulquo(subnano, INT2FIX(TIME_SCALE), LONG2FIX(1000000000)));
|
2009-04-21 18:56:59 +04:00
|
|
|
}
|
2009-08-29 23:06:29 +04:00
|
|
|
timexv = timegmxv(&vtm);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
}
|
2003-10-02 12:25:00 +04:00
|
|
|
|
|
|
|
GetTimeval(time, tobj);
|
|
|
|
tobj->tm_got = 0;
|
2009-04-25 10:54:49 +04:00
|
|
|
if (gmt) TIME_SET_UTC(tobj);
|
2009-08-29 23:06:29 +04:00
|
|
|
tobj->timexv = timexv;
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
return time;
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2003-12-30 19:38:32 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Time._load(string) => time
|
|
|
|
*
|
|
|
|
* Unmarshal a dumped +Time+ object.
|
|
|
|
*/
|
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
time_load(VALUE klass, VALUE str)
|
2003-10-02 12:25:00 +04:00
|
|
|
{
|
|
|
|
VALUE time = time_s_alloc(klass);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2003-10-02 12:25:00 +04:00
|
|
|
time_mload(time, str);
|
|
|
|
return time;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-27 09:33:45 +03:00
|
|
|
/*
|
|
|
|
* <code>Time</code> is an abstraction of dates and times. Time is
|
2009-04-21 21:16:11 +04:00
|
|
|
* stored internally as the number of seconds with fraction since
|
|
|
|
* the <em>Epoch</em>, January 1, 1970 00:00 UTC.
|
|
|
|
* Also see the library modules <code>Date</code>.
|
|
|
|
* The <code>Time</code> class treats GMT (Greenwich Mean Time) and
|
|
|
|
* UTC (Coordinated Universal Time)<em>[Yes, UTC really does stand for
|
2003-12-27 09:33:45 +03:00
|
|
|
* Coordinated Universal Time. There was a committee involved.]</em>
|
|
|
|
* as equivalent. GMT is the older way of referring to these
|
2007-11-19 17:40:15 +03:00
|
|
|
* baseline times but persists in the names of calls on POSIX
|
2003-12-27 09:33:45 +03:00
|
|
|
* systems.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2009-04-21 21:16:11 +04:00
|
|
|
* All times may have fraction. Be aware of
|
2003-12-27 09:33:45 +03:00
|
|
|
* this fact when comparing times with each other---times that are
|
|
|
|
* apparently equal when displayed may be different when compared.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
Init_Time(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-06-09 13:25:32 +04:00
|
|
|
#undef rb_intern
|
2008-08-16 04:20:31 +04:00
|
|
|
#define rb_intern(str) rb_intern_const(str)
|
2008-06-09 13:25:32 +04:00
|
|
|
|
2009-04-21 18:56:59 +04:00
|
|
|
id_eq = rb_intern("==");
|
|
|
|
id_ne = rb_intern("!=");
|
|
|
|
id_quo = rb_intern("quo");
|
|
|
|
id_div = rb_intern("div");
|
|
|
|
id_cmp = rb_intern("<=>");
|
|
|
|
id_lshift = rb_intern("<<");
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
id_divmod = rb_intern("divmod");
|
|
|
|
id_mul = rb_intern("*");
|
|
|
|
id_submicro = rb_intern("submicro");
|
2009-04-21 18:56:59 +04:00
|
|
|
id_subnano = rb_intern("subnano");
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_cTime = rb_define_class("Time", rb_cObject);
|
|
|
|
rb_include_module(rb_cTime, rb_mComparable);
|
|
|
|
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_define_alloc_func(rb_cTime, time_s_alloc);
|
2009-06-24 15:19:58 +04:00
|
|
|
rb_define_singleton_method(rb_cTime, "now", time_s_now, 0);
|
1999-10-29 13:25:48 +04:00
|
|
|
rb_define_singleton_method(rb_cTime, "at", time_s_at, -1);
|
2000-06-12 11:48:31 +04:00
|
|
|
rb_define_singleton_method(rb_cTime, "utc", time_s_mkutc, -1);
|
|
|
|
rb_define_singleton_method(rb_cTime, "gm", time_s_mkutc, -1);
|
|
|
|
rb_define_singleton_method(rb_cTime, "local", time_s_mktime, -1);
|
|
|
|
rb_define_singleton_method(rb_cTime, "mktime", time_s_mktime, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
rb_define_method(rb_cTime, "to_i", time_to_i, 0);
|
|
|
|
rb_define_method(rb_cTime, "to_f", time_to_f, 0);
|
2009-05-19 18:00:04 +04:00
|
|
|
rb_define_method(rb_cTime, "to_r", time_to_r, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cTime, "<=>", time_cmp, 1);
|
|
|
|
rb_define_method(rb_cTime, "eql?", time_eql, 1);
|
|
|
|
rb_define_method(rb_cTime, "hash", time_hash, 0);
|
2009-05-12 16:07:49 +04:00
|
|
|
rb_define_method(rb_cTime, "initialize", time_init, -1);
|
2003-05-19 09:41:08 +04:00
|
|
|
rb_define_method(rb_cTime, "initialize_copy", time_init_copy, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2009-05-12 16:07:49 +04:00
|
|
|
rb_define_method(rb_cTime, "localtime", time_localtime_m, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cTime, "gmtime", time_gmtime, 0);
|
2000-07-06 11:21:26 +04:00
|
|
|
rb_define_method(rb_cTime, "utc", time_gmtime, 0);
|
2009-05-12 16:07:49 +04:00
|
|
|
rb_define_method(rb_cTime, "getlocal", time_getlocaltime, -1);
|
2001-12-10 10:18:16 +03:00
|
|
|
rb_define_method(rb_cTime, "getgm", time_getgmtime, 0);
|
|
|
|
rb_define_method(rb_cTime, "getutc", time_getgmtime, 0);
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cTime, "ctime", time_asctime, 0);
|
|
|
|
rb_define_method(rb_cTime, "asctime", time_asctime, 0);
|
|
|
|
rb_define_method(rb_cTime, "to_s", time_to_s, 0);
|
|
|
|
rb_define_method(rb_cTime, "inspect", time_to_s, 0);
|
|
|
|
rb_define_method(rb_cTime, "to_a", time_to_a, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cTime, "+", time_plus, 1);
|
|
|
|
rb_define_method(rb_cTime, "-", time_minus, 1);
|
|
|
|
|
2003-11-28 17:23:33 +03:00
|
|
|
rb_define_method(rb_cTime, "succ", time_succ, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cTime, "sec", time_sec, 0);
|
|
|
|
rb_define_method(rb_cTime, "min", time_min, 0);
|
|
|
|
rb_define_method(rb_cTime, "hour", time_hour, 0);
|
|
|
|
rb_define_method(rb_cTime, "mday", time_mday, 0);
|
|
|
|
rb_define_method(rb_cTime, "day", time_mday, 0);
|
|
|
|
rb_define_method(rb_cTime, "mon", time_mon, 0);
|
|
|
|
rb_define_method(rb_cTime, "month", time_mon, 0);
|
|
|
|
rb_define_method(rb_cTime, "year", time_year, 0);
|
|
|
|
rb_define_method(rb_cTime, "wday", time_wday, 0);
|
|
|
|
rb_define_method(rb_cTime, "yday", time_yday, 0);
|
|
|
|
rb_define_method(rb_cTime, "isdst", time_isdst, 0);
|
2000-10-17 22:14:05 +04:00
|
|
|
rb_define_method(rb_cTime, "dst?", time_isdst, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cTime, "zone", time_zone, 0);
|
2001-12-17 09:45:37 +03:00
|
|
|
rb_define_method(rb_cTime, "gmtoff", time_utc_offset, 0);
|
|
|
|
rb_define_method(rb_cTime, "gmt_offset", time_utc_offset, 0);
|
|
|
|
rb_define_method(rb_cTime, "utc_offset", time_utc_offset, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2000-06-19 12:38:11 +04:00
|
|
|
rb_define_method(rb_cTime, "utc?", time_utc_p, 0);
|
|
|
|
rb_define_method(rb_cTime, "gmt?", time_utc_p, 0);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2005-10-27 12:18:38 +04:00
|
|
|
rb_define_method(rb_cTime, "sunday?", time_sunday, 0);
|
|
|
|
rb_define_method(rb_cTime, "monday?", time_monday, 0);
|
|
|
|
rb_define_method(rb_cTime, "tuesday?", time_tuesday, 0);
|
|
|
|
rb_define_method(rb_cTime, "wednesday?", time_wednesday, 0);
|
|
|
|
rb_define_method(rb_cTime, "thursday?", time_thursday, 0);
|
|
|
|
rb_define_method(rb_cTime, "friday?", time_friday, 0);
|
|
|
|
rb_define_method(rb_cTime, "saturday?", time_saturday, 0);
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cTime, "tv_sec", time_to_i, 0);
|
|
|
|
rb_define_method(rb_cTime, "tv_usec", time_usec, 0);
|
|
|
|
rb_define_method(rb_cTime, "usec", time_usec, 0);
|
* configure.in: check struct timespec, clock_gettime, utimensat,
struct stat.st_atim,
struct stat.st_atimespec,
struct stat.st_atimensec,
struct stat.st_mtim,
struct stat.st_mtimespec,
struct stat.st_mtimensec,
struct stat.st_ctim,
struct stat.st_ctimespec,
struct stat.st_ctimensec.
* include/ruby/missing.h: provide struct timespec if not available.
* time.c: support nanosecond-resolution using struct timespec.
* include/ruby/intern.h: provide rb_time_nano_new.
* file.c (utime_internal): use utimensat if available.
(rb_file_s_utime): refactored.
(rb_f_test): use stat_atime, stat_mtime, stat_ctime.
(rb_stat_cmp): check tv_nsec.
(stat_atimespec): new function.
(stat_atime): ditto.
(stat_mtimespec): ditto.
(stat_mtime): ditto.
(stat_ctimespec): ditto.
(stat_ctime): ditto.
(rb_stat_atime): use stat_atime.
(rb_file_s_atime): ditto.
(rb_file_atime): ditto.
(rb_stat_mtime): use stat_mtime.
(rb_file_s_mtime): ditto.
(rb_file_mtime): ditto.
(rb_file_ctime): use stat_ctime.
(rb_file_s_ctime): ditto.
(rb_stat_ctime): ditto.
* variable.c (rb_copy_generic_ivar): clear clone's instance variables
if obj has no instance variable.
* marshal.c (w_object): dump instance variables of generated string
for TYPE_USERDEF, even if original object has instance variables.
* lib/time.rb (Time#xmlschema): use nsec instead of usec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-11-19 12:09:38 +03:00
|
|
|
rb_define_method(rb_cTime, "tv_nsec", time_nsec, 0);
|
|
|
|
rb_define_method(rb_cTime, "nsec", time_nsec, 0);
|
2009-04-21 18:56:59 +04:00
|
|
|
rb_define_method(rb_cTime, "subsec", time_subsec, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
rb_define_method(rb_cTime, "strftime", time_strftime, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
/* methods for marshaling */
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_method(rb_cTime, "_dump", time_dump, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_singleton_method(rb_cTime, "_load", time_load, 1);
|
2003-10-02 12:25:00 +04:00
|
|
|
#if 0
|
|
|
|
/* Time will support marshal_dump and marshal_load in the future (1.9 maybe) */
|
|
|
|
rb_define_method(rb_cTime, "marshal_dump", time_mdump, 0);
|
|
|
|
rb_define_method(rb_cTime, "marshal_load", time_mload, 1);
|
|
|
|
#endif
|
2009-07-02 19:37:06 +04:00
|
|
|
|
2009-07-02 21:53:21 +04:00
|
|
|
#ifdef DEBUG_FIND_TIME_NUMGUESS
|
2009-07-02 19:37:06 +04:00
|
|
|
rb_define_virtual_variable("$find_time_numguess", find_time_numguess_getter, NULL);
|
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|