| Message ID | 20220424105036.291370-1-haiyue.wang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] error-report: fix g_date_time_format assertion | expand |
On Sun, Apr 24, 2022 at 3:27 PM Haiyue Wang <haiyue.wang@intel.com> wrote: > The 'g_get_real_time' returns the number of microseconds since January > 1, 1970 UTC, but 'g_date_time_new_from_unix_utc' needs the number of > seconds, so it will cause the invalid time input: > > (process:279642): GLib-CRITICAL (recursed) **: g_date_time_format: > assertion 'datetime != NULL' failed > > Call function 'g_date_time_new_now_utc' instead, it has the same result > as 'g_date_time_new_from_unix_utc(g_get_real_time() / G_USEC_PER_SEC)'; > > Fixes: 73dab893b569 ("error-report: replace deprecated > g_get_current_time() with glib >= 2.62") > Signed-off-by: Haiyue Wang <haiyue.wang@intel.com> > Thanks, my bad Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > v2: use 'g_date_time_new_now_utc' directly, which handles the time > zone reference correctly. > --- > util/error-report.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/util/error-report.c b/util/error-report.c > index dbadaf206d..5edb2e6040 100644 > --- a/util/error-report.c > +++ b/util/error-report.c > @@ -173,7 +173,7 @@ static char * > real_time_iso8601(void) > { > #if GLIB_CHECK_VERSION(2,62,0) > - g_autoptr(GDateTime) dt = > g_date_time_new_from_unix_utc(g_get_real_time()); > + g_autoptr(GDateTime) dt = g_date_time_new_now_utc(); > /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 > */ > #pragma GCC diagnostic push > #pragma GCC diagnostic ignored "-Wdeprecated-declarations" > -- > 2.36.0 > > >
On Sun, Apr 24, 2022 at 06:50:35PM +0800, Haiyue Wang wrote: > The 'g_get_real_time' returns the number of microseconds since January > 1, 1970 UTC, but 'g_date_time_new_from_unix_utc' needs the number of > seconds, so it will cause the invalid time input: > > (process:279642): GLib-CRITICAL (recursed) **: g_date_time_format: assertion 'datetime != NULL' failed > > Call function 'g_date_time_new_now_utc' instead, it has the same result > as 'g_date_time_new_from_unix_utc(g_get_real_time() / G_USEC_PER_SEC)'; > > Fixes: 73dab893b569 ("error-report: replace deprecated g_get_current_time() with glib >= 2.62") > Signed-off-by: Haiyue Wang <haiyue.wang@intel.com> > --- > v2: use 'g_date_time_new_now_utc' directly, which handles the time > zone reference correctly. > --- > util/error-report.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/util/error-report.c b/util/error-report.c > index dbadaf206d..5edb2e6040 100644 > --- a/util/error-report.c > +++ b/util/error-report.c > @@ -173,7 +173,7 @@ static char * > real_time_iso8601(void) > { > #if GLIB_CHECK_VERSION(2,62,0) > - g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time()); > + g_autoptr(GDateTime) dt = g_date_time_new_now_utc(); > /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 */ > #pragma GCC diagnostic push > #pragma GCC diagnostic ignored "-Wdeprecated-declarations" Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Always nice when the bug fix is simpler than the original code too :-) With regards, Daniel
Queued, thanks. Paolo
diff --git a/util/error-report.c b/util/error-report.c index dbadaf206d..5edb2e6040 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -173,7 +173,7 @@ static char * real_time_iso8601(void) { #if GLIB_CHECK_VERSION(2,62,0) - g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time()); + g_autoptr(GDateTime) dt = g_date_time_new_now_utc(); /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
The 'g_get_real_time' returns the number of microseconds since January 1, 1970 UTC, but 'g_date_time_new_from_unix_utc' needs the number of seconds, so it will cause the invalid time input: (process:279642): GLib-CRITICAL (recursed) **: g_date_time_format: assertion 'datetime != NULL' failed Call function 'g_date_time_new_now_utc' instead, it has the same result as 'g_date_time_new_from_unix_utc(g_get_real_time() / G_USEC_PER_SEC)'; Fixes: 73dab893b569 ("error-report: replace deprecated g_get_current_time() with glib >= 2.62") Signed-off-by: Haiyue Wang <haiyue.wang@intel.com> --- v2: use 'g_date_time_new_now_utc' directly, which handles the time zone reference correctly. --- util/error-report.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)