{"id":807701,"url":"http://patchwork.ozlabs.org/api/patches/807701/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170830163314.1411-2-blp@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830163314.1411-2-blp@ovn.org>","list_archive_url":null,"date":"2017-08-30T16:33:14","name":"[ovs-dev,2/2] monitor: Simplify calculation of cond->conditional.","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b7eddfe51c1d94f45201d2d2bc0ad5b14b6eab81","submitter":{"id":67603,"url":"http://patchwork.ozlabs.org/api/people/67603/?format=json","name":"Ben Pfaff","email":"blp@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170830163314.1411-2-blp@ovn.org/mbox/","series":[{"id":647,"url":"http://patchwork.ozlabs.org/api/series/647/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=647","date":"2017-08-30T16:33:13","name":"[ovs-dev,1/2] monitor: Fix bad caching of conditional monitor_cond requests.","version":1,"mbox":"http://patchwork.ozlabs.org/series/647/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807701/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807701/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjB0N66hZz9sNn\n\tfor ;\n\tThu, 31 Aug 2017 02:33:56 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 07748BE6;\n\tWed, 30 Aug 2017 16:33:28 +0000 (UTC)","from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id 347AABE1\n\tfor ; Wed, 30 Aug 2017 16:33:26 +0000 (UTC)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTPS id D347187\n\tfor ; Wed, 30 Aug 2017 16:33:25 +0000 (UTC)","from sigabrt.gateway.sonic.net\n\t(173-228-112-34.dsl.dynamic.fusionbroadband.com [173.228.112.34])\n\t(Authenticated sender: blp@ovn.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 0858D41C089;\n\tWed, 30 Aug 2017 18:33:22 +0200 (CEST)"],"X-Greylist":"domain auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"173.228.112.34","From":"Ben Pfaff ","To":"dev@openvswitch.org","Date":"Wed, 30 Aug 2017 09:33:14 -0700","Message-Id":"<20170830163314.1411-2-blp@ovn.org>","X-Mailer":"git-send-email 2.10.2","In-Reply-To":"<20170830163314.1411-1-blp@ovn.org>","References":"<20170830163314.1411-1-blp@ovn.org>","X-Spam-Status":"No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW\n\tautolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Cc":"Ben Pfaff ","Subject":"[ovs-dev] [PATCH 2/2] monitor: Simplify calculation of\n\tcond->conditional.","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"This removes n_true_cnd from struct ovsdb_monitor_session_condition.\nIt was an \"optimization\" that is not part of any inner loop, but\nmake the code harder to reason about.\n\nSigned-off-by: Ben Pfaff \n---\n ovsdb/monitor.c | 28 ++++++++++++----------------\n 1 file changed, 12 insertions(+), 16 deletions(-)","diff":"diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c\nindex 7a5c2f905560..c0f9c557ab67 100644\n--- a/ovsdb/monitor.c\n+++ b/ovsdb/monitor.c\n@@ -46,8 +46,7 @@ static struct hmap ovsdb_monitors = HMAP_INITIALIZER(&ovsdb_monitors);\n \n /* Keep state of session's conditions */\n struct ovsdb_monitor_session_condition {\n- bool conditional;\n- size_t n_true_cnd;\n+ bool conditional; /* True iff every table's condition is true. */\n struct shash tables; /* Contains\n * \"struct ovsdb_monitor_table_condition *\"s. */\n };\n@@ -583,8 +582,17 @@ static inline void\n ovsdb_monitor_session_condition_set_mode(\n struct ovsdb_monitor_session_condition *cond)\n {\n- cond->conditional = shash_count(&cond->tables) !=\n- cond->n_true_cnd;\n+ struct shash_node *node;\n+\n+ SHASH_FOR_EACH (node, &cond->tables) {\n+ struct ovsdb_monitor_table_condition *mtc = node->data;\n+\n+ if (!ovsdb_condition_is_true(&mtc->new_condition)) {\n+ cond->conditional = true;\n+ return;\n+ }\n+ }\n+ cond->conditional = false;\n }\n \n /* Returnes an empty allocated session's condition state holder */\n@@ -649,9 +657,6 @@ ovsdb_monitor_table_condition_create(\n shash_add(&condition->tables, table->schema->name, mtc);\n /* On session startup old == new condition */\n ovsdb_condition_clone(&mtc->new_condition, &mtc->old_condition);\n- if (ovsdb_condition_is_true(&mtc->old_condition)) {\n- condition->n_true_cnd++;\n- }\n ovsdb_monitor_session_condition_set_mode(condition);\n \n return NULL;\n@@ -722,15 +727,6 @@ ovsdb_monitor_table_condition_updated(struct ovsdb_monitor_table *mt,\n /* If conditional monitoring - set old condition to new condition */\n if (ovsdb_condition_cmp_3way(&mtc->old_condition,\n &mtc->new_condition)) {\n- if (ovsdb_condition_is_true(&mtc->new_condition)) {\n- if (!ovsdb_condition_is_true(&mtc->old_condition)) {\n- condition->n_true_cnd++;\n- }\n- } else {\n- if (ovsdb_condition_is_true(&mtc->old_condition)) {\n- condition->n_true_cnd--;\n- }\n- }\n ovsdb_condition_destroy(&mtc->old_condition);\n ovsdb_condition_clone(&mtc->old_condition, &mtc->new_condition);\n ovsdb_monitor_session_condition_set_mode(condition);\n","prefixes":["ovs-dev","2/2"]}