Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2194404/?format=api
{ "id": 2194404, "url": "http://patchwork.ozlabs.org/api/patches/2194404/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ovn/patch/20260208195519.1851683-3-mmichels@redhat.com/", "project": { "id": 68, "url": "http://patchwork.ozlabs.org/api/projects/68/?format=api", "name": "Open Virtual Network development", "link_name": "ovn", "list_id": "ovs-dev.openvswitch.org", "list_email": "ovs-dev@openvswitch.org", "web_url": "http://openvswitch.org/", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260208195519.1851683-3-mmichels@redhat.com>", "list_archive_url": null, "date": "2026-02-08T19:55:14", "name": "[ovs-dev,v2,2/2] northd: Remove redundant stopwatches.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "47c3d9dd2bac72ee9c69758c002e5c4296fc6f77", "submitter": { "id": 71978, "url": "http://patchwork.ozlabs.org/api/people/71978/?format=api", "name": "Mark Michelson", "email": "mmichels@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/ovn/patch/20260208195519.1851683-3-mmichels@redhat.com/mbox/", "series": [ { "id": 491435, "url": "http://patchwork.ozlabs.org/api/series/491435/?format=api", "web_url": "http://patchwork.ozlabs.org/project/ovn/list/?series=491435", "date": "2026-02-08T19:55:12", "name": "Add stopwatches to incremental engine nodes.", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/491435/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2194404/comments/", "check": "success", "checks": "http://patchwork.ozlabs.org/api/patches/2194404/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<ovs-dev-bounces@openvswitch.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "dev@openvswitch.org" ], "Delivered-To": [ "patchwork-incoming@legolas.ozlabs.org", "ovs-dev@lists.linuxfoundation.org" ], "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=c2zC+N0F;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=140.211.166.137; helo=smtp4.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org)", "smtp4.osuosl.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key)\n header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=c2zC+N0F", "smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none)\n header.from=redhat.com", "smtp3.osuosl.org; dkim=pass (1024-bit key,\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=c2zC+N0F" ], "Received": [ "from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4f8JTf5MxYz1xvc\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 09 Feb 2026 06:55:34 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp4.osuosl.org (Postfix) with ESMTP id 4526D409E0;\n\tSun, 8 Feb 2026 19:55:32 +0000 (UTC)", "from smtp4.osuosl.org ([127.0.0.1])\n by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id UJ6gh2pTfnPU; Sun, 8 Feb 2026 19:55:29 +0000 (UTC)", "from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])\n\tby smtp4.osuosl.org (Postfix) with ESMTPS id 93556409F7;\n\tSun, 8 Feb 2026 19:55:28 +0000 (UTC)", "from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id 5B75FC0780;\n\tSun, 8 Feb 2026 19:55:28 +0000 (UTC)", "from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n by lists.linuxfoundation.org (Postfix) with ESMTP id CF096C003D\n for <dev@openvswitch.org>; Sun, 8 Feb 2026 19:55:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id 8D406607EF\n for <dev@openvswitch.org>; Sun, 8 Feb 2026 19:55:26 +0000 (UTC)", "from smtp3.osuosl.org ([127.0.0.1])\n by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id FUr19wUi1MGG for <dev@openvswitch.org>;\n Sun, 8 Feb 2026 19:55:25 +0000 (UTC)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by smtp3.osuosl.org (Postfix) with ESMTPS id 3C731606E8\n for <dev@openvswitch.org>; Sun, 8 Feb 2026 19:55:24 +0000 (UTC)", "from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-eugKdF1TORu8VsVy5eb5yA-1; Sun,\n 08 Feb 2026 14:55:22 -0500", "from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 8F9AC1800464\n for <dev@openvswitch.org>; Sun, 8 Feb 2026 19:55:21 +0000 (UTC)", "from localhost.localdomain.com (unknown [10.22.64.91])\n by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 168211956053\n for <dev@openvswitch.org>; Sun, 8 Feb 2026 19:55:20 +0000 (UTC)" ], "X-Virus-Scanned": [ "amavis at osuosl.org", "amavis at osuosl.org" ], "X-Comment": "SPF check N/A for local connections - client-ip=140.211.9.56;\n helo=lists.linuxfoundation.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN> ", "DKIM-Filter": [ "OpenDKIM Filter v2.11.0 smtp4.osuosl.org 93556409F7", "OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3C731606E8" ], "Received-SPF": "Pass (mailfrom) identity=mailfrom; client-ip=170.10.133.124;\n helo=us-smtp-delivery-124.mimecast.com; envelope-from=mmichels@redhat.com;\n receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp3.osuosl.org 3C731606E8", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1770580523;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=qU2aCMXPAqfkbaIAvN93EFCaFS/5Kc+AZ0s82BeKlBU=;\n b=c2zC+N0F9lne/57qmsJtMUFXJsq3HM7tI3P84IBn6dYuKr2anU2q10byU7QGEv3WpoCN3i\n muaRTdQtJSbcj5SK3u2whXroeZYRXHtUeoya1TKwWX+Y9cMDWtpBv5DsJrEy/1y+flOuU9\n Iz07QHXFqLDjsP3xgCD4LqrCjow8wZk=", "X-MC-Unique": "eugKdF1TORu8VsVy5eb5yA-1", "X-Mimecast-MFC-AGG-ID": "eugKdF1TORu8VsVy5eb5yA_1770580521", "To": "dev@openvswitch.org", "Date": "Sun, 8 Feb 2026 14:55:14 -0500", "Message-ID": "<20260208195519.1851683-3-mmichels@redhat.com>", "In-Reply-To": "<20260208195519.1851683-1-mmichels@redhat.com>", "References": "<20260208195519.1851683-1-mmichels@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.17", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "eGfowZkjG5tUNtkdWaLYYUKXmMPGRgHqWR6LTqp-Jkk_1770580521", "X-Mimecast-Originator": "redhat.com", "Subject": "[ovs-dev] [PATCH ovn v2 2/2] northd: Remove redundant stopwatches.", "X-BeenThere": "ovs-dev@openvswitch.org", "X-Mailman-Version": "2.1.30", "Precedence": "list", "List-Id": "<ovs-dev.openvswitch.org>", "List-Unsubscribe": "<https://mail.openvswitch.org/mailman/options/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe>", "List-Archive": "<http://mail.openvswitch.org/pipermail/ovs-dev/>", "List-Post": "<mailto:ovs-dev@openvswitch.org>", "List-Help": "<mailto:ovs-dev-request@openvswitch.org?subject=help>", "List-Subscribe": "<https://mail.openvswitch.org/mailman/listinfo/ovs-dev>,\n <mailto:ovs-dev-request@openvswitch.org?subject=subscribe>", "From": "Mark Michelson via dev <ovs-dev@openvswitch.org>", "Reply-To": "Mark Michelson <mmichels@redhat.com>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "ovs-dev-bounces@openvswitch.org", "Sender": "\"dev\" <ovs-dev-bounces@openvswitch.org>" }, "content": "The previous commit added new stopwatches to all incremental engine\nnodes. Some pre-existing stopwatches measured the exact same thing, so\nthey are removed from the code in this commit.\n\nSigned-off-by: Mark Michelson <mmichels@redhat.com>\n---\n lib/stopwatch-names.h | 13 -------------\n northd/en-advertised-route-sync.c | 8 --------\n northd/en-group-ecmp-route.c | 5 -----\n northd/en-learned-route-sync.c | 5 -----\n northd/en-lflow.c | 5 -----\n northd/en-lr-nat.c | 4 ----\n northd/en-lr-stateful.c | 5 -----\n northd/en-ls-arp.c | 6 ------\n northd/en-ls-stateful.c | 5 -----\n northd/en-meters.c | 6 ------\n northd/en-northd.c | 4 ----\n northd/en-port-group.c | 5 -----\n northd/en-sync-from-sb.c | 5 -----\n northd/ovn-northd.c | 13 -------------\n tests/perf-northd.at | 20 ++++++++++----------\n 15 files changed, 10 insertions(+), 99 deletions(-)", "diff": "diff --git a/lib/stopwatch-names.h b/lib/stopwatch-names.h\nindex b912e813c..4d81d338c 100644\n--- a/lib/stopwatch-names.h\n+++ b/lib/stopwatch-names.h\n@@ -16,11 +16,8 @@\n #define STOPWATCH_NAMES_H 1\n \n #define NORTHD_LOOP_STOPWATCH_NAME \"ovn-northd-loop\"\n-#define OVNNB_DB_RUN_STOPWATCH_NAME \"ovnnb_db_run\"\n-#define OVNSB_DB_RUN_STOPWATCH_NAME \"ovnsb_db_run\"\n #define BUILD_LFLOWS_CTX_STOPWATCH_NAME \"build_flows_ctx\"\n #define CLEAR_LFLOWS_CTX_STOPWATCH_NAME \"clear_lflows_ctx\"\n-#define BUILD_LFLOWS_STOPWATCH_NAME \"build_lflows\"\n #define LFLOWS_DATAPATHS_STOPWATCH_NAME \"lflows_datapaths\"\n #define LFLOWS_PORTS_STOPWATCH_NAME \"lflows_ports\"\n #define LFLOWS_LBS_STOPWATCH_NAME \"lflows_lbs\"\n@@ -29,15 +26,5 @@\n #define LFLOWS_IGMP_STOPWATCH_NAME \"lflows_igmp\"\n #define LFLOWS_DP_GROUPS_STOPWATCH_NAME \"lflows_dp_groups\"\n #define LFLOWS_TO_SB_STOPWATCH_NAME \"lflows_to_sb\"\n-#define PORT_GROUP_RUN_STOPWATCH_NAME \"port_group_run\"\n-#define SYNC_METERS_RUN_STOPWATCH_NAME \"sync_meters_run\"\n-#define LR_NAT_RUN_STOPWATCH_NAME \"lr_nat_run\"\n-#define LR_STATEFUL_RUN_STOPWATCH_NAME \"lr_stateful\"\n-#define LS_STATEFUL_RUN_STOPWATCH_NAME \"ls_stateful\"\n-#define LS_ARP_RUN_STOPWATCH_NAME \"ls_arp\"\n-#define ADVERTISED_ROUTE_SYNC_RUN_STOPWATCH_NAME \"advertised_route_sync\"\n-#define LEARNED_ROUTE_SYNC_RUN_STOPWATCH_NAME \"learned_route_sync\"\n-#define DYNAMIC_ROUTES_RUN_STOPWATCH_NAME \"dynamic_routes\"\n-#define GROUP_ECMP_ROUTE_RUN_STOPWATCH_NAME \"group_ecmp_route\"\n \n #endif\ndiff --git a/northd/en-advertised-route-sync.c b/northd/en-advertised-route-sync.c\nindex be771391d..a200731f1 100644\n--- a/northd/en-advertised-route-sync.c\n+++ b/northd/en-advertised-route-sync.c\n@@ -16,14 +16,12 @@\n \n #include <config.h>\n \n-#include \"stopwatch.h\"\n #include \"northd.h\"\n \n #include \"en-advertised-route-sync.h\"\n #include \"en-lr-nat.h\"\n #include \"en-lr-stateful.h\"\n #include \"lb.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"openvswitch/hmap.h\"\n #include \"ovn-util.h\"\n \n@@ -247,15 +245,11 @@ en_advertised_route_sync_run(struct engine_node *node, void *data OVS_UNUSED)\n const struct sbrec_advertised_route_table *sbrec_advertised_route_table =\n EN_OVSDB_GET(engine_get_input(\"SB_advertised_route\", node));\n \n- stopwatch_start(ADVERTISED_ROUTE_SYNC_RUN_STOPWATCH_NAME, time_msec());\n-\n advertised_route_table_sync(eng_ctx->ovnsb_idl_txn,\n sbrec_advertised_route_table,\n &routes_data->parsed_routes,\n &dynamic_routes_data->routes,\n &northd_data->ls_ports, routes_sync_data);\n-\n- stopwatch_stop(ADVERTISED_ROUTE_SYNC_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \n@@ -515,7 +509,6 @@ en_dynamic_routes_run(struct engine_node *node, void *data)\n \n en_dynamic_routes_clear(data);\n \n- stopwatch_start(DYNAMIC_ROUTES_RUN_STOPWATCH_NAME, time_msec());\n const struct lr_stateful_record *lr_stateful_rec;\n HMAP_FOR_EACH (lr_stateful_rec, key_node,\n &lr_stateful_data->table.entries) {\n@@ -537,7 +530,6 @@ en_dynamic_routes_run(struct engine_node *node, void *data)\n build_lb_connected_routes(od, &lr_stateful_data->table,\n &dynamic_routes_data->routes);\n }\n- stopwatch_stop(DYNAMIC_ROUTES_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-group-ecmp-route.c b/northd/en-group-ecmp-route.c\nindex 67f876e4b..cd4cdb991 100644\n--- a/northd/en-group-ecmp-route.c\n+++ b/northd/en-group-ecmp-route.c\n@@ -19,12 +19,10 @@\n \n #include \"northd/lflow-mgr.h\"\n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n #include \"northd.h\"\n \n #include \"en-group-ecmp-route.h\"\n #include \"en-learned-route-sync.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"openvswitch/hmap.h\"\n \n VLOG_DEFINE_THIS_MODULE(en_group_ecmp_route);\n@@ -375,11 +373,8 @@ en_group_ecmp_route_run(struct engine_node *node, void *_data)\n struct learned_route_sync_data *learned_route_data\n = engine_get_input_data(\"learned_route_sync\", node);\n \n- stopwatch_start(GROUP_ECMP_ROUTE_RUN_STOPWATCH_NAME, time_msec());\n-\n group_ecmp_route(data, routes_data, learned_route_data);\n \n- stopwatch_stop(GROUP_ECMP_ROUTE_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-learned-route-sync.c b/northd/en-learned-route-sync.c\nindex 15a165fa9..4e2d284ee 100644\n--- a/northd/en-learned-route-sync.c\n+++ b/northd/en-learned-route-sync.c\n@@ -18,11 +18,9 @@\n #include <stdbool.h>\n \n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n #include \"northd.h\"\n \n #include \"en-learned-route-sync.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"openvswitch/hmap.h\"\n #include \"ovn-util.h\"\n \n@@ -131,14 +129,11 @@ en_learned_route_sync_run(struct engine_node *node, void *data)\n EN_OVSDB_GET(engine_get_input(\"SB_learned_route\", node));\n struct northd_data *northd_data = engine_get_input_data(\"northd\", node);\n \n- stopwatch_start(LEARNED_ROUTE_SYNC_RUN_STOPWATCH_NAME, time_msec());\n-\n routes_table_sync(sbrec_learned_route_table,\n &northd_data->lr_ports,\n &northd_data->lr_datapaths,\n &routes_sync_data->parsed_routes);\n \n- stopwatch_stop(LEARNED_ROUTE_SYNC_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-lflow.c b/northd/en-lflow.c\nindex 41a5a97ff..940bd18bd 100644\n--- a/northd/en-lflow.c\n+++ b/northd/en-lflow.c\n@@ -34,8 +34,6 @@\n \n #include \"lib/inc-proc-eng.h\"\n #include \"northd.h\"\n-#include \"stopwatch.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"timeval.h\"\n #include \"openvswitch/vlog.h\"\n \n@@ -129,8 +127,6 @@ en_lflow_run(struct engine_node *node, void *data)\n struct lflow_input lflow_input;\n lflow_get_input_data(node, &lflow_input);\n \n- stopwatch_start(BUILD_LFLOWS_STOPWATCH_NAME, time_msec());\n-\n struct lflow_data *lflow_data = data;\n lflow_table_clear(lflow_data->lflow_table,\n search_mode == LFLOW_TABLE_SEARCH_FIELDS);\n@@ -139,7 +135,6 @@ en_lflow_run(struct engine_node *node, void *data)\n \n build_lflows(eng_ctx->ovnsb_idl_txn, &lflow_input,\n lflow_data->lflow_table);\n- stopwatch_stop(BUILD_LFLOWS_STOPWATCH_NAME, time_msec());\n \n return EN_UPDATED;\n }\ndiff --git a/northd/en-lr-nat.c b/northd/en-lr-nat.c\nindex 45bdbab39..f0596d254 100644\n--- a/northd/en-lr-nat.c\n+++ b/northd/en-lr-nat.c\n@@ -24,7 +24,6 @@\n #include \"include/openvswitch/hmap.h\"\n #include \"openvswitch/util.h\"\n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n \n /* OVN includes */\n #include \"en-lr-nat.h\"\n@@ -33,7 +32,6 @@\n #include \"lib/ovn-nb-idl.h\"\n #include \"lib/ovn-sb-idl.h\"\n #include \"lib/ovn-util.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"northd.h\"\n \n VLOG_DEFINE_THIS_MODULE(en_lr_nat);\n@@ -114,12 +112,10 @@ en_lr_nat_run(struct engine_node *node, void *data_)\n struct northd_data *northd_data = engine_get_input_data(\"northd\", node);\n struct ed_type_lr_nat_data *data = data_;\n \n- stopwatch_start(LR_NAT_RUN_STOPWATCH_NAME, time_msec());\n lr_nat_table_clear(&data->lr_nats);\n lr_nat_table_build(&data->lr_nats, &northd_data->lr_datapaths,\n &northd_data->lr_ports);\n \n- stopwatch_stop(LR_NAT_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-lr-stateful.c b/northd/en-lr-stateful.c\nindex 212c0641c..171a3d53b 100644\n--- a/northd/en-lr-stateful.c\n+++ b/northd/en-lr-stateful.c\n@@ -27,7 +27,6 @@\n #include \"lib/uuidset.h\"\n #include \"openvswitch/util.h\"\n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n \n /* OVN includes */\n #include \"en-lb-data.h\"\n@@ -39,7 +38,6 @@\n #include \"lib/ovn-nb-idl.h\"\n #include \"lib/ovn-sb-idl.h\"\n #include \"lib/ovn-util.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"lflow-mgr.h\"\n #include \"northd.h\"\n \n@@ -124,15 +122,12 @@ en_lr_stateful_run(struct engine_node *node, void *data_)\n struct lr_stateful_input input_data = lr_stateful_get_input_data(node);\n struct ed_type_lr_stateful *data = data_;\n \n- stopwatch_start(LR_STATEFUL_RUN_STOPWATCH_NAME, time_msec());\n-\n lr_stateful_table_clear(&data->table);\n lr_stateful_table_build(&data->table, input_data.lr_nats,\n input_data.lr_datapaths,\n input_data.lb_datapaths_map,\n input_data.lbgrp_datapaths_map);\n \n- stopwatch_stop(LR_STATEFUL_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-ls-arp.c b/northd/en-ls-arp.c\nindex a96b67928..021f5054f 100644\n--- a/northd/en-ls-arp.c\n+++ b/northd/en-ls-arp.c\n@@ -18,7 +18,6 @@\n #include \"include/openvswitch/hmap.h\"\n #include \"openvswitch/util.h\"\n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n \n /* OVN includes */\n #include \"en-lr-nat.h\"\n@@ -27,7 +26,6 @@\n #include \"lib/ovn-nb-idl.h\"\n #include \"lib/ovn-sb-idl.h\"\n #include \"lib/ovn-util.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"lflow-mgr.h\"\n #include \"northd.h\"\n \n@@ -195,8 +193,6 @@ en_ls_arp_run(struct engine_node *node, void *data_)\n struct ls_arp_input input_data = ls_arp_get_input_data(node);\n struct ed_type_ls_arp *data = data_;\n \n- stopwatch_start(LS_ARP_RUN_STOPWATCH_NAME, time_msec());\n-\n ls_arp_table_clear(&data->table);\n \n const struct ovn_datapath *od;\n@@ -210,8 +206,6 @@ en_ls_arp_run(struct engine_node *node, void *data_)\n ls_arp_record_create(&data->table, od, input_data.lr_nats);\n }\n \n- stopwatch_stop(LS_ARP_RUN_STOPWATCH_NAME, time_msec());\n-\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-ls-stateful.c b/northd/en-ls-stateful.c\nindex bfef7bd91..4daeab20d 100644\n--- a/northd/en-ls-stateful.c\n+++ b/northd/en-ls-stateful.c\n@@ -27,7 +27,6 @@\n #include \"lib/uuidset.h\"\n #include \"openvswitch/util.h\"\n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n \n /* OVN includes */\n #include \"en-lb-data.h\"\n@@ -38,7 +37,6 @@\n #include \"lib/ovn-nb-idl.h\"\n #include \"lib/ovn-sb-idl.h\"\n #include \"lib/ovn-util.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"lflow-mgr.h\"\n #include \"northd.h\"\n \n@@ -127,13 +125,10 @@ en_ls_stateful_run(struct engine_node *node, void *data_)\n struct ls_stateful_input input_data = ls_stateful_get_input_data(node);\n struct ed_type_ls_stateful *data = data_;\n \n- stopwatch_start(LS_STATEFUL_RUN_STOPWATCH_NAME, time_msec());\n-\n ls_stateful_table_clear(&data->table);\n ls_stateful_table_build(&data->table, input_data.ls_datapaths,\n input_data.ls_port_groups);\n \n- stopwatch_stop(LS_STATEFUL_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-meters.c b/northd/en-meters.c\nindex 288134108..ef0da25c9 100644\n--- a/northd/en-meters.c\n+++ b/northd/en-meters.c\n@@ -17,10 +17,8 @@\n #include <config.h>\n \n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n \n #include \"en-meters.h\"\n-#include \"lib/stopwatch-names.h\"\n \n VLOG_DEFINE_THIS_MODULE(en_meters);\n \n@@ -68,14 +66,10 @@ en_sync_meters_run(struct engine_node *node, void *data_)\n \n const struct engine_context *eng_ctx = engine_get_context();\n \n- stopwatch_start(SYNC_METERS_RUN_STOPWATCH_NAME, time_msec());\n-\n build_meter_groups(&data->meter_groups, nb_meter_table);\n \n sync_meters(eng_ctx->ovnsb_idl_txn, nb_meter_table, acl_table,\n sb_meter_table, &data->meter_groups);\n-\n- stopwatch_stop(SYNC_METERS_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-northd.c b/northd/en-northd.c\nindex 6815e6e39..92be3eb2f 100644\n--- a/northd/en-northd.c\n+++ b/northd/en-northd.c\n@@ -28,8 +28,6 @@\n * lib/ovn-parallel-hmap.h should be updated\n * to include this dependency itself */\n #include \"lib/ovn-parallel-hmap.h\"\n-#include \"stopwatch.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"northd.h\"\n #include \"lib/util.h\"\n #include \"openvswitch/vlog.h\"\n@@ -150,9 +148,7 @@ en_northd_run(struct engine_node *node, void *data)\n northd_get_input_data(node, &input_data);\n \n COVERAGE_INC(northd_run);\n- stopwatch_start(OVNNB_DB_RUN_STOPWATCH_NAME, time_msec());\n ovnnb_db_run(&input_data, data, eng_ctx->ovnsb_idl_txn);\n- stopwatch_stop(OVNNB_DB_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-port-group.c b/northd/en-port-group.c\nindex d0b7961fb..c33c07976 100644\n--- a/northd/en-port-group.c\n+++ b/northd/en-port-group.c\n@@ -17,10 +17,8 @@\n #include <config.h>\n \n #include \"openvswitch/vlog.h\"\n-#include \"stopwatch.h\"\n \n #include \"en-port-group.h\"\n-#include \"lib/stopwatch-names.h\"\n #include \"northd.h\"\n \n VLOG_DEFINE_THIS_MODULE(en_port_group);\n@@ -529,8 +527,6 @@ en_port_group_run(struct engine_node *node, void *data_)\n struct port_group_input input_data = port_group_get_input_data(node);\n struct port_group_data *data = data_;\n \n- stopwatch_start(PORT_GROUP_RUN_STOPWATCH_NAME, time_msec());\n-\n ls_port_group_table_clear(&data->ls_port_groups);\n port_group_ls_table_clear(&data->port_groups_lses);\n \n@@ -543,7 +539,6 @@ en_port_group_run(struct engine_node *node, void *data_)\n input_data.sbrec_port_group_table,\n eng_ctx->ovnsb_idl_txn);\n \n- stopwatch_stop(PORT_GROUP_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \ndiff --git a/northd/en-sync-from-sb.c b/northd/en-sync-from-sb.c\nindex dde0e9f55..de822115d 100644\n--- a/northd/en-sync-from-sb.c\n+++ b/northd/en-sync-from-sb.c\n@@ -27,9 +27,6 @@\n #include \"lib/ovn-nb-idl.h\"\n #include \"lib/ovn-sb-idl.h\"\n #include \"lib/ovn-util.h\"\n-#include \"stopwatch.h\"\n-#include \"lib/stopwatch-names.h\"\n-#include \"timeval.h\"\n #include \"northd.h\"\n \n #include \"openvswitch/vlog.h\"\n@@ -53,11 +50,9 @@ en_sync_from_sb_run(struct engine_node *node, void *data OVS_UNUSED)\n EN_OVSDB_GET(engine_get_input(\"SB_port_binding\", node));\n const struct sbrec_ha_chassis_group_table *sb_ha_ch_grp_table =\n EN_OVSDB_GET(engine_get_input(\"SB_ha_chassis_group\", node));\n- stopwatch_start(OVNSB_DB_RUN_STOPWATCH_NAME, time_msec());\n ovnsb_db_run(eng_ctx->ovnsb_idl_txn,\n sb_pb_table, sb_ha_ch_grp_table,\n &nd->ls_ports, &nd->lr_ports);\n- stopwatch_stop(OVNSB_DB_RUN_STOPWATCH_NAME, time_msec());\n \n return EN_UNCHANGED;\n }\ndiff --git a/northd/ovn-northd.c b/northd/ovn-northd.c\nindex 7d7568c6f..0ed2eb17a 100644\n--- a/northd/ovn-northd.c\n+++ b/northd/ovn-northd.c\n@@ -990,11 +990,8 @@ main(int argc, char *argv[])\n free(ovn_version);\n \n stopwatch_create(NORTHD_LOOP_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(OVNNB_DB_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(OVNSB_DB_RUN_STOPWATCH_NAME, SW_MS);\n stopwatch_create(BUILD_LFLOWS_CTX_STOPWATCH_NAME, SW_MS);\n stopwatch_create(CLEAR_LFLOWS_CTX_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(BUILD_LFLOWS_STOPWATCH_NAME, SW_MS);\n stopwatch_create(LFLOWS_DATAPATHS_STOPWATCH_NAME, SW_MS);\n stopwatch_create(LFLOWS_PORTS_STOPWATCH_NAME, SW_MS);\n stopwatch_create(LFLOWS_LBS_STOPWATCH_NAME, SW_MS);\n@@ -1003,16 +1000,6 @@ main(int argc, char *argv[])\n stopwatch_create(LFLOWS_IGMP_STOPWATCH_NAME, SW_MS);\n stopwatch_create(LFLOWS_DP_GROUPS_STOPWATCH_NAME, SW_MS);\n stopwatch_create(LFLOWS_TO_SB_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(PORT_GROUP_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(SYNC_METERS_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(LR_NAT_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(LR_STATEFUL_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(LS_STATEFUL_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(LS_ARP_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(ADVERTISED_ROUTE_SYNC_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(LEARNED_ROUTE_SYNC_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(DYNAMIC_ROUTES_RUN_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(GROUP_ECMP_ROUTE_RUN_STOPWATCH_NAME, SW_MS);\n \n /* Initialize incremental processing engine for ovn-northd */\n inc_proc_northd_init(&ovnnb_idl_loop, &ovnsb_idl_loop);\ndiff --git a/tests/perf-northd.at b/tests/perf-northd.at\nindex 25c5c8ba4..0e9253b4b 100644\n--- a/tests/perf-northd.at\n+++ b/tests/perf-northd.at\n@@ -85,18 +85,18 @@ m4_define([PERF_RECORD_STOPWATCH], [\n # Append a number of metrics to performance results\n #\n m4_define([PERF_RECORD_STOP], [\n- PERF_RECORD_STOPWATCH(ovnnb_db_run, [\"Maximum\"], [Maximum (NB in msec)])\n- PERF_RECORD_STOPWATCH(ovnnb_db_run, [\"Short term average\"], [Average (NB in msec)])\n- PERF_RECORD_STOPWATCH(ovnsb_db_run, [\"Maximum\"], [Maximum (SB in msec)])\n- PERF_RECORD_STOPWATCH(ovnsb_db_run, [\"Short term average\"], [Average (SB in msec)])\n+ PERF_RECORD_STOPWATCH(northd, [\"Maximum\"], [Maximum (NB in msec)])\n+ PERF_RECORD_STOPWATCH(northd, [\"Short term average\"], [Average (NB in msec)])\n+ PERF_RECORD_STOPWATCH(sync_from_sb, [\"Maximum\"], [Maximum (SB in msec)])\n+ PERF_RECORD_STOPWATCH(sync_from_sb, [\"Short term average\"], [Average (SB in msec)])\n PERF_RECORD_STOPWATCH(ovn-northd-loop, [\"Maximum\"], [Maximum (northd-loop in msec)])\n PERF_RECORD_STOPWATCH(ovn-northd-loop, [\"Short term average\"], [Average (northd-loop in msec)])\n- PERF_RECORD_STOPWATCH(build_lflows, [\"Maximum\"], [Maximum (lflows in msec)])\n- PERF_RECORD_STOPWATCH(build_lflows, [\"Short term average\"], [Average (lflows in msec)])\n- PERF_RECORD_STOPWATCH(port_group_run, [\"Maximum\"], [Maximum (port_group in msec)])\n- PERF_RECORD_STOPWATCH(port_group_run, [\"Short term average\"], [Average (port_group in msec)])\n- PERF_RECORD_STOPWATCH(sync_meters_run, [\"Maximum\"], [Maximum (sync_meters in msec)])\n- PERF_RECORD_STOPWATCH(sync_meters_run, [\"Short term average\"], [Average (sync_meters in msec)])\n+ PERF_RECORD_STOPWATCH(lflow, [\"Maximum\"], [Maximum (lflows in msec)])\n+ PERF_RECORD_STOPWATCH(lflow, [\"Short term average\"], [Average (lflows in msec)])\n+ PERF_RECORD_STOPWATCH(port_group, [\"Maximum\"], [Maximum (port_group in msec)])\n+ PERF_RECORD_STOPWATCH(port_group, [\"Short term average\"], [Average (port_group in msec)])\n+ PERF_RECORD_STOPWATCH(sync_meters, [\"Maximum\"], [Maximum (sync_meters in msec)])\n+ PERF_RECORD_STOPWATCH(sync_meters, [\"Short term average\"], [Average (sync_meters in msec)])\n \n ovn-appctl -t northd/ovn-northd stopwatch/reset\n ])\n", "prefixes": [ "ovs-dev", "v2", "2/2" ] }