From owner-svn-src-head@freebsd.org Thu Dec 6 23:42:55 2018 Return-Path: Delivered-To: svn-src-head@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 A5092131AD36 for ; Thu, 6 Dec 2018 23:42:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A88726B9B9 for ; Thu, 6 Dec 2018 23:42:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82b.google.com with SMTP id p17so2614536qtl.5 for ; Thu, 06 Dec 2018 15:42:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=IrJfoO6/dfrW9Jx7tiUPji/bOhYMKQ20dQkwIzZEPb4=; b=v2foaw+a67RjxjezchnOgVbDYW2F65wdzTJIXb1wtlTBvVyPUn+XfjjI37CtrH15Nz HWF69KiWRN20DHZ6nBRl2T3EbIgKP2qOIUxD2uodNcnnz5Yh8Bf/MYmuq5l6JpjjeTKi jtShSnasORHXwf0dTV1cqpAW9Q9ORhV2OsLsvr+J6rLga4n4h4Jl/1NKtbl8gPjq7XW5 hVaJiV/g3OUXt3Z5r8ingYjGyaB59QthH+JautdHwuITWtm4aDD3RyxLmEJFidwWc3wi XrSSEJO3Advd8KIuMW7ifKM1AIeTWCvhxQnf0w+sBZe0WIsHVVZP86esqPrEL71mvwSH IJng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=IrJfoO6/dfrW9Jx7tiUPji/bOhYMKQ20dQkwIzZEPb4=; b=X6yobjQ+6uhEypAKM8KHVmVmQU9CiB1Ee9WmPqlYlUanBh8+ZsZDoo0CIS5bzDPBWa 7h4+8+F7wayk643gN1ICMOHmoC4cCwTs4CCjP6Ykm9uBLQkSc3yB5OEAOZxy7eEVZ+oi 30ifoalCWwlYdHoX9rx0DAzdovVwofGgTF38V9aMfTHP3PKr0pkqsuUydpGcuY8SU1t/ ETX+9cu8UDUz/eJ0lo62iRFLz7AQoFuUwZQaEudhkV8UR1TNBHAF3bkMPMV/z2lQybzf +yA+w4M5hSzAyXSBySe/fLI49xUTM9Agzj/3kFSUilGKkTdRc+6+ImYQIpg+gWDUPbPK PG7A== X-Gm-Message-State: AA+aEWZJ36PCNdPDCYgfLbEhkBUxLUAf0tYPZFspChYdlckm3eBPPeCF tWpnHQczlsDEOgQX+8zUBwBqG1IF4CxidebHUoqQRyoT X-Google-Smtp-Source: AFSGD/WypNcN095WrWYMKrBOZl+ovk/XfPr+ureEUH/mBMRa6WgkNjMeCvj3u2SJ/w/lbqBAwqWBvVV4ef+w72GxVY8= X-Received: by 2002:a05:6214:1087:: with SMTP id o7mr29708071qvr.115.1544139774173; Thu, 06 Dec 2018 15:42:54 -0800 (PST) MIME-Version: 1.0 References: <201812062258.wB6MwQKb026274@repo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 6 Dec 2018 16:42:43 -0700 Message-ID: Subject: Re: svn commit: r341657 - in head: etc/mtree sbin/nvmecontrol share/man/man7 To: Andrew Thompson Cc: Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: A88726B9B9 X-Spamd-Result: default: False [-4.54 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-head@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[cached: ALT1.aspmx.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[b.2.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-1.57)[ip: (-4.92), ipnet: 2607:f8b0::/32(-1.54), asn: 15169(-1.31), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Thu, 06 Dec 2018 23:42:55 -0000 On Thu, Dec 6, 2018 at 4:25 PM Andrew Thompson wrote: > On Fri, 7 Dec 2018 at 11:58, Warner Losh wrote: > >> Author: imp >> Date: Thu Dec 6 22:58:26 2018 >> New Revision: 341657 >> URL: https://svnweb.freebsd.org/changeset/base/341657 >> >> Log: >> Dynamically load .so modules to expand functionality >> >> o Dynamically load all the .so files found in /libexec/nvmecontrol and >> /usr/local/libexec/nvmecontrol. >> o Link nvmecontrol -rdynamic so that its symbols are visible to the >> libraries we load. >> o Create concatinated linker sets that we dynamically expand. >> o Add the linked-in top and logpage linker sets to the mirrors for them >> and add those sets to the mirrors when we load a new .so. >> o Add some macros to help hide the names of the linker sets. >> o Update the man page. >> > ... > >> >> Modified: head/sbin/nvmecontrol/nvmecontrol.c >> >> ============================================================================== >> --- head/sbin/nvmecontrol/nvmecontrol.c Thu Dec 6 22:35:07 2018 >> (r341656) >> +++ head/sbin/nvmecontrol/nvmecontrol.c Thu Dec 6 22:58:26 2018 >> (r341657) >> @@ -34,6 +34,8 @@ __FBSDID("$FreeBSD$"); >> #include >> ... >> int >> main(int argc, char *argv[]) >> { >> >> + add_to_top(NVME_CMD_BEGIN(top), NVME_CMD_LIMIT(top)); >> + add_to_logpage(NVME_LOGPAGE_BEGIN, NVME_LOGPAGE_LIMIT); >> + >> + load_dir("/lib/nvmecontrol"); >> + load_dir("/usr/local/lib/nvmecontrol"); >> >> > You have /libexec/nvmecontrol in some places and /lib/nvmecontrol in > others. It seems it actually loads from the latter. > It does. I had libexec for most of my development, but in the review it was pointed out that this should be lib, so I changed it most, but not all, places. Thanks for catching the mismatch. I've corrected it. Warner