luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-12 10:45:13 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

7
ChangeLog.pre-2-12
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
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.
Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com> Fri Jan 21 10:18:24 2000 Owen Taylor <otaylor@redhat.com>
* glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine * glib.h (G_N_ELEMENTS): Added G_N_ELEMENTS macro to determine

4
glib.h
View File

@ -138,7 +138,7 @@ extern "C" {
* as such; using this with a dynamically allocated array will give * as such; using this with a dynamically allocated array will give
* incorrect results. * incorrect results.
*/ */
#define G_N_ELEMENTS(arr) (sizeof(arr) / sizeof((arr)[0])) #define G_N_ELEMENTS(arr) (sizeof (arr) / sizeof ((arr)[0]))
/* Define G_VA_COPY() to do the right thing for copying va_list variables. /* Define G_VA_COPY() to do the right thing for copying va_list variables.
* glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy. * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
@ -2649,7 +2649,7 @@ struct _GSourceFuncs
GTimeVal *current_time, GTimeVal *current_time,
gpointer user_data); gpointer user_data);
gboolean (*dispatch) (gpointer source_data, gboolean (*dispatch) (gpointer source_data,
GTimeVal *current_time, GTimeVal *dispatch_time,
gpointer user_data); gpointer user_data);
GDestroyNotify destroy; GDestroyNotify destroy;
}; };

4
glib/glib.h
View File

@ -138,7 +138,7 @@ extern "C" {
* as such; using this with a dynamically allocated array will give * as such; using this with a dynamically allocated array will give
* incorrect results. * incorrect results.
*/ */
#define G_N_ELEMENTS(arr) (sizeof(arr) / sizeof((arr)[0])) #define G_N_ELEMENTS(arr) (sizeof (arr) / sizeof ((arr)[0]))
/* Define G_VA_COPY() to do the right thing for copying va_list variables. /* Define G_VA_COPY() to do the right thing for copying va_list variables.
* glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy. * glibconfig.h may have already defined G_VA_COPY as va_copy or __va_copy.
@ -2649,7 +2649,7 @@ struct _GSourceFuncs
GTimeVal *current_time, GTimeVal *current_time,
gpointer user_data); gpointer user_data);
gboolean (*dispatch) (gpointer source_data, gboolean (*dispatch) (gpointer source_data,
GTimeVal *current_time, GTimeVal *dispatch_time,
gpointer user_data); gpointer user_data);
GDestroyNotify destroy; GDestroyNotify destroy;
}; };

21
glib/gmain.c
View File

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

21
gmain.c
View File

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