Patchwork Replace remaining gmtime, localtime by gmtime_r, localtime_r

login
register
mail settings
Submitter Stefan Weil
Date Jan. 7, 2013, 10:08 p.m.
Message ID <1357596493-27396-1-git-send-email-sw@weilnetz.de>
Download mbox | patch
Permalink /patch/210250/
State Accepted
Headers show

Comments

Stefan Weil - Jan. 7, 2013, 10:08 p.m.
This allows removing of MinGW specific code and improves
reentrancy for POSIX hosts.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 block.c       |   10 ----------
 block/vvfat.c |    4 ----
 hw/omap1.c    |    2 +-
 vl.c          |    8 +++-----
 4 files changed, 4 insertions(+), 20 deletions(-)
Stefan Hajnoczi - Jan. 11, 2013, 8:41 a.m.
On Mon, Jan 07, 2013 at 11:08:13PM +0100, Stefan Weil wrote:
> This allows removing of MinGW specific code and improves
> reentrancy for POSIX hosts.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  block.c       |   10 ----------
>  block/vvfat.c |    4 ----
>  hw/omap1.c    |    2 +-
>  vl.c          |    8 +++-----
>  4 files changed, 4 insertions(+), 20 deletions(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan
Stefan Hajnoczi - Jan. 11, 2013, 8:46 a.m.
On Mon, Jan 07, 2013 at 11:08:13PM +0100, Stefan Weil wrote:
> diff --git a/vl.c b/vl.c
> index f056c95..21e4a74 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -454,15 +454,13 @@ 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);
> +            ret = localtime_r(&ti, tm);
>      } else {
>          ti -= rtc_date_offset;
> -        ret = gmtime(&ti);
> +        ret = gmtime_r(&ti, tm);
>      }
> -
> -    memcpy(tm, ret, sizeof(struct tm));
>  }

BTW I fixed the compiler warning here, no need to respin:

vl.c: In function ‘qemu_get_timedate’:
vl.c:451:16: error: variable ‘ret’ set but not used [-Werror=unused-but-set-variable]

Stefan

Patch

diff --git a/block.c b/block.c
index 4e28c55..60873ea 100644
--- a/block.c
+++ b/block.c
@@ -3338,11 +3338,7 @@  char *get_human_readable_size(char *buf, int buf_size, int64_t size)
 char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn)
 {
     char buf1[128], date_buf[128], clock_buf[128];
-#ifdef _WIN32
-    struct tm *ptm;
-#else
     struct tm tm;
-#endif
     time_t ti;
     int64_t secs;
 
@@ -3352,15 +3348,9 @@  char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn)
                  "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK");
     } else {
         ti = sn->date_sec;
-#ifdef _WIN32
-        ptm = localtime(&ti);
-        strftime(date_buf, sizeof(date_buf),
-                 "%Y-%m-%d %H:%M:%S", ptm);
-#else
         localtime_r(&ti, &tm);
         strftime(date_buf, sizeof(date_buf),
                  "%Y-%m-%d %H:%M:%S", &tm);
-#endif
         secs = sn->vm_clock_nsec / 1000000000;
         snprintf(clock_buf, sizeof(clock_buf),
                  "%02d:%02d:%02d.%03d",
diff --git a/block/vvfat.c b/block/vvfat.c
index 83706ce..06e6654 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -529,13 +529,9 @@  static inline uint8_t fat_chksum(const direntry_t* entry)
 /* if return_time==0, this returns the fat_date, else the fat_time */
 static uint16_t fat_datetime(time_t time,int return_time) {
     struct tm* t;
-#ifdef _WIN32
-    t=localtime(&time); /* this is not thread safe */
-#else
     struct tm t1;
     t = &t1;
     localtime_r(&time,t);
-#endif
     if(return_time)
 	return cpu_to_le16((t->tm_sec/2)|(t->tm_min<<5)|(t->tm_hour<<11));
     return cpu_to_le16((t->tm_mday)|((t->tm_mon+1)<<5)|((t->tm_year-80)<<9));
diff --git a/hw/omap1.c b/hw/omap1.c
index 8536e96..e85f2e2 100644
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -2830,7 +2830,7 @@  static void omap_rtc_tick(void *opaque)
         s->round = 0;
     }
 
-    memcpy(&s->current_tm, localtime(&s->ti), sizeof(s->current_tm));
+    localtime_r(&s->ti, &s->current_tm);
 
     if ((s->interrupts & 0x08) && s->ti == s->alarm_ti) {
         s->status |= 0x40;
diff --git a/vl.c b/vl.c
index f056c95..21e4a74 100644
--- a/vl.c
+++ b/vl.c
@@ -454,15 +454,13 @@  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);
+            ret = localtime_r(&ti, tm);
     } else {
         ti -= rtc_date_offset;
-        ret = gmtime(&ti);
+        ret = gmtime_r(&ti, tm);
     }
-
-    memcpy(tm, ret, sizeof(struct tm));
 }
 
 int qemu_timedate_diff(struct tm *tm)