From owner-svn-src-head@freebsd.org Wed Aug 21 04:54:49 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13CD3BA511; Wed, 21 Aug 2019 04:54:49 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46CwLw6l6yz4Tw0; Wed, 21 Aug 2019 04:54:48 +0000 (UTC) (envelope-from mjg@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 C92CEE852; Wed, 21 Aug 2019 04:54:48 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7L4smKs085104; Wed, 21 Aug 2019 04:54:48 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7L4smIa085103; Wed, 21 Aug 2019 04:54:48 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201908210454.x7L4smIa085103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 21 Aug 2019 04:54:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r351323 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 351323 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Aug 2019 04:54:49 -0000 Author: mjg Date: Wed Aug 21 04:54:48 2019 New Revision: 351323 URL: https://svnweb.freebsd.org/changeset/base/351323 Log: seqc: predict false for _in_modify and type fixes for _consistent_* seqc_consistent_* return bool, not seqc. [0] While here annotate the rarely true condition - it is expected to run into it on vare occasion (compared to the other case). Reported by: oshogbo [0] Sponsored by: The FreeBSD Foundation Modified: head/sys/sys/seqc.h Modified: head/sys/sys/seqc.h ============================================================================== --- head/sys/sys/seqc.h Wed Aug 21 02:26:22 2019 (r351322) +++ head/sys/sys/seqc.h Wed Aug 21 04:54:48 2019 (r351323) @@ -78,7 +78,7 @@ seqc_read(const seqc_t *seqcp) for (;;) { ret = atomic_load_acq_int(__DECONST(seqc_t *, seqcp)); - if (seqc_in_modify(ret)) { + if (__predict_false(seqc_in_modify(ret))) { cpu_spinwait(); continue; } @@ -88,14 +88,14 @@ seqc_read(const seqc_t *seqcp) return (ret); } -static __inline seqc_t +static __inline bool seqc_consistent_nomb(const seqc_t *seqcp, seqc_t oldseqc) { return (*seqcp == oldseqc); } -static __inline seqc_t +static __inline bool seqc_consistent(const seqc_t *seqcp, seqc_t oldseqc) {