X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgtimer.c;h=4d24caed2b650fd91b79ab437481519f41c46455;hb=20f6cc2a10ba26860e7a6d27c100deadb5497772;hp=91f3f8acad19092b8557e33cdc15dc599de2d4fc;hpb=4431ac5dda5a3f130c9eb8f41445c883d960fe4c;p=platform%2Fupstream%2Fglib.git diff --git a/glib/gtimer.c b/glib/gtimer.c index 91f3f8a..4d24cae 100644 --- a/glib/gtimer.c +++ b/glib/gtimer.c @@ -12,19 +12,17 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, see . */ /* * Modified by the GLib Team and others 1997-2000. See the AUTHORS * file for a list of people on the GLib Team. See the ChangeLog * files for a list of changes. These files are distributed with - * GLib at ftp://ftp.gtk.org/pub/gtk/. + * GLib at ftp://ftp.gtk.org/pub/gtk/. */ -/* +/* * MT safe */ @@ -33,13 +31,15 @@ #include -#ifdef HAVE_UNISTD_H +#ifdef G_OS_UNIX #include -#endif /* HAVE_UNISTD_H */ +#endif /* G_OS_UNIX */ -#ifndef G_OS_WIN32 +#ifdef HAVE_SYS_TIME_H #include +#endif #include +#ifndef G_OS_WIN32 #include #endif /* G_OS_WIN32 */ @@ -47,12 +47,15 @@ #include #endif /* G_OS_WIN32 */ -#include "glib.h" -#include "gthread.h" -#include "galias.h" +#include "gtimer.h" + +#include "gmem.h" +#include "gstrfuncs.h" +#include "gtestutils.h" +#include "gmain.h" /** - * SECTION: timers + * SECTION:timers * @title: Timers * @short_description: keep track of elapsed time * @@ -60,19 +63,8 @@ * that time. This is done somewhat differently on different platforms, * and can be tricky to get exactly right, so #GTimer provides a * portable/convenient interface. - * - * - * #GTimer uses a higher-quality clock when thread support is available. - * Therefore, calling g_thread_init() while timers are running may lead to - * unreliable results. It is best to call g_thread_init() before starting any - * timers, if you are using threads at all. - * **/ -#define G_NSEC_PER_SEC 1000000000 - -#define GETTIME(v) (v = g_thread_gettime ()) - /** * GTimer: * @@ -88,10 +80,11 @@ struct _GTimer /** * g_timer_new: - * @Returns: a new #GTimer. * * Creates a new timer, and starts timing (i.e. g_timer_start() is * implicitly called for you). + * + * Returns: a new #GTimer. **/ GTimer* g_timer_new (void) @@ -101,7 +94,7 @@ g_timer_new (void) timer = g_new (GTimer, 1); timer->active = TRUE; - GETTIME (timer->start); + timer->start = g_get_monotonic_time (); return timer; } @@ -136,7 +129,7 @@ g_timer_start (GTimer *timer) timer->active = TRUE; - GETTIME (timer->start); + timer->start = g_get_monotonic_time (); } /** @@ -153,7 +146,7 @@ g_timer_stop (GTimer *timer) timer->active = FALSE; - GETTIME (timer->end); + timer->end = g_get_monotonic_time (); } /** @@ -169,7 +162,7 @@ g_timer_reset (GTimer *timer) { g_return_if_fail (timer != NULL); - GETTIME (timer->start); + timer->start = g_get_monotonic_time (); } /** @@ -197,7 +190,7 @@ g_timer_continue (GTimer *timer) elapsed = timer->end - timer->start; - GETTIME (timer->start); + timer->start = g_get_monotonic_time (); timer->start -= elapsed; @@ -210,8 +203,6 @@ g_timer_continue (GTimer *timer) * @microseconds: return location for the fractional part of seconds * elapsed, in microseconds (that is, the total number * of microseconds elapsed, modulo 1000000), or %NULL - * @Returns: seconds elapsed as a floating point value, including any - * fractional part. * * If @timer has been started but not stopped, obtains the time since * the timer was started. If @timer has been stopped, obtains the @@ -220,10 +211,8 @@ g_timer_continue (GTimer *timer) * including any fractional part. The @microseconds out parameter is * essentially useless. * - * - * Calling initialization functions, in particular g_thread_init(), while a - * timer is running will cause invalid return values from this function. - * + * Returns: seconds elapsed as a floating point value, including any + * fractional part. **/ gdouble g_timer_elapsed (GTimer *timer, @@ -235,74 +224,41 @@ g_timer_elapsed (GTimer *timer, g_return_val_if_fail (timer != NULL, 0); if (timer->active) - GETTIME (timer->end); + timer->end = g_get_monotonic_time (); elapsed = timer->end - timer->start; - total = elapsed / 1e9; + total = elapsed / 1e6; if (microseconds) - *microseconds = (elapsed / 1000) % 1000000; + *microseconds = elapsed % 1000000; return total; } +/** + * g_usleep: + * @microseconds: number of microseconds to pause + * + * Pauses the current thread for the given number of microseconds. + * + * There are 1 million microseconds per second (represented by the + * #G_USEC_PER_SEC macro). g_usleep() may have limited precision, + * depending on hardware and operating system; don't rely on the exact + * length of the sleep. + */ void g_usleep (gulong microseconds) { #ifdef G_OS_WIN32 Sleep (microseconds / 1000); -#else /* !G_OS_WIN32 */ -# ifdef HAVE_NANOSLEEP +#else struct timespec request, remaining; request.tv_sec = microseconds / G_USEC_PER_SEC; request.tv_nsec = 1000 * (microseconds % G_USEC_PER_SEC); while (nanosleep (&request, &remaining) == -1 && errno == EINTR) request = remaining; -# else /* !HAVE_NANOSLEEP */ -# ifdef HAVE_NSLEEP - /* on AIX, nsleep is analogous to nanosleep */ - struct timespec request, remaining; - request.tv_sec = microseconds / G_USEC_PER_SEC; - request.tv_nsec = 1000 * (microseconds % G_USEC_PER_SEC); - while (nsleep (&request, &remaining) == -1 && errno == EINTR) - request = remaining; -# else /* !HAVE_NSLEEP */ - if (g_thread_supported ()) - { - static GStaticMutex mutex = G_STATIC_MUTEX_INIT; - static GCond* cond = NULL; - GTimeVal end_time; - - g_get_current_time (&end_time); - if (microseconds > G_MAXLONG) - { - microseconds -= G_MAXLONG; - g_time_val_add (&end_time, G_MAXLONG); - } - g_time_val_add (&end_time, microseconds); - - g_static_mutex_lock (&mutex); - - if (!cond) - cond = g_cond_new (); - - while (g_cond_timed_wait (cond, g_static_mutex_get_mutex (&mutex), - &end_time)) - /* do nothing */; - - g_static_mutex_unlock (&mutex); - } - else - { - struct timeval tv; - tv.tv_sec = microseconds / G_USEC_PER_SEC; - tv.tv_usec = microseconds % G_USEC_PER_SEC; - select(0, NULL, NULL, NULL, &tv); - } -# endif /* !HAVE_NSLEEP */ -# endif /* !HAVE_NANOSLEEP */ -#endif /* !G_OS_WIN32 */ +#endif } /** @@ -341,8 +297,8 @@ g_time_val_add (GTimeVal *time_, glong microseconds) } } -/* converts a broken down date representation, relative to UTC, to - * a timestamp; it uses timegm() if it's available. +/* converts a broken down date representation, relative to UTC, + * to a timestamp; it uses timegm() if it's available. */ static time_t mktime_utc (struct tm *tm) @@ -378,12 +334,17 @@ mktime_utc (struct tm *tm) /** * g_time_val_from_iso8601: * @iso_date: an ISO 8601 encoded date string - * @time_: a #GTimeVal + * @time_: (out): a #GTimeVal * * Converts a string containing an ISO 8601 encoded date and time * to a #GTimeVal and puts it into @time_. * - * Return value: %TRUE if the conversion was successful. + * @iso_date must include year, month, day, hours, minutes, and + * seconds. It can optionally include fractions of a second and a time + * zone indicator. (In the absence of any time zone indication, the + * timestamp is assumed to be in local time.) + * + * Returns: %TRUE if the conversion was successful. * * Since: 2.12 */ @@ -397,9 +358,9 @@ g_time_val_from_iso8601 (const gchar *iso_date, g_return_val_if_fail (iso_date != NULL, FALSE); g_return_val_if_fail (time_ != NULL, FALSE); - /* Ensure that the first character is a digit, - * the first digit of the date, otherwise we don't - * have an ISO 8601 date */ + /* Ensure that the first character is a digit, the first digit + * of the date, otherwise we don't have an ISO 8601 date + */ while (g_ascii_isspace (*iso_date)) iso_date++; @@ -430,9 +391,15 @@ g_time_val_from_iso8601 (const gchar *iso_date, tm.tm_year = val / 10000 - 1900; } - if (*iso_date++ != 'T') + if (*iso_date != 'T') return FALSE; - + + iso_date++; + + /* If there is a 'T' then there has to be a time */ + if (!g_ascii_isdigit (*iso_date)) + return FALSE; + val = strtoul (iso_date, (char **)&iso_date, 10); if (*iso_date == ':') { @@ -503,10 +470,28 @@ g_time_val_from_iso8601 (const gchar *iso_date, * g_time_val_to_iso8601: * @time_: a #GTimeVal * - * Converts @time_ into an ISO 8601 encoded string, relative to the - * Coordinated Universal Time (UTC). + * Converts @time_ into an RFC 3339 encoded string, relative to the + * Coordinated Universal Time (UTC). This is one of the many formats + * allowed by ISO 8601. + * + * ISO 8601 allows a large number of date/time formats, with or without + * punctuation and optional elements. The format returned by this function + * is a complete date and time, with optional punctuation included, the + * UTC time zone represented as "Z", and the @tv_usec part included if + * and only if it is nonzero, i.e. either + * "YYYY-MM-DDTHH:MM:SSZ" or "YYYY-MM-DDTHH:MM:SS.fffffZ". + * + * This corresponds to the Internet date/time format defined by + * [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt), + * and to either of the two most-precise formats defined by + * the W3C Note + * [Date and Time Formats](http://www.w3.org/TR/NOTE-datetime-19980827). + * Both of these documents are profiles of ISO 8601. * - * Return value: a newly allocated string containing an ISO 8601 date + * Use g_date_time_format() or g_strdup_printf() if a different + * variation of ISO 8601 format is required. + * + * Returns: a newly allocated string containing an ISO 8601 date * * Since: 2.12 */ @@ -563,6 +548,3 @@ g_time_val_to_iso8601 (GTimeVal *time_) return retval; } - -#define __G_TIMER_C__ -#include "galiasdef.c"