diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-03 13:49:41 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-03 13:49:41 +0000 |
commit | 7eb5c0ac7472f7e73fb286f7e6f114b7e6f0fc85 (patch) | |
tree | 79152858ae463ca0fcc479e875ad0f55a5a827f3 /time.c | |
parent | 0d2d098660566761019c8d5ffbeafd0444d0605c (diff) | |
download | ruby-7eb5c0ac7472f7e73fb286f7e6f114b7e6f0fc85.tar.gz |
* time.c (find_time_t): less number of guesses for hh:mm:60.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r-- | time.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -1862,10 +1862,12 @@ timegm_noleapsecond(struct tm *tm) #if 0 #define DEBUG_FIND_TIME_NUMGUESS -#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)) +#define DEBUG_GUESSRANGE #endif -#ifndef DEBUG_REPORT_GUESSRANGE +#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 #define DEBUG_REPORT_GUESSRANGE #endif @@ -1962,15 +1964,23 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp) if (status == 1) { time_t guess0_hi = timegm_noleapsecond(&tm_hi); guess = guess_hi - (guess0_hi - guess0); + if (guess == guess_hi) /* hh:mm:60 tends to cause this condition. */ + guess--; status = 2; } else if (status == 2) { time_t guess0_lo = timegm_noleapsecond(&tm_lo); guess = guess_lo + (guess0 - guess0_lo); + if (guess == guess_lo) + guess++; status = 0; } if (guess <= guess_lo || guess_hi <= guess) { /* Precious guess is invalid. try binary search. */ +#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 goto binsearch; } } |