From owner-svn-src-all@freebsd.org Mon Jun 4 17:49:35 2018 Return-Path: Delivered-To: svn-src-all@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 705B4FD4430; Mon, 4 Jun 2018 17:49:35 +0000 (UTC) (envelope-from mmacy@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 2255574E6D; Mon, 4 Jun 2018 17:49:35 +0000 (UTC) (envelope-from mmacy@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 F310A10A7D; Mon, 4 Jun 2018 17:49:34 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w54HnYLj050515; Mon, 4 Jun 2018 17:49:34 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w54HnYcO050514; Mon, 4 Jun 2018 17:49:34 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201806041749.w54HnYcO050514@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Mon, 4 Jun 2018 17:49:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334623 - head/sys/dev/hwpmc X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/sys/dev/hwpmc X-SVN-Commit-Revision: 334623 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 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: Mon, 04 Jun 2018 17:49:35 -0000 Author: mmacy Date: Mon Jun 4 17:49:34 2018 New Revision: 334623 URL: https://svnweb.freebsd.org/changeset/base/334623 Log: hwpmc: remove gratuitous curthread checks Modified: head/sys/dev/hwpmc/hwpmc_mod.c Modified: head/sys/dev/hwpmc/hwpmc_mod.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mod.c Mon Jun 4 16:46:36 2018 (r334622) +++ head/sys/dev/hwpmc/hwpmc_mod.c Mon Jun 4 17:49:34 2018 (r334623) @@ -4647,16 +4647,12 @@ pmc_add_sample(int cpu, int ring, struct pmc *pm, stru counter_u64_add(pm->pm_runcount, 1); /* hold onto PMC */ + td = curthread; ps->ps_pmc = pm; - ps->ps_pid = -1; - ps->ps_tid = -1; - if ((td = curthread) != NULL) { - ps->ps_tid = td->td_tid; - if (td->td_proc) - ps->ps_pid = td->td_proc->p_pid; - } - ps->ps_cpu = cpu; ps->ps_td = td; + ps->ps_pid = td->td_proc->p_pid; + ps->ps_tid = td->td_tid; + ps->ps_cpu = cpu; ps->ps_flags = inuserspace ? PMC_CC_F_USERSPACE : 0; callchaindepth = (pm->pm_flags & PMC_F_CALLCHAIN) ? @@ -4715,9 +4711,8 @@ pmc_process_interrupt(int cpu, int ring, struct pmc *p td = curthread; if ((pm->pm_flags & PMC_F_USERCALLCHAIN) && - td && td->td_proc && - (td->td_proc->p_flag & P_KPROC) == 0 && - !inuserspace) { + (td->td_proc->p_flag & P_KPROC) == 0 && + !inuserspace) { atomic_add_int(&curthread->td_pmcpend, 1); return (pmc_add_sample(cpu, PMC_UR, pm, tf, 0)); }