luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug #4156 - Changes vaguely modelled after Scott Gifford's patch

Browse Source 
Fri Jan 28 11:37:41 2000  Owen Taylor  <otaylor@redhat.com>

        Bug #4156 - Changes vaguely modelled after Scott Gifford's patch

	* gtimer.c (g_timer_elapsed): Never report negative times -
	clip times to 0.

	* gmain.c (g_timeout_prepare): Guard against unexpected
	clock shifts by never setting a timeout of more than
	data->interval msecs.
This commit is contained in:
Owen Taylor 2000-01-27 17:06:14 +00:00 committed by Owen Taylor
parent 2d28bd300f
commit adcb31e535
12 changed files with 178 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

11
ChangeLog.pre-2-12
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Fri Jan 28 11:37:41 2000 Owen Taylor <otaylor@redhat.com>
Bug #4156 - Changes vaguely modelled after Scott Gifford's patch
* gtimer.c (g_timer_elapsed): Never report negative times -
clip times to 0.
* gmain.c (g_timeout_prepare): Guard against unexpected
clock shifts by never setting a timeout of more than
data->interval msecs.
Wed Jan 26 05:29:11 2000 Tim Janik <timj@gtk.org>
* glib.h:

59
glib/gmain.c
View File

@ -1233,6 +1233,22 @@ g_main_wakeup (void)
/* Timeouts */
static void
g_timeout_set_expiration (GTimeoutData *data,
GTimeVal *current_time)
{
guint seconds = data->interval / 1000;
guint msecs = data->interval - seconds * 1000;
data->expiration.tv_sec = current_time->tv_sec + seconds;
data->expiration.tv_usec = current_time->tv_usec + msecs * 1000;
if (data->expiration.tv_usec >= 1000000)
{
data->expiration.tv_usec -= 1000000;
data->expiration.tv_sec++;
}
}
static gboolean
g_timeout_prepare (gpointer source_data,
GTimeVal *current_time,
@ -1245,9 +1261,21 @@ g_timeout_prepare (gpointer source_data,
msec = (data->expiration.tv_sec - current_time->tv_sec) * 1000 +
(data->expiration.tv_usec - current_time->tv_usec) / 1000;
*timeout = (msec <= 0) ? 0 : msec;
if (msec < 0)
msec = 0;
else if (msec > data->interval)
{
/* The system time has been set backwards, so we
* reset the expiration time to now + data->interval;
* this at least avoids hanging for long periods of time.
*/
g_timeout_set_expiration (data, current_time);
msec = data->interval;
}
return (msec <= 0);
*timeout = msec;
return (msec == 0);
}
static gboolean
@ -1271,16 +1299,7 @@ g_timeout_dispatch (gpointer source_data,
if (data->callback (user_data))
{
guint seconds = data->interval / 1000;
guint msecs = data->interval - seconds * 1000;
data->expiration.tv_sec = dispatch_time->tv_sec + seconds;
data->expiration.tv_usec = dispatch_time->tv_usec + msecs * 1000;
if (data->expiration.tv_usec >= 1000000)
{
data->expiration.tv_usec -= 1000000;
data->expiration.tv_sec++;
}
g_timeout_set_expiration (data, dispatch_time);
return TRUE;
}
else
@ -1294,24 +1313,14 @@ g_timeout_add_full (gint priority,
gpointer data,
GDestroyNotify notify)
{
guint seconds;
guint msecs;
GTimeoutData *timeout_data = g_new (GTimeoutData, 1);
GTimeVal current_time;
timeout_data->interval = interval;
timeout_data->callback = function;
g_get_current_time (&timeout_data->expiration);
g_get_current_time (&current_time);
seconds = timeout_data->interval / 1000;
msecs = timeout_data->interval - seconds * 1000;
timeout_data->expiration.tv_sec += seconds;
timeout_data->expiration.tv_usec += msecs * 1000;
if (timeout_data->expiration.tv_usec >= 1000000)
{
timeout_data->expiration.tv_usec -= 1000000;
timeout_data->expiration.tv_sec++;
}
g_timeout_set_expiration (timeout_data, &current_time);
return g_source_add (priority, FALSE, &timeout_funcs, timeout_data, data, notify);
}

8
glib/gtimer.c
View File

@ -184,9 +184,17 @@ g_timer_elapsed (GTimer *timer,
elapsed.tv_sec = rtimer->end.tv_sec - rtimer->start.tv_sec;
total = elapsed.tv_sec + ((gdouble) elapsed.tv_usec / 1e6);
if (total < 0)
{
total = 0;
if (microseconds)
*microseconds = 0;
}
else
if (microseconds)
*microseconds = elapsed.tv_usec;
#endif /* !NATIVE_WIN32 */
return total;

59
gmain.c
View File

@ -1233,6 +1233,22 @@ g_main_wakeup (void)
/* Timeouts */
static void
g_timeout_set_expiration (GTimeoutData *data,
GTimeVal *current_time)
{
guint seconds = data->interval / 1000;
guint msecs = data->interval - seconds * 1000;
data->expiration.tv_sec = current_time->tv_sec + seconds;
data->expiration.tv_usec = current_time->tv_usec + msecs * 1000;
if (data->expiration.tv_usec >= 1000000)
{
data->expiration.tv_usec -= 1000000;
data->expiration.tv_sec++;
}
}
static gboolean
g_timeout_prepare (gpointer source_data,
GTimeVal *current_time,
@ -1245,9 +1261,21 @@ g_timeout_prepare (gpointer source_data,
msec = (data->expiration.tv_sec - current_time->tv_sec) * 1000 +
(data->expiration.tv_usec - current_time->tv_usec) / 1000;
*timeout = (msec <= 0) ? 0 : msec;
if (msec < 0)
msec = 0;
else if (msec > data->interval)
{
/* The system time has been set backwards, so we
* reset the expiration time to now + data->interval;
* this at least avoids hanging for long periods of time.
*/
g_timeout_set_expiration (data, current_time);
msec = data->interval;
}
return (msec <= 0);
*timeout = msec;
return (msec == 0);
}
static gboolean
@ -1271,16 +1299,7 @@ g_timeout_dispatch (gpointer source_data,
if (data->callback (user_data))
{
guint seconds = data->interval / 1000;
guint msecs = data->interval - seconds * 1000;
data->expiration.tv_sec = dispatch_time->tv_sec + seconds;
data->expiration.tv_usec = dispatch_time->tv_usec + msecs * 1000;
if (data->expiration.tv_usec >= 1000000)
{
data->expiration.tv_usec -= 1000000;
data->expiration.tv_sec++;
}
g_timeout_set_expiration (data, dispatch_time);
return TRUE;
}
else
@ -1294,24 +1313,14 @@ g_timeout_add_full (gint priority,
gpointer data,
GDestroyNotify notify)
{
guint seconds;
guint msecs;
GTimeoutData *timeout_data = g_new (GTimeoutData, 1);
GTimeVal current_time;
timeout_data->interval = interval;
timeout_data->callback = function;
g_get_current_time (&timeout_data->expiration);
g_get_current_time (&current_time);
seconds = timeout_data->interval / 1000;
msecs = timeout_data->interval - seconds * 1000;
timeout_data->expiration.tv_sec += seconds;
timeout_data->expiration.tv_usec += msecs * 1000;
if (timeout_data->expiration.tv_usec >= 1000000)
{
timeout_data->expiration.tv_usec -= 1000000;
timeout_data->expiration.tv_sec++;
}
g_timeout_set_expiration (timeout_data, &current_time);
return g_source_add (priority, FALSE, &timeout_funcs, timeout_data, data, notify);
}

8
gtimer.c
View File

@ -184,9 +184,17 @@ g_timer_elapsed (GTimer *timer,
elapsed.tv_sec = rtimer->end.tv_sec - rtimer->start.tv_sec;
total = elapsed.tv_sec + ((gdouble) elapsed.tv_usec / 1e6);
if (total < 0)
{
total = 0;
if (microseconds)
*microseconds = 0;
}
else
if (microseconds)
*microseconds = elapsed.tv_usec;
#endif /* !NATIVE_WIN32 */
return total;