From patchwork Thu Dec 28 21:52:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 853577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HSJAQQn+"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z73P03bdYz9sRW for ; Fri, 29 Dec 2017 08:52:52 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8364ABC0; Thu, 28 Dec 2017 21:52:48 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id AF3BEBBF for ; Thu, 28 Dec 2017 21:52:47 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 547BE431 for ; Thu, 28 Dec 2017 21:52:47 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id s10so21817428plj.5 for ; Thu, 28 Dec 2017 13:52:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=JMChs3xs7A97LmNh0/bJrHdvjOrigOPeFFgb9/XyEc8=; b=HSJAQQn+CLdjx8n4EzMTxBRkltiTIInZAJrB1NVc8+6nC/4XdDmJ34U6+2DC0WLdZd iA3qhrZBZ+0xH2zMCWDS0IO0dtS8Dj7RNXs+PdMJxRZ2QBzKbFwoDiMZKfvX29hPzHaH /v4u3mUNgPh2Y48+LhQK3cN0Vg8N2aqSefJEl2k3q4AGrEg0FhlKp3PDvyKVX58YITF7 3cZceSROt3O10h4Wo3VooLJfsaNmhAkJRCj+w5a2tU8BfcBr0To0PZUJ2w9lTkHAzjO5 H4vME3YIp8kYRQYef9YsDX/Pi2fcOoO4hhzm7QtAg5LYkxEWPj0AkO+f0Ou/hcBSdMw2 Lcng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=JMChs3xs7A97LmNh0/bJrHdvjOrigOPeFFgb9/XyEc8=; b=UnuKFEsb+enCHPinXTsHzRt+eSzq4dtmDZXucq2oqBHXB/yaxmh9KcbAfL8pmV8UrH 270tq/PtxvjFpFDkLL8eJZj5RvXctjudYKTPVmS9t63jrNiSP0Zb7vx0/4FMfo+gf9S2 hbrUipKnAP2FLTaZiLn/07xuhI18vYjsVmE2fnBL+7dsZ/VXNzoiBN0uT07XL917LlOi Pfx80YXGFBAOdVR+e1VLbpoPxZRwAYqgnF4tfQbrrqz6J1s1OigZ2qmqwkrqfinXucuQ 1e24diausKxvX94oQxE+/mC4CvRo/Ayol0BUAI40Oq+6sr+GPY18Ojra6ZM9vNeE9Fvz eetw== X-Gm-Message-State: AKGB3mJ3K3m3cWhTxE/zVL9eVlvjbC7LfVGgIMCEmPv6Smc2EO7PRO2N 92B+pV0y54gZYQuFh4Yx6Zw2Ew== X-Google-Smtp-Source: ACJfBovmq2iEbr18Gm5vPdUcePk/XtM0gXp7XNejwXZueFfWuRV9P4rMuFPafBfpysqkqV9h/5KvFA== X-Received: by 10.84.234.135 with SMTP id n7mr31484104plk.298.1514497966554; Thu, 28 Dec 2017 13:52:46 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id a78sm71363957pfl.155.2017.12.28.13.52.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Dec 2017 13:52:45 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Thu, 28 Dec 2017 13:52:41 -0800 Message-Id: <1514497961-31058-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH V2] lib: Make error messages more useful X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org There are many "opening datapath" error messages and when one occurs it is impossible to know just from the log message which of the "opening datapath" errors occurred. Add a helper function that incorporates the calling function's name to help identify where the datapath open error occurred. Signed-off-by: Greg Rose --- lib/dpctl.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/lib/dpctl.c b/lib/dpctl.c index b769544..a0c639e 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -120,6 +120,14 @@ dpctl_error(struct dpctl_params* dpctl_p, int err_no, const char *fmt, ...) errno = save_errno; } + +static void +dpctl_error_opening_dp(struct dpctl_params *dpctl_p, int err_no, + const char *func_name) +{ + dpctl_error(dpctl_p, err_no, "%s: opening datapath", func_name); +} + static int dpctl_add_if(int argc, const char *argv[], struct dpctl_params *); @@ -214,7 +222,7 @@ dpctl_del_dp(int argc OVS_UNUSED, const char *argv[], error = parsed_dpif_open(argv[1], false, &dpif); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } error = dpif_delete(dpif); @@ -235,7 +243,7 @@ dpctl_add_if(int argc OVS_UNUSED, const char *argv[], error = parsed_dpif_open(argv[1], false, &dpif); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } for (i = 2; i < argc; i++) { @@ -324,7 +332,7 @@ dpctl_set_if(int argc, const char *argv[], struct dpctl_params *dpctl_p) error = parsed_dpif_open(argv[1], false, &dpif); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } for (i = 2; i < argc; i++) { @@ -459,7 +467,7 @@ dpctl_del_if(int argc, const char *argv[], struct dpctl_params *dpctl_p) error = parsed_dpif_open(argv[1], false, &dpif); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } for (i = 2; i < argc; i++) { @@ -838,7 +846,7 @@ dpctl_dump_flows(int argc, const char *argv[], struct dpctl_params *dpctl_p) error = parsed_dpif_open(name, false, &dpif); free(name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); goto out_free; } @@ -974,7 +982,7 @@ dpctl_put_flow(int argc, const char *argv[], enum dpif_flow_put_flags flags, error = parsed_dpif_open(dp_name, false, &dpif); free(dp_name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } @@ -1086,7 +1094,7 @@ dpctl_get_flow(int argc, const char *argv[], struct dpctl_params *dpctl_p) error = parsed_dpif_open(dp_name, false, &dpif); free(dp_name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } @@ -1145,7 +1153,7 @@ dpctl_del_flow(int argc, const char *argv[], struct dpctl_params *dpctl_p) error = parsed_dpif_open(dp_name, false, &dpif); free(dp_name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } @@ -1225,7 +1233,7 @@ dpctl_del_flows(int argc, const char *argv[], struct dpctl_params *dpctl_p) error = parsed_dpif_open(name, false, &dpif); free(name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } @@ -1294,7 +1302,7 @@ dpctl_dump_conntrack(int argc, const char *argv[], error = parsed_dpif_open(name, false, &dpif); free(name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } @@ -1360,7 +1368,7 @@ dpctl_flush_conntrack(int argc, const char *argv[], error = parsed_dpif_open(name, false, &dpif); free(name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } } @@ -1444,7 +1452,7 @@ dpctl_ct_stats_show(int argc, const char *argv[], error = parsed_dpif_open(name, false, &dpif); free(name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; } @@ -1581,7 +1589,7 @@ dpctl_ct_bkts(int argc, const char *argv[], error = parsed_dpif_open(name, false, &dpif); free(name); if (error) { - dpctl_error(dpctl_p, error, "opening datapath"); + dpctl_error_opening_dp(dpctl_p, error, __func__); return error; }