From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 038C4C433EF for ; Thu, 16 Sep 2021 00:02:28 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7CCC861178 for ; Thu, 16 Sep 2021 00:02:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7CCC861178 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631750546; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uJNfye+N2/M4fWGd8ySY+wYjhLACFylwZKqzdy7aOos=; b=iWAwBLt++QIiS8Rdyy4xl9m3wqPr5nmPDwsxihLyAGsFI8cWJCkV7h9rvpWkxsSD3UiSav nmq73U6z1Adp98pjU07JkcWVrledGvd0Ec7acYH/DhuvTYuTnBc4EDDOs2YdMn4mveIUx0 ImauAffYz/nDR+BoeveWIeNyaY+By4s= 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-256-GxT6jyfSONa3yYy1fcoqCA-1; Wed, 15 Sep 2021 20:02:23 -0400 X-MC-Unique: GxT6jyfSONa3yYy1fcoqCA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5FE221006AA9; Thu, 16 Sep 2021 00:02:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C56B5C1C5; Thu, 16 Sep 2021 00:02:18 +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 92AC04E590; Thu, 16 Sep 2021 00:02:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18G01Xpd015572 for ; Wed, 15 Sep 2021 20:01:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7002B60C9F; Thu, 16 Sep 2021 00:01:33 +0000 (UTC) Received: from octiron.msp.redhat.com (unknown [10.15.80.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F006E60CA0; Thu, 16 Sep 2021 00:01:30 +0000 (UTC) Received: from octiron.msp.redhat.com (localhost.localdomain [127.0.0.1]) by octiron.msp.redhat.com (8.14.9/8.14.9) with ESMTP id 18G01Tdt006879; Wed, 15 Sep 2021 19:01:29 -0500 Received: (from bmarzins@localhost) by octiron.msp.redhat.com (8.14.9/8.14.9/Submit) id 18G01SLZ006878; Wed, 15 Sep 2021 19:01:28 -0500 Date: Wed, 15 Sep 2021 19:01:28 -0500 From: Benjamin Marzinski To: mwilck@suse.com Message-ID: <20210916000128.GX3087@octiron.msp.redhat.com> References: <20210910114120.13665-1-mwilck@suse.com> <20210910114120.13665-13-mwilck@suse.com> MIME-Version: 1.0 In-Reply-To: <20210910114120.13665-13-mwilck@suse.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: dm-devel@redhat.com Cc: lixiaokeng@huawei.com, dm-devel@redhat.com, Chongyun Wu Subject: Re: [dm-devel] [PATCH 12/35] multipathd: add and set cli_handlers in a single step 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.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Fri, Sep 10, 2021 at 01:40:57PM +0200, mwilck@suse.com wrote: > From: Martin Wilck > > Modify set_handler_callback() such that a missing slot is created > if no matching slot is found. This way, we can skip the initialization > with NULL handlers on startup. > > Signed-off-by: Martin Wilck > --- > multipathd/cli.c | 85 +++++++----------------------------------------- > multipathd/cli.h | 6 ++-- > 2 files changed, 15 insertions(+), 76 deletions(-) > > diff --git a/multipathd/cli.c b/multipathd/cli.c > index 5213813..7020d2b 100644 > --- a/multipathd/cli.c > +++ b/multipathd/cli.c > @@ -100,26 +100,20 @@ find_handler (uint64_t fp) > } > > int > -set_handler_callback (uint64_t fp, cli_handler *fn) > +__set_handler_callback (uint64_t fp, cli_handler *fn, bool locked) > { > - struct handler * h = find_handler(fp); > + struct handler *h = find_handler(fp); > Wouldn't it be a bug if we reset the handler? Is this really something we need to check for? Also, if add_handler() just returned a pointer to the handler, we wouldn't need to call fail_handler() immediately after creating it. -Ben > - if (!h) > + if (!h) { > + add_handler(fp, fn); > + h = find_handler(fp); > + } > + if (!h) { > + condlog(0, "%s: failed to set handler for code %"PRIu64, > + __func__, fp); > return 1; > - h->fn = fn; > - h->locked = 1; > - return 0; > -} > - > -int > -set_unlocked_handler_callback (uint64_t fp, cli_handler *fn) > -{ > - struct handler * h = find_handler(fp); > - > - if (!h) > - return 1; > - h->fn = fn; > - h->locked = 0; > + } > + h->locked = locked; > return 0; > } > > @@ -513,63 +507,6 @@ cli_init (void) { > if (alloc_handlers()) > return 1; > > - add_handler(LIST+PATHS, NULL); > - add_handler(LIST+PATHS+FMT, NULL); > - add_handler(LIST+PATHS+RAW+FMT, NULL); > - add_handler(LIST+PATH, NULL); > - add_handler(LIST+STATUS, NULL); > - add_handler(LIST+DAEMON, NULL); > - add_handler(LIST+MAPS, NULL); > - add_handler(LIST+MAPS+STATUS, NULL); > - add_handler(LIST+MAPS+STATS, NULL); > - add_handler(LIST+MAPS+FMT, NULL); > - add_handler(LIST+MAPS+RAW+FMT, NULL); > - add_handler(LIST+MAPS+TOPOLOGY, NULL); > - add_handler(LIST+MAPS+JSON, NULL); > - add_handler(LIST+TOPOLOGY, NULL); > - add_handler(LIST+MAP+TOPOLOGY, NULL); > - add_handler(LIST+MAP+JSON, NULL); > - add_handler(LIST+MAP+FMT, NULL); > - add_handler(LIST+MAP+RAW+FMT, NULL); > - add_handler(LIST+CONFIG, NULL); > - add_handler(LIST+CONFIG+LOCAL, NULL); > - add_handler(LIST+BLACKLIST, NULL); > - add_handler(LIST+DEVICES, NULL); > - add_handler(LIST+WILDCARDS, NULL); > - add_handler(RESET+MAPS+STATS, NULL); > - add_handler(RESET+MAP+STATS, NULL); > - add_handler(ADD+PATH, NULL); > - add_handler(DEL+PATH, NULL); > - add_handler(ADD+MAP, NULL); > - add_handler(DEL+MAP, NULL); > - add_handler(DEL+MAPS, NULL); > - add_handler(SWITCH+MAP+GROUP, NULL); > - add_handler(RECONFIGURE, NULL); > - add_handler(SUSPEND+MAP, NULL); > - add_handler(RESUME+MAP, NULL); > - add_handler(RESIZE+MAP, NULL); > - add_handler(RESET+MAP, NULL); > - add_handler(RELOAD+MAP, NULL); > - add_handler(DISABLEQ+MAP, NULL); > - add_handler(RESTOREQ+MAP, NULL); > - add_handler(DISABLEQ+MAPS, NULL); > - add_handler(RESTOREQ+MAPS, NULL); > - add_handler(REINSTATE+PATH, NULL); > - add_handler(FAIL+PATH, NULL); > - add_handler(QUIT, NULL); > - add_handler(SHUTDOWN, NULL); > - add_handler(GETPRSTATUS+MAP, NULL); > - add_handler(SETPRSTATUS+MAP, NULL); > - add_handler(UNSETPRSTATUS+MAP, NULL); > - add_handler(GETPRKEY+MAP, NULL); > - add_handler(SETPRKEY+MAP+KEY, NULL); > - add_handler(UNSETPRKEY+MAP, NULL); > - add_handler(FORCEQ+DAEMON, NULL); > - add_handler(RESTOREQ+DAEMON, NULL); > - add_handler(SETMARGINAL+PATH, NULL); > - add_handler(UNSETMARGINAL+PATH, NULL); > - add_handler(UNSETMARGINAL+MAP, NULL); > - > return 0; > } > > diff --git a/multipathd/cli.h b/multipathd/cli.h > index 3dac1b4..dbb75be 100644 > --- a/multipathd/cli.h > +++ b/multipathd/cli.h > @@ -134,8 +134,10 @@ struct handler { > > int alloc_handlers (void); > int add_handler (uint64_t fp, cli_handler *fn); > -int set_handler_callback (uint64_t fp, cli_handler *fn); > -int set_unlocked_handler_callback (uint64_t fp, cli_handler *fn); > +int __set_handler_callback (uint64_t fp, cli_handler *fn, bool locked); > +#define set_handler_callback(fp, fn) __set_handler_callback(fp, fn, true) > +#define set_unlocked_handler_callback(fp, fn) __set_handler_callback(fp, fn, false) > + > int parse_cmd (char * cmd, char ** reply, int * len, void *, int); > int load_keys (void); > char * get_keyparam (vector v, uint64_t code); > -- > 2.33.0 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel