Re: [PATCH] Fix mutex hang in colord on output removal

2015-01-20 Thread Bryce Harrington
On Mon, Jan 19, 2015 at 10:39:28AM +, Richard Hughes wrote: > On 15 January 2015 at 14:40, Olivier Fourdan wrote: > > "ocms" is taken from the container now (that was the casting error), so no > > need for the lookup from cms as we already have it. > > Ohh of course, makes sense. > > Signed-

Re: [PATCH] Fix mutex hang in colord on output removal

2015-01-19 Thread Richard Hughes
On 15 January 2015 at 14:40, Olivier Fourdan wrote: > "ocms" is taken from the container now (that was the casting error), so no > need for the lookup from cms as we already have it. Ohh of course, makes sense. Signed-off-by: Richard Hughes Pekka, can you pull this into master please. Thanks!

Re: [PATCH] Fix mutex hang in colord on output removal

2015-01-15 Thread Olivier Fourdan
On 15/01/15 15:31, Richard Hughes wrote: How come this is removed too? I think I'd rather it stayed so we show a warning rather than explode in a ball of fire. "ocms" is taken from the container now (that was the casting error), so no need for the lookup from cms as we already have it. And i

Re: [PATCH] Fix mutex hang in colord on output removal

2015-01-15 Thread Richard Hughes
On 8 January 2015 at 14:40, Olivier Fourdan wrote: > This is because of a cast error, the type of container should be > "cms_output" and not "cms_colord". Good catch! > - ocms = g_hash_table_lookup(cms->devices, device_id); > - if (!ocms) { > - weston_log("colord: faile

[PATCH] Fix mutex hang in colord on output removal

2015-01-08 Thread Olivier Fourdan
Using the x11 output (maybe with others as well), weston would hang when closing the output if the colord plugin is enabled. The hang occurs in mutex lock in the output notifier handler because the given GMutex value is incorrect. This is because of a cast error, the type of container should be "