diff options
| -rwxr-xr-x | virt-top/virt_top_calendar1.ml | 7 | ||||
| -rwxr-xr-x | virt-top/virt_top_calendar2.ml | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/virt-top/virt_top_calendar1.ml b/virt-top/virt_top_calendar1.ml index beac4ee..534465c 100755 --- a/virt-top/virt_top_calendar1.ml +++ b/virt-top/virt_top_calendar1.ml @@ -49,5 +49,8 @@ fun time -> eprintf "end time: %s\n" (Printer.CalendarPrinter.to_string cal); - (* Convert to a time_t, adjusting for the current timezone. *) - fst (Unix.mktime (Calendar.to_unixtm cal)) + (* Convert to a time_t. Note that we compare this against + * Unix.gettimeofday in the main module, so this must be returned as + * plain seconds from 1970 with no timezone adjustment. (RHBZ#637964) + *) + Calendar.to_unixfloat cal diff --git a/virt-top/virt_top_calendar2.ml b/virt-top/virt_top_calendar2.ml index 184f2b9..cb0ebec 100755 --- a/virt-top/virt_top_calendar2.ml +++ b/virt-top/virt_top_calendar2.ml @@ -51,5 +51,8 @@ fun time -> eprintf "end time: %s\n" (Printer.CalendarPrinter.to_string cal); - (* Convert to a time_t, adjusting for the current timezone. *) - fst (Unix.mktime (Calendar.to_unixtm cal)) + (* Convert to a time_t. Note that we compare this against + * Unix.gettimeofday in the main module, so this must be returned as + * plain seconds from 1970 with no timezone adjustment. (RHBZ#637964) + *) + Calendar.to_unixfloat cal |