From patchwork Wed Sep 16 15:37:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 11779939 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1A8B4159A for ; Wed, 16 Sep 2020 15:40:08 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A5E882220E for ; Wed, 16 Sep 2020 15:40:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5E882220E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-520-sw-edAifPsSuHtyB0h6ZSQ-1; Wed, 16 Sep 2020 11:40:03 -0400 X-MC-Unique: sw-edAifPsSuHtyB0h6ZSQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59A22192C8C6; Wed, 16 Sep 2020 15:39:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BC5E7880B; Wed, 16 Sep 2020 15:39:57 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0D9F7183D036; Wed, 16 Sep 2020 15:39:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08GFdYwo024279 for ; Wed, 16 Sep 2020 11:39:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 325E3F49D1; Wed, 16 Sep 2020 15:39:34 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E180F5AE5 for ; Wed, 16 Sep 2020 15:39:34 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1509C88FA0F for ; Wed, 16 Sep 2020 15:39:34 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-DWbT5fi8PgiVXqPIiuAKfg-1; Wed, 16 Sep 2020 11:39:29 -0400 X-MC-Unique: DWbT5fi8PgiVXqPIiuAKfg-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 2310BB3C9; Wed, 16 Sep 2020 15:39:42 +0000 (UTC) From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Wed, 16 Sep 2020 17:37:16 +0200 Message-Id: <20200916153718.582-18-mwilck@suse.com> In-Reply-To: <20200916153718.582-1-mwilck@suse.com> References: <20200916153718.582-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 08GFdYwo024279 X-loop: dm-devel@redhat.com Cc: dm-devel@redhat.com, Martin Wilck Subject: [dm-devel] [PATCH 17/19] libmultipath: add udev and logsink symbols X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com From: Martin Wilck With these symbols added, applications using libmultipath don't need to define global variables "udev" and "logsink" any more. This comes at the cost of having to call an init function. Currently, libmultipath_init() does nothing but initialize "udev". The linker's symbol lookup order still allows applications to use their own "logsink" and "udev" variables, which will take precendence over libmultipath's internal ones. In this case, calling libmultipath_init() can be skipped, but like before, udev should be initialized (using udev_new()) before making any libmultipath calls. Signed-off-by: Martin Wilck --- libmultipath/config.c | 22 ++++++++++++++++++++++ libmultipath/config.h | 4 +++- libmultipath/debug.c | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index b83e5cd..4b48b27 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -27,6 +27,28 @@ #include "mpath_cmd.h" #include "propsel.h" +static pthread_once_t _udev_once = PTHREAD_ONCE_INIT; +struct udev *udev; + +void _udev_init(void) +{ + udev = udev_new(); + if (!udev) + condlog(0, "%s: failed to initialize udev", __func__); +} + +int libmultipath_init(void) +{ + if (!udev) + pthread_once(&_udev_once, _udev_init); + return udev ? 0 : 1; +} + +void libmultipath_exit(void) +{ + udev_unref(udev); +} + static struct config __internal_config; struct config *libmp_get_multipath_config(void) { diff --git a/libmultipath/config.h b/libmultipath/config.h index 5997b71..541b2e4 100644 --- a/libmultipath/config.h +++ b/libmultipath/config.h @@ -232,7 +232,9 @@ struct config { char *enable_foreign; }; -extern struct udev * udev; +extern struct udev *udev; +int libmultipath_init(void); +void libmultipath_exit(void); int find_hwe (const struct _vector *hwtable, const char * vendor, const char * product, const char *revision, diff --git a/libmultipath/debug.c b/libmultipath/debug.c index 4128cb9..b3a1de9 100644 --- a/libmultipath/debug.c +++ b/libmultipath/debug.c @@ -15,6 +15,8 @@ #include "defaults.h" #include "debug.h" +int logsink; + void dlog (int sink, int prio, const char * fmt, ...) { va_list ap;