From owner-svn-src-all@freebsd.org Sat Jun 25 14:18:04 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 F0973B82D97; Sat, 25 Jun 2016 14:18:04 +0000 (UTC) (envelope-from fidaj@ukr.net) Received: from frv157.fwdcdn.com (frv157.fwdcdn.com [212.42.77.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B44131A29; Sat, 25 Jun 2016 14:18:04 +0000 (UTC) (envelope-from fidaj@ukr.net) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=OKsNQr1PoLb8RRdK8791553T33yZiBVNpWcsZIWtYXs=; b=QZLPbPqmsv11nKaG9HhxfXcsLmZLsgCGI7n9qeTKtCbSPra03gV7kfKYQWBlcUe7f+M1viDxFHUiZaJTywJwiZjqAhfPpweo7dr6zZpcmA996eZSg5O90fnaXWu+tvwMWEIHU4vjoXvdPDhlhKImBfskAoZZvwrhjMe/JBQjvfU=; Received: from [37.229.193.176] (helo=nonamehost.local) by frv157.fwdcdn.com with esmtpsa ID 1bGoPJ-000FGI-Bp ; Sat, 25 Jun 2016 17:18:01 +0300 Date: Sat, 25 Jun 2016 17:18:00 +0300 From: Ivan Klymenko To: Konstantin Belousov 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: <20160625171800.50a43746@nonamehost.local> In-Reply-To: <20160625140529.GW38613@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> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.29; amd64-portbld-freebsd11.0) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Authentication-Result: IP=37.229.193.176; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net 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 14:18:05 -0000 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.