From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIHLr-0002dG-32 for qemu-devel@nongnu.org; Wed, 29 Jun 2016 11:24:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIHLo-0006UH-VU for qemu-devel@nongnu.org; Wed, 29 Jun 2016 11:24:30 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIHLo-0006UC-OC for qemu-devel@nongnu.org; Wed, 29 Jun 2016 11:24:28 -0400 Received: by mail-wm0-x242.google.com with SMTP id a66so15134191wme.2 for ; Wed, 29 Jun 2016 08:24:28 -0700 (PDT) Received: from 640k.lan (94-39-188-118.adsl-ull.clienti.tiscali.it. [94.39.188.118]) by smtp.gmail.com with ESMTPSA id b187sm4725672wmg.15.2016.06.29.08.24.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jun 2016 08:24:23 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 29 Jun 2016 17:23:59 +0200 Message-Id: <1467213840-14206-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1467213840-14206-1-git-send-email-pbonzini@redhat.com> References: <1467213840-14206-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 31/35] vhost-user-test: fix g_cond_wait_until compat implementation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This fixes compilation with glib versions up to 2.30, such as the one in CentOS 6. Signed-off-by: Paolo Bonzini --- include/glib-compat.h | 26 ++++++++++++++++++++++++++ tests/vhost-user-test.c | 17 ++--------------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/include/glib-compat.h b/include/glib-compat.h index 03d8b12..01aa7b3 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -149,6 +149,32 @@ static inline void (g_cond_signal)(CompatGCond *cond) } #undef g_cond_signal +static inline gboolean (g_cond_timed_wait)(CompatGCond *cond, + CompatGMutex *mutex, + GTimeVal *time) +{ + g_assert(mutex->once.status != G_ONCE_STATUS_PROGRESS); + g_once(&cond->once, do_g_cond_new, NULL); + return g_cond_timed_wait((GCond *) cond->once.retval, + (GMutex *) mutex->once.retval, time); +} +#undef g_cond_timed_wait + +/* This is not a macro, because it didn't exist until 2.32. */ +static inline gboolean g_cond_wait_until(CompatGCond *cond, CompatGMutex *mutex, + gint64 end_time) +{ + GTimeVal time; + + /* Convert from monotonic to CLOCK_REALTIME. */ + end_time -= g_get_monotonic_time(); + g_get_current_time(&time); + end_time += time.tv_sec * G_TIME_SPAN_SECOND + time.tv_usec; + + time.tv_sec = end_time / G_TIME_SPAN_SECOND; + time.tv_usec = end_time % G_TIME_SPAN_SECOND; + return g_cond_timed_wait(cond, mutex, &time); +} /* before 2.31 there was no g_thread_new() */ static inline GThread *g_thread_new(const char *name, diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 8b2164b..421d432 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -127,25 +127,12 @@ typedef struct TestServer { int fds_num; int fds[VHOST_MEMORY_MAX_NREGIONS]; VhostUserMemory memory; - GMutex data_mutex; - GCond data_cond; + CompatGMutex data_mutex; + CompatGCond data_cond; int log_fd; uint64_t rings; } TestServer; -#if !GLIB_CHECK_VERSION(2, 32, 0) -static gboolean g_cond_wait_until(CompatGCond cond, CompatGMutex mutex, - gint64 end_time) -{ - gboolean ret = FALSE; - end_time -= g_get_monotonic_time(); - GTimeVal time = { end_time / G_TIME_SPAN_SECOND, - end_time % G_TIME_SPAN_SECOND }; - ret = g_cond_timed_wait(cond, mutex, &time); - return ret; -} -#endif - static const char *tmpfs; static const char *root; -- 1.8.3.1