[glib] gsocket: fix g_socket_condition_timed_wait() recovery after EINTR
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsocket: fix g_socket_condition_timed_wait() recovery after EINTR
- Date: Mon, 17 Feb 2014 16:38:25 +0000 (UTC)
commit 4139b26f3e2f869191b3d96d912f699470db6cea
Author: Dan Winship <danw gnome org>
Date: Fri Feb 14 15:35:11 2014 -0500
gsocket: fix g_socket_condition_timed_wait() recovery after EINTR
After getting an EINTR, g_socket_condition_timed_wait() has to adjust
its timeout, but it was trying to convert from nanoseconds to
microseconds by multiplying by 1000 rather than dividing... Oops.
https://bugzilla.gnome.org/show_bug.cgi?id=724239
gio/gsocket.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 4b691f8..70618e1 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -3674,7 +3674,7 @@ g_socket_condition_timed_wait (GSocket *socket,
if (timeout != -1)
{
- timeout -= (g_get_monotonic_time () - start_time) * 1000;
+ timeout -= (g_get_monotonic_time () - start_time) / 1000;
if (timeout < 0)
timeout = 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]