[Qemu-devel] [PATCH v2] glib: add compatibility interface for g_get_monotonic_time()

2014-10-15 Thread Igor Mammedov
From: Stefan Hajnoczi stefa...@redhat.com

This patch fixes compilation errors when building against glib 2.28.0
due to the missing g_get_monotonic_time() function.

The compilation error in tests/libqos/virtio.c was introduced in commit
70556264a89a268efba1d7e8e341adcdd7881eb4 (libqos: use microseconds
instead of iterations for virtio timeout).

Add a simple g_get_monotonic_time() implementation to compat-glib.h
based on code from vhost-user-test.c.

Signed-off-by: Stefan Hajnoczi stefa...@redhat.com
Signed-off-by: Igor Mammedov imamm...@redhat.com
---
v2: fix ibuild break beacuse of missing G_TIME_SPAN_SECOND in header
---
 include/glib-compat.h   | 19 +++
 tests/vhost-user-test.c | 23 +--
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/include/glib-compat.h b/include/glib-compat.h
index 4ae0671..e29bf69 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -18,6 +18,11 @@
 
 #include glib.h
 
+/* GLIB version compatibility flags */
+#if !GLIB_CHECK_VERSION(2, 26, 0)
+#define G_TIME_SPAN_SECOND  (G_GINT64_CONSTANT(100))
+#endif
+
 #if !GLIB_CHECK_VERSION(2, 14, 0)
 static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function,
   gpointer data)
@@ -26,6 +31,20 @@ static inline guint g_timeout_add_seconds(guint interval, 
GSourceFunc function,
 }
 #endif
 
+#if !GLIB_CHECK_VERSION(2, 28, 0)
+static inline gint64 g_get_monotonic_time(void)
+{
+/* g_get_monotonic_time() is best-effort so we can use the wall clock as a
+ * fallback.
+ */
+
+GTimeVal time;
+g_get_current_time(time);
+
+return time.tv_sec * G_TIME_SPAN_SECOND + time.tv_usec;
+}
+#endif
+
 #ifdef _WIN32
 /*
  * g_poll has a problem on Windows when using
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 75fedf0..fdf91e7 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -21,15 +21,6 @@
 #include sys/vfs.h
 #include qemu/sockets.h
 
-/* GLIB version compatibility flags */
-#if !GLIB_CHECK_VERSION(2, 26, 0)
-#define G_TIME_SPAN_SECOND  (G_GINT64_CONSTANT(100))
-#endif
-
-#if GLIB_CHECK_VERSION(2, 28, 0)
-#define HAVE_MONOTONIC_TIME
-#endif
-
 #if GLIB_CHECK_VERSION(2, 32, 0)
 #define HAVE_MUTEX_INIT
 #define HAVE_COND_INIT
@@ -116,18 +107,6 @@ static VhostUserMemory memory;
 static GMutex *data_mutex;
 static GCond *data_cond;
 
-static gint64 _get_time(void)
-{
-#ifdef HAVE_MONOTONIC_TIME
-return g_get_monotonic_time();
-#else
-GTimeVal time;
-g_get_current_time(time);
-
-return time.tv_sec * G_TIME_SPAN_SECOND + time.tv_usec;
-#endif
-}
-
 static GMutex *_mutex_new(void)
 {
 GMutex *mutex;
@@ -210,7 +189,7 @@ static void read_guest_mem(void)
 
 g_mutex_lock(data_mutex);
 
-end_time = _get_time() + 5 * G_TIME_SPAN_SECOND;
+end_time = g_get_monotonic_time() + 5 * G_TIME_SPAN_SECOND;
 while (!fds_num) {
 if (!_cond_wait_until(data_cond, data_mutex, end_time)) {
 /* timeout has passed */
-- 
1.9.3 (Apple Git-50)




Re: [Qemu-devel] [PATCH v2] glib: add compatibility interface for g_get_monotonic_time()

2014-10-15 Thread Peter Maydell
On 15 October 2014 12:10, Igor Mammedov imamm...@redhat.com wrote:
 From: Stefan Hajnoczi stefa...@redhat.com

 This patch fixes compilation errors when building against glib 2.28.0
 due to the missing g_get_monotonic_time() function.

 The compilation error in tests/libqos/virtio.c was introduced in commit
 70556264a89a268efba1d7e8e341adcdd7881eb4 (libqos: use microseconds
 instead of iterations for virtio timeout).

 Add a simple g_get_monotonic_time() implementation to compat-glib.h
 based on code from vhost-user-test.c.

 Signed-off-by: Stefan Hajnoczi stefa...@redhat.com
 Signed-off-by: Igor Mammedov imamm...@redhat.com

Unfortunately this patch doesn't actually fix the test compile
failure, because it puts the replacement implementation in
compat-glib.h which is not included from the libqos sources.

Adding #include compat-glib.h to tests/libqtest.h seems to
fix this.

-- PMM