X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fnanosleep.c;h=d0b12e7a9d40a1ad99fb88f8b2bb033528ef214b;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=ab5cc8986468917273690d0b93084e78cf160aed;hpb=5bf4ad0bfa91baa20e4f39f47bfb8b4dd00df720;p=gnulib.git diff --git a/lib/nanosleep.c b/lib/nanosleep.c index ab5cc8986..d0b12e7a9 100644 --- a/lib/nanosleep.c +++ b/lib/nanosleep.c @@ -1,6 +1,6 @@ /* Provide a replacement for the POSIX nanosleep function. - Copyright (C) 1999-2000, 2002, 2004-2011 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002, 2004-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ along with this program. If not, see . */ /* written by Jim Meyering - and Bruno Haible for the Woe32 part */ + and Bruno Haible for the native Windows part */ #include @@ -65,7 +65,7 @@ nanosleep (const struct timespec *requested_delay, const time_t limit = 24 * 24 * 60 * 60; time_t seconds = requested_delay->tv_sec; struct timespec intermediate; - intermediate.tv_nsec = 0; + intermediate.tv_nsec = requested_delay->tv_nsec; while (limit < seconds) { @@ -76,31 +76,23 @@ nanosleep (const struct timespec *requested_delay, if (result) { if (remaining_delay) - { - remaining_delay->tv_sec += seconds; - remaining_delay->tv_nsec += requested_delay->tv_nsec; - if (BILLION <= requested_delay->tv_nsec) - { - remaining_delay->tv_sec++; - remaining_delay->tv_nsec -= BILLION; - } - } + remaining_delay->tv_sec += seconds; return result; } + intermediate.tv_nsec = 0; } intermediate.tv_sec = seconds; - intermediate.tv_nsec = requested_delay->tv_nsec; return nanosleep (&intermediate, remaining_delay); } } #elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -/* Windows platforms. */ +/* Native Windows platforms. */ # define WIN32_LEAN_AND_MEAN # include -/* The Win32 function Sleep() has a resolution of about 15 ms and takes +/* The Windows API function Sleep() has a resolution of about 15 ms and takes at least 5 ms to execute. We use this function for longer time periods. Additionally, we use busy-looping over short time periods, to get a resolution of about 0.01 ms. In order to measure such short timespans, @@ -218,12 +210,11 @@ my_usleep (const struct timespec *ts_delay) tv_delay.tv_usec = (ts_delay->tv_nsec + 999) / 1000; if (tv_delay.tv_usec == 1000000) { - time_t t1 = tv_delay.tv_sec + 1; - if (t1 < tv_delay.tv_sec) + if (tv_delay.tv_sec == TYPE_MAXIMUM (time_t)) tv_delay.tv_usec = 1000000 - 1; /* close enough */ else { - tv_delay.tv_sec = t1; + tv_delay.tv_sec++; tv_delay.tv_usec = 0; } }