From owner-svn-src-all@freebsd.org Sat Jun 25 15:20:17 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2B02B81372; Sat, 25 Jun 2016 15:20:17 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CBCC1736; Sat, 25 Jun 2016 15:20:17 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id u5PFK6eL081925 (version=TLSv1 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sat, 25 Jun 2016 18:20:06 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua u5PFK6eL081925 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id u5PFK67o081923; Sat, 25 Jun 2016 18:20:06 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 25 Jun 2016 18:20:06 +0300 From: Konstantin Belousov To: Ivan Klymenko Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r302194 - head/lib/libthr/thread Message-ID: <20160625152006.GA38613@kib.kiev.ua> References: <201606251130.u5PBUeGC001988@repo.freebsd.org> <20160625164403.70684b3b@nonamehost.local> <20160625135508.GV38613@kib.kiev.ua> <20160625170406.77c79b2e@nonamehost.local> <20160625140529.GW38613@kib.kiev.ua> <20160625171800.50a43746@nonamehost.local> <20160625142915.GX38613@kib.kiev.ua> <20160625175503.7c57d42b@nonamehost.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160625175503.7c57d42b@nonamehost.local> User-Agent: Mutt/1.6.1 (2016-04-27) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2016 15:20:17 -0000 On Sat, Jun 25, 2016 at 05:55:03PM +0300, Ivan Klymenko wrote: > On Sat, 25 Jun 2016 17:29:15 +0300 > Konstantin Belousov wrote: > > > On Sat, Jun 25, 2016 at 05:18:00PM +0300, Ivan Klymenko wrote: > > > On Sat, 25 Jun 2016 17:05:29 +0300 > > > Konstantin Belousov wrote: > > > > > > > On Sat, Jun 25, 2016 at 05:04:06PM +0300, Ivan Klymenko wrote: > > > > > On Sat, 25 Jun 2016 16:55:09 +0300 > > > > > Konstantin Belousov wrote: > > > > > > > > > > > On Sat, Jun 25, 2016 at 04:44:03PM +0300, Ivan Klymenko > > > > > > wrote: > > > > > > > On Sat, 25 Jun 2016 11:30:40 +0000 (UTC) > > > > > > > Konstantin Belousov wrote: > > > > > > > > > > > > > > > Author: kib > > > > > > > > Date: Sat Jun 25 11:30:40 2016 > > > > > > > > New Revision: 302194 > > > > > > > > URL: https://svnweb.freebsd.org/changeset/base/302194 > > > > > > > > > > > > > > > > Log: > > > > > > > > For pthread_mutex_trylock() call on owned error-check or > > > > > > > > non-portable adaptive mutex, return EDEADLK as required by > > > > > > > > POSIX. The pthread_mutex_lock() is already compliant. > > > > > > > > > > > > > > > > Tested by: Guy Yur > > > > > > > > Sponsored by: The FreeBSD Foundation > > > > > > > > MFC after: 2 weeks > > > > > > > > Approved by: re (gjb) > > > > > > > > > > > > > > > > Modified: > > > > > > > > head/lib/libthr/thread/thr_mutex.c > > > > > > > > > > > > > > > > Modified: head/lib/libthr/thread/thr_mutex.c > > > > > > > > ============================================================================== > > > > > > > > --- head/lib/libthr/thread/thr_mutex.c Sat Jun 25 > > > > > > > > 10:08:04 2016 (r302193) +++ > > > > > > > > head/lib/libthr/thread/thr_mutex.c Sat Jun 25 11:30:40 > > > > > > > > 2016 (r302194) @@ -850,9 +850,12 @@ > > > > > > > > mutex_self_trylock(struct pthread_mutex switch > > > > > > > > (PMUTEX_TYPE(m->m_flags)) { case PTHREAD_MUTEX_ERRORCHECK: > > > > > > > > - case PTHREAD_MUTEX_NORMAL: > > > > > > > > case PTHREAD_MUTEX_ADAPTIVE_NP: > > > > > > > > - ret = EBUSY; > > > > > > > > + ret = EDEADLK; > > > > > > > > + break; > > > > > > > > + > > > > > > > > + case PTHREAD_MUTEX_NORMAL: > > > > > > > > + ret = EBUSY; > > > > > > > > break; > > > > > > > > > > > > > > > > case PTHREAD_MUTEX_RECURSIVE: > > > > > > > > > > > > > > Update for r302191 to r302196 console-kit-daemon: > > > > > > > pid 1496 (console-kit-daemon), uid 0: exited on signal 6 > > > > > > > pid 1581 (console-kit-daemon), uid 0: exited on signal 6 > > > > > > > pid 5954 (console-kit-daemon), uid 0: exited on signal 6 > > > > > > > pid 6010 (console-kit-daemon), uid 0: exited on signal 6 > > > > > > > pid 6016 (console-kit-daemon), uid 0: exited on signal 6 > > > > > > > > > > > > > > Xorg session after authorization not started - black > > > > > > > screen. > > > > > > > > > > > > Why did you replied to r302194 with this information ? Does > > > > > > reverting r302194 (and only this revision) restores > > > > > > console-kit functionality ? > > > > > > > > > > I do not know which one commits it breaks r302194 or next > > > > > 302195. I returned to r302191 for restores console-kit > > > > > functionality. > > > > Can you test, please ? Use r302195 kernel and previous libthr. > > > > > > Kernel r302195, world r302191 - works fine - the problem can not > > > reproduce. > > > > Thank you. > > > > Could you get backtrace from the console-kit-daemon ? Only rebuild > > libthr: cd src/lib/libthr && make DEBUG_FLAGS=-g WITHOUT_TESTS=yes > > all install then gather coredump and load it in gdb. Then you can > > revert the commit and rebuild working libthr. > > > > http://pastebin.com/wgmmicC3 If this information will be useful. Yes, it is useful, thank you. Please try this instead of reverting. diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 2ad05ca..1ae75fb 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -850,10 +871,10 @@ mutex_self_trylock(struct pthread_mutex *m) switch (PMUTEX_TYPE(m->m_flags)) { case PTHREAD_MUTEX_ERRORCHECK: - case PTHREAD_MUTEX_ADAPTIVE_NP: ret = EDEADLK; break; + case PTHREAD_MUTEX_ADAPTIVE_NP: case PTHREAD_MUTEX_NORMAL: ret = EBUSY; break;