From owner-svn-src-stable-11@freebsd.org Thu Apr 5 15:52:21 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2B54F8F2AF; Thu, 5 Apr 2018 15:52:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 60C028306C; Thu, 5 Apr 2018 15:52:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 42FBB24B8D; Thu, 5 Apr 2018 15:52:21 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w35FqLMt088907; Thu, 5 Apr 2018 15:52:21 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w35FqLUP088905; Thu, 5 Apr 2018 15:52:21 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201804051552.w35FqLUP088905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 5 Apr 2018 15:52:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332078 - in stable/11/sys: kern sys X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in stable/11/sys: kern sys X-SVN-Commit-Revision: 332078 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Apr 2018 15:52:22 -0000 Author: markj Date: Thu Apr 5 15:52:20 2018 New Revision: 332078 URL: https://svnweb.freebsd.org/changeset/base/332078 Log: MFC r331245: Drop KTR_CONTENTION. Modified: stable/11/sys/kern/kern_mutex.c stable/11/sys/sys/ktr_class.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/kern_mutex.c ============================================================================== --- stable/11/sys/kern/kern_mutex.c Thu Apr 5 15:45:54 2018 (r332077) +++ stable/11/sys/kern/kern_mutex.c Thu Apr 5 15:52:20 2018 (r332078) @@ -471,9 +471,6 @@ __mtx_lock_sleep(volatile uintptr_t *c, uintptr_t v) struct turnstile *ts; uintptr_t tid; struct thread *owner; -#ifdef KTR - int cont_logged = 0; -#endif #ifdef LOCK_PROFILING int contested = 0; uint64_t waittime = 0; @@ -617,17 +614,6 @@ retry_turnstile: */ mtx_assert(m, MA_NOTOWNED); -#ifdef KTR - if (!cont_logged) { - CTR6(KTR_CONTENTION, - "contention: %p at %s:%d wants %s, taken by %s:%d", - (void *)tid, file, line, m->lock_object.lo_name, - WITNESS_FILE(&m->lock_object), - WITNESS_LINE(&m->lock_object)); - cont_logged = 1; - } -#endif - /* * Block on the turnstile. */ @@ -645,13 +631,6 @@ retry_turnstile: #endif v = MTX_READ_VALUE(m); } -#ifdef KTR - if (cont_logged) { - CTR4(KTR_CONTENTION, - "contention end: %s acquired by %p at %s:%d", - m->lock_object.lo_name, (void *)tid, file, line); - } -#endif #if defined(KDTRACE_HOOKS) || defined(LOCK_PROFILING) if (__predict_true(!doing_lockprof)) return; Modified: stable/11/sys/sys/ktr_class.h ============================================================================== --- stable/11/sys/sys/ktr_class.h Thu Apr 5 15:45:54 2018 (r332077) +++ stable/11/sys/sys/ktr_class.h Thu Apr 5 15:52:20 2018 (r332078) @@ -63,7 +63,7 @@ #define KTR_VM 0x00100000 /* The virtual memory system */ #define KTR_INET 0x00200000 /* IPv4 stack */ #define KTR_RUNQ 0x00400000 /* Run queue */ -#define KTR_CONTENTION 0x00800000 /* Lock contention */ +#define KTR_SPARE5 0x00800000 #define KTR_UMA 0x01000000 /* UMA slab allocator */ #define KTR_CALLOUT 0x02000000 /* Callouts and timeouts */ #define KTR_GEOM 0x04000000 /* GEOM I/O events */