From patchwork Fri Feb 15 20:25:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1043170 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A+fuTXZb"; 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 441PtY2z3nz9sML for ; Sat, 16 Feb 2019 07:26:45 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 019F9C4A; Fri, 15 Feb 2019 20:26:16 +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 C6995B94 for ; Fri, 15 Feb 2019 20:26:13 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 419B07E9 for ; Fri, 15 Feb 2019 20:26:13 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id bj4so5477756plb.7 for ; Fri, 15 Feb 2019 12:26:13 -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:in-reply-to:references; bh=q70vPe1Kc1WUNHmAva3I7QxwSuPHolLvhGNAWk14Q1M=; b=A+fuTXZbuPkubik4qum/B07Y6Ty/z10Q7I90DlWxgFuF6shHTitOjzKUN5JOb+t8nT Bdp+uBPRHK1mAAN5LoJCJJzA0qN6qcuhTWq1ds1IQYgSbM6HiqsE++4B0f8KfWKGuQxz 1bGZixsCClje/PGajlaYPRPUKAFfKQKDVftVwUJIiuxcYrB1pDvqlzLGFELPId1lFY41 NQJSwXr+IZrMY+QN9akgBDuB3BNcHeOpIhVQCM5GVlgaWyLAMLBU+U9mENeBIi77Oqb1 laKLTNcHHzOc9LXd7lgV0p+1MeFjhnasEcmJpKOrGpvi82boaEAdno0+bj75FUYWog27 wtGg== 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:in-reply-to :references; bh=q70vPe1Kc1WUNHmAva3I7QxwSuPHolLvhGNAWk14Q1M=; b=XMM5i35qHMHbni+eIy9LAXN6or86Rw5f6DYNLQqNvA8uL3Z7rrazMeJ1LzwraVp+5f QyZhQGGHDa1IFNrg1eKuCl6kgwf2UV5SlA67BLIzjX3OA0jFwTfeblRV4Y32GJfppAp9 ZEyNqGXzZYhYNSw9NGwI3SI3oDDSezDF/CufvmoDpcxCk6PAEEniZp3QP4t5OIUvFWzj jYcWDHyFckhMJA85ajZqvfuezlvFWZH3I3v0zVCcYgtWfdYEeTrhP0e23Gaex1xO/lbx XWY7qYLrDrMErWeWkQ4CPuqNZX5BSDPoadcInH84QEMifeQnU5RlB0GIIuBIqnbsPKNV KAxQ== X-Gm-Message-State: AHQUAua80MG1ibDd37CtAT3NBMsN1NeZmJd/R+yBiw65VNynYE1Rnq4m NWxIdphqt8fvFqlMVkqj2dBFGcA9 X-Google-Smtp-Source: AHgI3IYqY3WdYVesd/+pfUQg2SCEMjjFuzipjqHEMOAMjLAUObgnwZmZ2N7SShIUIoXKBII8smGidQ== X-Received: by 2002:a17:902:8690:: with SMTP id g16mr12314640plo.81.1550262372513; Fri, 15 Feb 2019 12:26:12 -0800 (PST) Received: from localhost.localdomain.localdomain ([216.113.160.77]) by smtp.gmail.com with ESMTPSA id b12sm10359164pfb.30.2019.02.15.12.26.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 12:26:11 -0800 (PST) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Fri, 15 Feb 2019 12:25:58 -0800 Message-Id: <1550262363-86117-3-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1550262363-86117-1-git-send-email-hzhou8@ebay.com> References: <1550262363-86117-1-git-send-email-hzhou8@ebay.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham 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 2/7] ovsdb_monitor: Fix style of prototypes. 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 From: Han Zhou Ommiting the parameter names in prototypes, as suggested by coding style: Omit parameter names from function prototypes when the names do not give useful information. Adjust orders of parameters as suggested by coding style. Signed-off-by: Han Zhou --- ovsdb/jsonrpc-server.c | 4 +-- ovsdb/monitor.c | 14 +++++------ ovsdb/monitor.h | 66 +++++++++++++++++++++++++------------------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 7c7a277..77f15d9 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -1578,7 +1578,7 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s, struct json *update_json; update_json = ovsdb_monitor_get_update(m->dbmon, false, true, - &m->unflushed, m->condition, m->version); + m->condition, m->version, &m->unflushed); if (update_json) { struct jsonrpc_msg *msg; struct json *p; @@ -1653,7 +1653,7 @@ ovsdb_jsonrpc_monitor_compose_update(struct ovsdb_jsonrpc_monitor *m, } return ovsdb_monitor_get_update(m->dbmon, initial, false, - &m->unflushed, m->condition, m->version); + m->condition, m->version, &m->unflushed); } static bool diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c index 29cf93e..1175e28 100644 --- a/ovsdb/monitor.c +++ b/ovsdb/monitor.c @@ -165,14 +165,14 @@ typedef struct json * bool initial, unsigned long int *changed, size_t n_columns); -static void ovsdb_monitor_destroy(struct ovsdb_monitor *dbmon); +static void ovsdb_monitor_destroy(struct ovsdb_monitor *); static struct ovsdb_monitor_changes * ovsdb_monitor_table_add_changes( - struct ovsdb_monitor_table *mt, uint64_t next_txn); + struct ovsdb_monitor_table *, uint64_t next_txn); static struct ovsdb_monitor_changes *ovsdb_monitor_table_find_changes( - struct ovsdb_monitor_table *mt, uint64_t unflushed); + struct ovsdb_monitor_table *, uint64_t unflushed); static void ovsdb_monitor_changes_destroy( - struct ovsdb_monitor_changes *changes); -static void ovsdb_monitor_table_track_changes(struct ovsdb_monitor_table *mt, + struct ovsdb_monitor_changes *); +static void ovsdb_monitor_table_track_changes(struct ovsdb_monitor_table *, uint64_t unflushed); static uint32_t @@ -1121,9 +1121,9 @@ struct json * ovsdb_monitor_get_update( struct ovsdb_monitor *dbmon, bool initial, bool cond_updated, - uint64_t *unflushed_, struct ovsdb_monitor_session_condition *condition, - enum ovsdb_monitor_version version) + enum ovsdb_monitor_version version, + uint64_t *unflushed_) { struct ovsdb_monitor_json_cache_node *cache_node = NULL; struct shash_node *node; diff --git a/ovsdb/monitor.h b/ovsdb/monitor.h index eb3ff27..9bc0613 100644 --- a/ovsdb/monitor.h +++ b/ovsdb/monitor.h @@ -44,73 +44,73 @@ enum ovsdb_monitor_version { OVSDB_MONITOR_VERSION_MAX }; -struct ovsdb_monitor *ovsdb_monitor_create(struct ovsdb *db, - struct ovsdb_jsonrpc_monitor *jsonrpc_monitor); +struct ovsdb_monitor *ovsdb_monitor_create(struct ovsdb *, + struct ovsdb_jsonrpc_monitor *); void ovsdb_monitors_remove(struct ovsdb *); void ovsdb_monitors_commit(struct ovsdb *, const struct ovsdb_txn *); void ovsdb_monitor_prereplace_db(struct ovsdb *); -struct ovsdb_monitor *ovsdb_monitor_add(struct ovsdb_monitor *dbmon); +struct ovsdb_monitor *ovsdb_monitor_add(struct ovsdb_monitor *); -void ovsdb_monitor_add_jsonrpc_monitor(struct ovsdb_monitor *dbmon, - struct ovsdb_jsonrpc_monitor *jsonrpc_monitor); +void ovsdb_monitor_add_jsonrpc_monitor(struct ovsdb_monitor *, + struct ovsdb_jsonrpc_monitor *); -void ovsdb_monitor_remove_jsonrpc_monitor(struct ovsdb_monitor *dbmon, - struct ovsdb_jsonrpc_monitor *jsonrpc_monitor, +void ovsdb_monitor_remove_jsonrpc_monitor(struct ovsdb_monitor *, + struct ovsdb_jsonrpc_monitor *, uint64_t unflushed); -void ovsdb_monitor_add_table(struct ovsdb_monitor *m, - const struct ovsdb_table *table); +void ovsdb_monitor_add_table(struct ovsdb_monitor *, + const struct ovsdb_table *); -const char * ovsdb_monitor_add_column(struct ovsdb_monitor *dbmon, - const struct ovsdb_table *table, - const struct ovsdb_column *column, - enum ovsdb_monitor_selection select, +const char * ovsdb_monitor_add_column(struct ovsdb_monitor *, + const struct ovsdb_table *, + const struct ovsdb_column *, + enum ovsdb_monitor_selection, bool monitored); bool -ovsdb_monitor_table_exists(struct ovsdb_monitor *m, - const struct ovsdb_table *table); +ovsdb_monitor_table_exists(struct ovsdb_monitor *, + const struct ovsdb_table *); -struct json *ovsdb_monitor_get_update(struct ovsdb_monitor *dbmon, +struct json *ovsdb_monitor_get_update(struct ovsdb_monitor *, bool initial, bool cond_updated, - uint64_t *unflushed_transaction, - struct ovsdb_monitor_session_condition *condition, - enum ovsdb_monitor_version version); + struct ovsdb_monitor_session_condition *, + enum ovsdb_monitor_version, + uint64_t *unflushed_transaction); -void ovsdb_monitor_table_add_select(struct ovsdb_monitor *dbmon, - const struct ovsdb_table *table, - enum ovsdb_monitor_selection select); +void ovsdb_monitor_table_add_select(struct ovsdb_monitor *, + const struct ovsdb_table *, + enum ovsdb_monitor_selection); -bool ovsdb_monitor_needs_flush(struct ovsdb_monitor *dbmon, +bool ovsdb_monitor_needs_flush(struct ovsdb_monitor *, uint64_t next_transaction); -void ovsdb_monitor_get_initial(const struct ovsdb_monitor *dbmon); +void ovsdb_monitor_get_initial(const struct ovsdb_monitor *); -void ovsdb_monitor_get_memory_usage(struct simap *usage); +void ovsdb_monitor_get_memory_usage(struct simap *); struct ovsdb_monitor_session_condition * ovsdb_monitor_session_condition_create(void); void ovsdb_monitor_session_condition_destroy( - struct ovsdb_monitor_session_condition *condition); + struct ovsdb_monitor_session_condition *); struct ovsdb_error * ovsdb_monitor_table_condition_create( - struct ovsdb_monitor_session_condition *condition, - const struct ovsdb_table *table, + struct ovsdb_monitor_session_condition *, + const struct ovsdb_table *, const struct json *json_cnd); void -ovsdb_monitor_condition_bind(struct ovsdb_monitor *dbmon, - struct ovsdb_monitor_session_condition *cond); +ovsdb_monitor_condition_bind(struct ovsdb_monitor *, + struct ovsdb_monitor_session_condition *); struct ovsdb_error * ovsdb_monitor_table_condition_update( - struct ovsdb_monitor *dbmon, - struct ovsdb_monitor_session_condition *condition, - const struct ovsdb_table *table, + struct ovsdb_monitor *, + struct ovsdb_monitor_session_condition *, + const struct ovsdb_table *, const struct json *cond_json); #endif