isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

core: Fix differing sequence timestamp precision expectations

Browse Source 
Calculations were being done at places accounting on usec precision,
however those are still treated as having msec precision at places. Let's
consolidate for the latter since it requires less changes across the board
and usec precision doesn't buy us anything here.

Closes: https://gitlab.gnome.org/GNOME/mutter/issues/541
This commit is contained in:
Carlos Garnacho 2019-04-15 20:03:16 +02:00
parent 2c1a951b6e
commit ab7ef5f8bf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/startup-notification.c
View File

@ -37,7 +37,7 @@
* OpenOffice or whatever seems to stop launching - people * OpenOffice or whatever seems to stop launching - people
* might decide they need to launch it again. * might decide they need to launch it again.
*/ */
#define STARTUP_TIMEOUT 15000000 #define STARTUP_TIMEOUT_MS 15000
enum enum
{ {
@ -425,10 +425,10 @@ collect_timed_out_foreach (void *element,
meta_topic (META_DEBUG_STARTUP, meta_topic (META_DEBUG_STARTUP,
"Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n", "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
elapsed, STARTUP_TIMEOUT, elapsed, STARTUP_TIMEOUT_MS,
meta_startup_sequence_get_id (sequence)); meta_startup_sequence_get_id (sequence));
if (elapsed > STARTUP_TIMEOUT) if (elapsed > STARTUP_TIMEOUT_MS)
ctod->list = g_slist_prepend (ctod->list, sequence); ctod->list = g_slist_prepend (ctod->list, sequence);
} }
@ -440,7 +440,7 @@ startup_sequence_timeout (void *data)
GSList *l; GSList *l;
ctod.list = NULL; ctod.list = NULL;
ctod.now = g_get_monotonic_time (); ctod.now = g_get_monotonic_time () / 1000;
g_slist_foreach (sn->startup_sequences, g_slist_foreach (sn->startup_sequences,
collect_timed_out_foreach, collect_timed_out_foreach,
&ctod); &ctod);

2
src/x11/meta-startup-notification-x11.c
View File

@ -151,7 +151,7 @@ meta_startup_sequence_x11_new (SnStartupSequence *seq)
{ {
gint64 timestamp; gint64 timestamp;
timestamp = sn_startup_sequence_get_timestamp (seq) * 1000; timestamp = sn_startup_sequence_get_timestamp (seq);
return g_object_new (META_TYPE_STARTUP_SEQUENCE_X11, return g_object_new (META_TYPE_STARTUP_SEQUENCE_X11,
"id", sn_startup_sequence_get_id (seq), "id", sn_startup_sequence_get_id (seq),
"icon-name", sn_startup_sequence_get_icon_name (seq), "icon-name", sn_startup_sequence_get_icon_name (seq),