| Message ID | 1375789738-28034-1-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 06/08/13 7:48 AM, Stefan Hajnoczi wrote: > If CLOCK_MONOTONIC is not defined by system headers we use > gettimeofday(2). Apparently this is not used very often since no one > noticed the #ifdef was actually broken and left the function definition > unterminated. Can you show what this supposedly fixes? This code built just fine on OpenBSD before d05ef160453e98546a4197496dc8a3cb2defac53. > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > include/qemu/timer.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/qemu/timer.h b/include/qemu/timer.h > index 9dd206c..e3299b8 100644 > --- a/include/qemu/timer.h > +++ b/include/qemu/timer.h > @@ -125,8 +125,8 @@ static inline int64_t get_clock(void) > changes, so it should be avoided. */ > return get_clock_realtime(); > } > -} > #endif > +} > > void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); > void qemu_put_timer(QEMUFile *f, QEMUTimer *ts); >
On Tue, Aug 06, 2013 at 08:26:16PM -0400, Brad Smith wrote: > On 06/08/13 7:48 AM, Stefan Hajnoczi wrote: > >If CLOCK_MONOTONIC is not defined by system headers we use > >gettimeofday(2). Apparently this is not used very often since no one > >noticed the #ifdef was actually broken and left the function definition > >unterminated. > > Can you show what this supposedly fixes? This code built just fine on > OpenBSD before d05ef160453e98546a4197496dc8a3cb2defac53. Hi Brad, thanks for pointing this out. I misread the code: static inline int64_t get_clock(void) { #ifdef CLOCK_MONOTONIC if (use_rt_clock) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); return ts.tv_sec * 1000000000LL + ts.tv_nsec; } else #endif <--- thought this was #else { /* XXX: using gettimeofday leads to problems if the date changes, so it should be avoided. */ return get_clock_realtime(); } } #endif <--- this is actually for #ifdef _WIN32 So I thought the function definition would not be terminated properly. But after you mentioned it, my change makes no sense. Dropping this patch. Thanks, Stefan
Quoting Stefan Hajnoczi (2013-08-06 06:48:58) > If CLOCK_MONOTONIC is not defined by system headers we use > gettimeofday(2). Apparently this is not used very often since no one > noticed the #ifdef was actually broken and left the function definition > unterminated. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Ping, looking to pull this in for stable. > --- > include/qemu/timer.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/qemu/timer.h b/include/qemu/timer.h > index 9dd206c..e3299b8 100644 > --- a/include/qemu/timer.h > +++ b/include/qemu/timer.h > @@ -125,8 +125,8 @@ static inline int64_t get_clock(void) > changes, so it should be avoided. */ > return get_clock_realtime(); > } > -} > #endif > +} > > void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); > void qemu_put_timer(QEMUFile *f, QEMUTimer *ts); > -- > 1.8.1.4
Quoting Michael Roth (2013-09-24 16:58:22) > Quoting Stefan Hajnoczi (2013-08-06 06:48:58) > > If CLOCK_MONOTONIC is not defined by system headers we use > > gettimeofday(2). Apparently this is not used very often since no one > > noticed the #ifdef was actually broken and left the function definition > > unterminated. > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > Ping, looking to pull this in for stable. Bah, ignore this. Didn't see previous discussion. > > > --- > > include/qemu/timer.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/include/qemu/timer.h b/include/qemu/timer.h > > index 9dd206c..e3299b8 100644 > > --- a/include/qemu/timer.h > > +++ b/include/qemu/timer.h > > @@ -125,8 +125,8 @@ static inline int64_t get_clock(void) > > changes, so it should be avoided. */ > > return get_clock_realtime(); > > } > > -} > > #endif > > +} > > > > void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); > > void qemu_put_timer(QEMUFile *f, QEMUTimer *ts); > > -- > > 1.8.1.4
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 9dd206c..e3299b8 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -125,8 +125,8 @@ static inline int64_t get_clock(void) changes, so it should be avoided. */ return get_clock_realtime(); } -} #endif +} void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);
If CLOCK_MONOTONIC is not defined by system headers we use gettimeofday(2). Apparently this is not used very often since no one noticed the #ifdef was actually broken and left the function definition unterminated. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- include/qemu/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)