pike.git/ src/ builtin.cmod

2017-12-06

2017-12-06 21:11:26 by Stephen R. van den Berg <srb@cuci.nl>

• fb0eb02114ab64c4e0ff25ba9a6ea5b347e8afb3 (29 lines) (+14/-15) ^{[ Show | Annotate ]}
  Branch: master

mktime: Improve timezone support, increase performance, minor bugfixes.

I am presuming that by now all systems we run on either have the tm_gmtoff
or the __tm_gmtoff struct member on the <time.h> struct tm.

This allows me to squash a few annoying bugs in the System.TM module
and also in the mktime() implementation. It speeds up mktime() a lot,
gets rid of large pieces of stale code, as well as extends its range
to basically unlimited, and even though it improves it a bit, it still
leaves System.TM more limited/buggy/slower than mktime() (especially
when using timezones other than UTC or the local timezone).

414:    {   #define STRFTIME_MAXSIZE 26    char s[STRFTIME_MAXSIZE]; -  if( !strftime(s, STRFTIME_MAXSIZE, "%c", &THIS->t) ) +  if( !strftime(s, STRFTIME_MAXSIZE, "%c\n", &THIS->t) )    push_undefined();    else    push_text(s);
423:       PIKEFUN string _sprintf( int flag, mapping options )    { -  int post_sum = 1; +  int post_sum = 0;    switch( flag )    {    case 'O':
521:    if( !res )    RETURN 0;    -  /* These are supposedly correctly by localtime_zone. */ -  SET_GMTOFF(res, GET_GMTOFF(&(THIS->t))); -  SET_ZONE(res, GET_ZONE(&(THIS->t))); -  +     THIS->t = *res;    THIS->modified = 1;    RETURN 1;
544:    RETURN 0;       THIS->t = *res; +  SET_ZONE(&THIS->t, "UTC"); /* Override timezone */    THIS->modified = 1;    RETURN 1;    }
582:    string|void timezone )    {    struct tm *t = &THIS->t; -  t->tm_isdst = -1; +  int use_utc = !timezone || !strcmp(timezone->str, "UTC"); +  t->tm_isdst = use_utc ? 0 : -1;    t->tm_year = year - 1900;    t->tm_mon = mon;    t->tm_mday = mday;    t->tm_hour = hour;    t->tm_min = min;    t->tm_sec = sec; -  +  t->tm_wday = -1; /* Conversion valid flag */    if (THIS->set_zone) {    free_string(THIS->set_zone);    THIS->set_zone = NULL;    } -  if( !timezone ) /* gmtime. */ +  THIS->unix_time = mktime_zone( t ); +  if (t->tm_wday < 0) +  Pike_error("Invalid time conversion\n"); +  /* Setting it to other timezones than UTC is not supported (yet) */ +  if (use_utc) {    SET_ZONE(t, "UTC"); -  else -  { -  add_ref(timezone); -  THIS->set_zone = timezone; -  SET_ZONE(t, timezone->str); +  THIS->unix_time += GET_GMTOFF(t);    } -  THIS->unix_time = mktime_zone( t ); +     }      #ifdef PIKE_NULL_IS_SPECIAL