sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

stack-tracker: Don't log warnings on race conditions

Browse source 
X11 window stacking operations are by nature prone to race conditions.
For example, we might queue a "raise above" operation, but before it
actually takes place, the sibling the window was to be rased above, is
withdrawn.

In these cases we'd log warnings even though they are expected to
happen. Downgrade these warnings to debug messages, only printed when
MUTTER_VERBOSE is set.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1300
This commit is contained in:
Jonas Ådahl 2020-06-09 19:09:00 +02:00 committed by Georges Basile Stavracas Neto
parent 74c0d9140c
commit 53f61f3778
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/stack-tracker.c
View file

@ -381,8 +381,9 @@ meta_stack_op_apply (MetaStackTracker *tracker,
old_pos = find_window (stack, op->add.window); old_pos = find_window (stack, op->add.window);
if (old_pos >= 0) if (old_pos >= 0)
{ {
g_warning ("STACK_OP_ADD: window %s already in stack", meta_topic (META_DEBUG_STACK,
get_window_desc (tracker, op->add.window)); "STACK_OP_ADD: window %s already in stack",
get_window_desc (tracker, op->add.window));
return FALSE; return FALSE;
} }
@ -400,8 +401,9 @@ meta_stack_op_apply (MetaStackTracker *tracker,
old_pos = find_window (stack, op->remove.window); old_pos = find_window (stack, op->remove.window);
if (old_pos < 0) if (old_pos < 0)
{ {
g_warning ("STACK_OP_REMOVE: window %s not in stack", meta_topic (META_DEBUG_STACK,
get_window_desc (tracker, op->remove.window)); "STACK_OP_REMOVE: window %s not in stack",
get_window_desc (tracker, op->remove.window));
return FALSE; return FALSE;
} }
@ -416,8 +418,9 @@ meta_stack_op_apply (MetaStackTracker *tracker,
old_pos = find_window (stack, op->raise_above.window); old_pos = find_window (stack, op->raise_above.window);
if (old_pos < 0) if (old_pos < 0)
{ {
g_warning ("STACK_OP_RAISE_ABOVE: window %s not in stack", meta_topic (META_DEBUG_STACK,
get_window_desc (tracker, op->raise_above.window)); "STACK_OP_RAISE_ABOVE: window %s not in stack",
get_window_desc (tracker, op->raise_above.window));
return FALSE; return FALSE;
} }
@ -426,8 +429,9 @@ meta_stack_op_apply (MetaStackTracker *tracker,
above_pos = find_window (stack, op->raise_above.sibling); above_pos = find_window (stack, op->raise_above.sibling);
if (above_pos < 0) if (above_pos < 0)
{ {
g_warning ("STACK_OP_RAISE_ABOVE: sibling window %s not in stack", meta_topic (META_DEBUG_STACK,
get_window_desc (tracker, op->raise_above.sibling)); "STACK_OP_RAISE_ABOVE: sibling window %s not in stack",
get_window_desc (tracker, op->raise_above.sibling));
return FALSE; return FALSE;
} }
} }
@ -447,8 +451,9 @@ meta_stack_op_apply (MetaStackTracker *tracker,
old_pos = find_window (stack, op->raise_above.window); old_pos = find_window (stack, op->raise_above.window);
if (old_pos < 0) if (old_pos < 0)
{ {
g_warning ("STACK_OP_LOWER_BELOW: window %s not in stack", meta_topic (META_DEBUG_STACK,
get_window_desc (tracker, op->lower_below.window)); "STACK_OP_LOWER_BELOW: window %s not in stack",
get_window_desc (tracker, op->lower_below.window));
return FALSE; return FALSE;
} }
@ -459,8 +464,9 @@ meta_stack_op_apply (MetaStackTracker *tracker,
below_pos = find_window (stack, op->lower_below.sibling); below_pos = find_window (stack, op->lower_below.sibling);
if (below_pos < 0) if (below_pos < 0)
{ {
g_warning ("STACK_OP_LOWER_BELOW: sibling window %s not in stack", meta_topic (META_DEBUG_STACK,
get_window_desc (tracker, op->lower_below.sibling)); "STACK_OP_LOWER_BELOW: sibling window %s not in stack",
get_window_desc (tracker, op->lower_below.sibling));
return FALSE; return FALSE;
} }