luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 14:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

switch GSocket to monotonic time for timeouts

Browse Source
This commit is contained in:
Ryan Lortie 2010-10-22 19:16:57 +02:00
parent d3fe2efb83
commit 83472b34ef
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gsocket.c
View File

@ -2411,7 +2411,7 @@ typedef struct {
GIOCondition condition;
GCancellable *cancellable;
GPollFD cancel_pollfd;
GTimeVal timeout_time;
GTimeSpec timeout_time;
} GSocketSource;
static gboolean
@ -2425,11 +2425,11 @@ socket_source_prepare (GSource *source,
if (socket_source->timeout_time.tv_sec)
{
GTimeVal now;
GTimeSpec now;
g_source_get_current_time (source, &now);
g_source_get_time (source, &now);
*timeout = ((socket_source->timeout_time.tv_sec - now.tv_sec) * 1000 +
(socket_source->timeout_time.tv_usec - now.tv_usec) / 1000);
(socket_source->timeout_time.tv_nsec - now.tv_nsec) / 1000000);
if (*timeout < 0)
{
socket_source->socket->priv->timed_out = TRUE;
@ -2547,13 +2547,13 @@ socket_source_new (GSocket *socket,
if (socket->priv->timeout)
{
g_get_current_time (&socket_source->timeout_time);
g_get_monotonic_time (&socket_source->timeout_time);
socket_source->timeout_time.tv_sec += socket->priv->timeout;
}
else
{
socket_source->timeout_time.tv_sec = 0;
socket_source->timeout_time.tv_usec = 0;
socket_source->timeout_time.tv_nsec = 0;
}
return source;