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

s/current_time/dispatch_time/ for the dispatch() handlers. refetch the

Browse Source 
Wed Jan 26 05:24:38 2000  Tim Janik  <timj@gtk.org>

        * glib.h:
        * gmain.c: s/current_time/dispatch_time/ for the dispatch() handlers.
        refetch the current time after invocation of poll() to cover up for
        the time spent in that function call.
This commit is contained in:
Tim Janik
2000-01-26 04:29:06 +00:00
committed by Tim Janik
parent 948f64a183
commit ce4d6765c9
12 changed files with 86 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gmain.c
View File

@@ -122,7 +122,7 @@ static gboolean g_timeout_check (gpointer source_data,
GTimeVal *current_time,
gpointer user_data);
static gboolean g_timeout_dispatch (gpointer source_data,
GTimeVal *current_time,
GTimeVal *dispatch_time,
gpointer user_data);
static gboolean g_idle_prepare (gpointer source_data,
GTimeVal *current_time,
@@ -132,7 +132,7 @@ static gboolean g_idle_check (gpointer source_data,
GTimeVal *current_time,
gpointer user_data);
static gboolean g_idle_dispatch (gpointer source_data,
GTimeVal *current_time,
GTimeVal *dispatch_time,
gpointer user_data);
/* Data */
@@ -629,7 +629,7 @@ g_get_current_time (GTimeVal *result)
/* HOLDS: main_loop_lock */
static void
g_main_dispatch (GTimeVal *current_time)
g_main_dispatch (GTimeVal *dispatch_time)
{
while (pending_dispatches != NULL)
{
@@ -657,7 +657,7 @@ g_main_dispatch (GTimeVal *current_time)
G_UNLOCK (main_loop);
need_destroy = ! dispatch (source_data,
current_time,
dispatch_time,
hook_data);
G_LOCK (main_loop);
@@ -707,7 +707,7 @@ g_main_iterate (gboolean block,
gboolean dispatch)
{
GHook *hook;
GTimeVal current_time ={ 0, 0 };
GTimeVal current_time = { 0, 0 };
gint n_ready = 0;
gint current_priority = 0;
gint timeout;
@@ -810,6 +810,9 @@ g_main_iterate (gboolean block,
g_main_poll (timeout, n_ready > 0, current_priority);
if (timeout != 0)
g_get_current_time (&current_time);
/* Check to see what sources need to be dispatched */
n_ready = 0;
@@ -1264,7 +1267,7 @@ g_timeout_check (gpointer source_data,
static gboolean
g_timeout_dispatch (gpointer source_data,
GTimeVal *current_time,
GTimeVal *dispatch_time,
gpointer user_data)
{
GTimeoutData *data = source_data;
@@ -1274,8 +1277,8 @@ g_timeout_dispatch (gpointer source_data,
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;
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;
@@ -1347,7 +1350,7 @@ g_idle_check (gpointer source_data,
static gboolean
g_idle_dispatch (gpointer source_data,
GTimeVal *current_time,
GTimeVal *dispatch_time,
gpointer user_data)
{
GSourceFunc func = source_data;