From patchwork Wed Jan 9 06:18:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] oslib-win32: add lock for gmtime_r() Date: Tue, 08 Jan 2013 20:18:09 -0000 From: Wayne Xia X-Patchwork-Id: 210628 Message-Id: <1357712290-16496-1-git-send-email-xiawenc@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, Wenchao Xia , stefanha@gmail.com Also changed the caller of gmtime() to gmtime_r(). Signed-off-by: Wenchao Xia --- oslib-win32.c | 6 +++++- vl.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/oslib-win32.c b/oslib-win32.c index e7e283e..74e0c52 100644 --- a/oslib-win32.c +++ b/oslib-win32.c @@ -32,6 +32,8 @@ #include "trace.h" #include "qemu/sockets.h" +static GStaticMutex time_lock = G_STATIC_MUTEX_INIT; + void *qemu_oom_check(void *ptr) { if (ptr == NULL) { @@ -74,15 +76,17 @@ void qemu_vfree(void *ptr) VirtualFree(ptr, 0, MEM_RELEASE); } -/* FIXME: add proper locking */ +/* FIXME: add proper locking in MinGW */ struct tm *gmtime_r(const time_t *timep, struct tm *result) { + g_static_mutex_lock(&time_lock); struct tm *p = gmtime(timep); memset(result, 0, sizeof(*result)); if (p) { *result = *p; p = result; } + g_static_mutex_unlock(&time_lock); return p; } diff --git a/vl.c b/vl.c index 79e5122..8d7864c 100644 --- a/vl.c +++ b/vl.c @@ -454,12 +454,12 @@ void qemu_get_timedate(struct tm *tm, int offset) ti += offset; if (rtc_date_offset == -1) { if (rtc_utc) - ret = gmtime(&ti); + ret = gmtime_r(&ti, tm); else ret = localtime(&ti); } else { ti -= rtc_date_offset; - ret = gmtime(&ti); + ret = gmtime_r(&ti, tm); } memcpy(tm, ret, sizeof(struct tm));