From owner-svn-src-all@freebsd.org Thu Dec 6 23:25:06 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 32D2B1318AFE for ; Thu, 6 Dec 2018 23:25:06 +0000 (UTC) (envelope-from andy@fud.org.nz) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (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 0E3796A28E for ; Thu, 6 Dec 2018 23:25:03 +0000 (UTC) (envelope-from andy@fud.org.nz) Received: by mail-wr1-x42b.google.com with SMTP id v13so2126251wrw.5 for ; Thu, 06 Dec 2018 15:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fud-org-nz.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=m7ASANAgByuN+V6Ljpj5h8Z5130d3pByiVdU2hLlMes=; b=0PhMQth0DHvKxZ/+GADH+zPHmC86RYgYVYaDVscD71xxDfzmkELksPqGOm6kSZT9in OMb49NOmdy8n1NsE6HtKnxigv5OHqN6OD+gA/75vZ/jIXP3ucX6N1raYo5Lph8e32sWN y0uT7ogw34DoVlvVWGiHfD347TbWqdzl6uUlCdyeTlsdmMKJtgXj8qOoyLlNhN5bEqpV butmu5OPOGGUcDyaXmbZU0rR1sBHf7Y0gAyaXwGg65j5f06B3BMPXcfJfpP8LtYZgItw QKnpz8E6auQ0utezJn2L/HVHLeHOsjMTf8R7/72yfaIxdKxN5HYhe+EG9/6Jq/S+5WvF lPbg== 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=m7ASANAgByuN+V6Ljpj5h8Z5130d3pByiVdU2hLlMes=; b=Yux5T9XgFbI7aHGM70aZWRMigRb7srBpAgZCkDwbHMDl0D0vE84F8o3ImyfLgqaOLU rUOtABiHE/W/obDCDYp30sB6+OU7QfHEcoTfPXSbsT08O5OsyW156kb8K8DoXb3b/dHa jkswmXv/7R4E6ewLk7sy8ADDOC8aHoeQhe3eRLco3qJgUBmW0OgwYteEgBpEUtvS+hJh gRlRQ//gYR12QtA/ngunRU7yru6iWvD/Q6Q+NjO4fDUVQ0CSnLbkhmrKTGlzMOc0DBJ+ eFBJEYjyEtXapNa4VX80WYeXw9WEKRvauNUNew0/8trxm5vZkg1t1lPnkF5R8vieV/lk ocTg== X-Gm-Message-State: AA+aEWb13k7BwewM7WSHebglEdIvNJbOuvuJcnyN2SGyjAS+80iwisJv ktBMlUBs6RtqPaDkGq+KrTXNXbmVevIj/o3McZ+iRg== X-Google-Smtp-Source: AFSGD/WMe2DU7sPLqfl+SZh1+3mmguxAMCf83f7+3nLgg8LK3+Qpe/MynYdfxUyrbKj6RguKBkdvlobGuBZ8rkFOgZo= X-Received: by 2002:a5d:4dc8:: with SMTP id f8mr27691149wru.45.1544138702173; Thu, 06 Dec 2018 15:25:02 -0800 (PST) MIME-Version: 1.0 References: <201812062258.wB6MwQKb026274@repo.freebsd.org> In-Reply-To: <201812062258.wB6MwQKb026274@repo.freebsd.org> From: Andrew Thompson Date: Fri, 7 Dec 2018 12:24:50 +1300 Message-ID: Subject: Re: svn commit: r341657 - in head: etc/mtree sbin/nvmecontrol share/man/man7 To: Warner Losh Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-Rspamd-Queue-Id: 0E3796A28E X-Spamd-Result: default: False [-3.73 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.989,0]; R_DKIM_ALLOW(-0.20)[fud-org-nz.20150623.gappssmtp.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[fud.org.nz]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[fud-org-nz.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[aspmx.l.google.com]; RCVD_IN_DNSWL_NONE(0.00)[b.2.4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.5.4.1.0.0.a.2.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.85)[-0.848,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.59)[ipnet: 2a00:1450::/32(-1.53), asn: 15169(-1.31), country: US(-0.09)]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; 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-all@freebsd.org X-Mailman-Version: 2.1.29 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: Thu, 06 Dec 2018 23:25:06 -0000 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. Andrew