shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

Pass a correct pointer type to localtime_r(3).

Browse Source 
On 09/04/2012 08:20 AM, Eric Blake wrote:
> tv_sec is required by POSIX to be
> of type time_t; so this is a bug in the OpenBSD header
> [for declaring it as long]

Most likely this problem arose because of the patch I pushed
in gnulib commit e07d7c40f3ca5ec410cf5aa6fa03cfe51e712039.
Previously, gnulib required timeval's tv_sec to be
the same size as time_t.  But now, it requires only that
tv_sec be big enough to hold a time_t.

This patch was needed for Emacs.  Without the patch, gnulib
replaced struct timeval on OpenBSD, and this messed up
utimens.c, and Emacs wouldn't build.

Alternatively, gnulib could substitute its own struct timeval
for the system's, wrapping every struct timeval-using function
(gettimeofday, futimesat, futimes, lutimes, etc.  That'd be
more work, though.  And it would introduce some performance
issues with gettimeofday, which is supposed to be fast.

I've been trying to get away from using struct timeval,
and to use the higher-resolution struct timespec instead,
so messing with these obsolescent interfaces has been
lower priority for me.  But if someone wants to take the
more-ambitious approach that'd be fine, I expect.

For this particular case, though, how about if we avoid
the problem entirely?  libvirt doesn't need to use struct
timeval here at all.  It makes libvirt smaller and probably
faster, and it ports to OpenBSD without messing with gnulib.
This commit is contained in:
Paul Eggert 2012-09-04 10:03:41 -07:00 committed by Eric Blake
parent d74e5a4dfc
commit 15d2c9fad4
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -263,6 +263,7 @@ Patches have also been contributed by:
Gene Czarcinski <gene@czarc.net> Gene Czarcinski <gene@czarc.net>
Nishank Trivedi <nistrive@cisco.com> Nishank Trivedi <nistrive@cisco.com>
Jasper Lievisse Adriaanse <jasper@humppa.nl> Jasper Lievisse Adriaanse <jasper@humppa.nl>
Paul Eggert <eggert@cs.ucla.edu>
[....send patches to get your name here....] [....send patches to get your name here....]

6
tools/virsh-domain.c
View File

@ -3707,7 +3707,7 @@ static char *
vshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime) vshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime)
{ {
char timestr[100]; char timestr[100];
struct timeval cur_time; time_t cur_time;
struct tm time_info; struct tm time_info;
const char *ext = NULL; const char *ext = NULL;
char *ret = NULL; char *ret = NULL;
@ -3723,8 +3723,8 @@ vshGenFileName(vshControl *ctl, virDomainPtr dom, const char *mime)
ext = ".png"; ext = ".png";
/* add mime type here */ /* add mime type here */
gettimeofday(&cur_time, NULL); time (&cur_time);
localtime_r(&cur_time.tv_sec, &time_info); localtime_r(&cur_time, &time_info);
strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info); strftime(timestr, sizeof(timestr), "%Y-%m-%d-%H:%M:%S", &time_info);
if (virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom), if (virAsprintf(&ret, "%s-%s%s", virDomainGetName(dom),

6
tools/virsh.c
View File

@ -2187,7 +2187,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format,
char *str; char *str;
size_t len; size_t len;
const char *lvl = ""; const char *lvl = "";
struct timeval stTimeval; time_t stTime;
struct tm *stTm; struct tm *stTm;
if (ctl->log_fd == -1) if (ctl->log_fd == -1)
@ -2198,8 +2198,8 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format,
* *
* [YYYY.MM.DD HH:MM:SS SIGNATURE PID] LOG_LEVEL message * [YYYY.MM.DD HH:MM:SS SIGNATURE PID] LOG_LEVEL message
*/ */
gettimeofday(&stTimeval, NULL); time (&stTime);
stTm = localtime(&stTimeval.tv_sec); stTm = localtime(&stTime);
virBufferAsprintf(&buf, "[%d.%02d.%02d %02d:%02d:%02d %s %d] ", virBufferAsprintf(&buf, "[%d.%02d.%02d %02d:%02d:%02d %s %d] ",
(1900 + stTm->tm_year), (1900 + stTm->tm_year),
(1 + stTm->tm_mon), (1 + stTm->tm_mon),