Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2186657/?format=api
{ "id": 2186657, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2186657/?format=api", "project": { "id": 68, "url": "http://patchwork.ozlabs.org/api/1.0/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": "" }, "msgid": "<20260120114948.2289909-10-guilherme.paulo@luizalabs.com>", "date": "2026-01-20T11:49:48", "name": "[ovs-dev,v0,9/9] ovn-ic: Refactor engine-node 'en-ic'.", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "be1d48721a5361231246e2d2585fb11911c20aaf", "submitter": { "id": 90256, "url": "http://patchwork.ozlabs.org/api/1.0/people/90256/?format=api", "name": "Paulo Guilherme Silva", "email": "guilherme.paulo@luizalabs.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/ovn/patch/20260120114948.2289909-10-guilherme.paulo@luizalabs.com/mbox/", "series": [ { "id": 489037, "url": "http://patchwork.ozlabs.org/api/1.0/series/489037/?format=api", "date": "2026-01-20T11:49:40", "name": "Create multiple engines nodes for ovn-ic.", "version": 0, "mbox": "http://patchwork.ozlabs.org/series/489037/mbox/" } ], "check": "success", "checks": "http://patchwork.ozlabs.org/api/patches/2186657/checks/", "tags": {}, "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=luizalabs.com header.i=@luizalabs.com\n header.a=rsa-sha256 header.s=google header.b=OTkCW/ZE;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org\n (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org;\n envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org)", "smtp2.osuosl.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key)\n header.d=luizalabs.com header.i=@luizalabs.com header.a=rsa-sha256\n header.s=google header.b=OTkCW/ZE", "smtp3.osuosl.org; dmarc=pass (p=quarantine dis=none)\n header.from=luizalabs.com", "smtp3.osuosl.org;\n dkim=pass (1024-bit key) header.d=luizalabs.com header.i=@luizalabs.com\n header.a=rsa-sha256 header.s=google header.b=OTkCW/ZE" ], "Received": [ "from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133])\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 4dwQdc0J4Cz1xsW\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 20 Jan 2026 22:51:15 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby smtp2.osuosl.org (Postfix) with ESMTP id 31F9443047;\n\tTue, 20 Jan 2026 11:51:09 +0000 (UTC)", "from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id mDzCEFsLpyYd; Tue, 20 Jan 2026 11:51:07 +0000 (UTC)", "from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56])\n\tby smtp2.osuosl.org (Postfix) with ESMTPS id AF4AD43026;\n\tTue, 20 Jan 2026 11:51:06 +0000 (UTC)", "from lf-lists.osuosl.org (localhost [127.0.0.1])\n\tby lists.linuxfoundation.org (Postfix) with ESMTP id 84A5BC02A6;\n\tTue, 20 Jan 2026 11:51:06 +0000 (UTC)", "from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136])\n by lists.linuxfoundation.org (Postfix) with ESMTP id 0A263C02A6\n for <dev@openvswitch.org>; Tue, 20 Jan 2026 11:51:05 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by smtp3.osuosl.org (Postfix) with ESMTP id 780366FD05\n for <dev@openvswitch.org>; Tue, 20 Jan 2026 11:50:39 +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 Fr7L21NyXSuR for <dev@openvswitch.org>;\n Tue, 20 Jan 2026 11:50:37 +0000 (UTC)", "from mail-dy1-x132d.google.com (mail-dy1-x132d.google.com\n [IPv6:2607:f8b0:4864:20::132d])\n by smtp3.osuosl.org (Postfix) with ESMTPS id 44CC96FD4B\n for <dev@openvswitch.org>; Tue, 20 Jan 2026 11:50:37 +0000 (UTC)", "by mail-dy1-x132d.google.com with SMTP id\n 5a478bee46e88-2b6f5a9cecaso1368917eec.0\n for <dev@openvswitch.org>; Tue, 20 Jan 2026 03:50:37 -0800 (PST)", "from WNLEC-CW22RF4.. ([177.75.155.81])\n by smtp.gmail.com with ESMTPSA id\n 5a478bee46e88-2b6b367cbc9sm18630559eec.32.2026.01.20.03.50.34\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 20 Jan 2026 03:50:35 -0800 (PST)" ], "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 smtp2.osuosl.org AF4AD43026", "OpenDKIM Filter v2.11.0 smtp3.osuosl.org 44CC96FD4B" ], "Received-SPF": "Pass (mailfrom) identity=mailfrom;\n client-ip=2607:f8b0:4864:20::132d; helo=mail-dy1-x132d.google.com;\n envelope-from=guilherme.paulo@luizalabs.com; receiver=<UNKNOWN>", "DMARC-Filter": "OpenDMARC Filter v1.4.2 smtp3.osuosl.org 44CC96FD4B", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=luizalabs.com; s=google; t=1768909836; x=1769514636; darn=openvswitch.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=k42rLncKfuf08skwANz4QfffHlKgUcdx326Fui1T4V4=;\n b=OTkCW/ZE6re1ChSi9wdeJL+D7ZaSubtWfyx2JLBf7dJHEp5YT26epHPxOS91tlsJto\n 28oRYiatFld+jfMhRVWmggztPSbk8Z6ClCEZXSiGBbBtePPoTO8r4ol6VhodJYpvMi5C\n JLlNKE3pafYFhhZvuG1RgMVsfIeNlY3aZ+HdI=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1768909836; x=1769514636;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=k42rLncKfuf08skwANz4QfffHlKgUcdx326Fui1T4V4=;\n b=P2Ijj32nB8DFF90WOU24QXdO2YdF5kvAMtJvvo5DPn1yG5SRsm3ge9+wENNxZTMv02\n qI41NJPhr8qPIBXgb6wbjHU3kbFb6AEuqkd6AyGrwAwGfMBJ5jeK9aB5je6PNu5lDGjy\n TZM10j8c4leOxUuIoWM0fBsamkN+B98k/+CVeH6beI+UdT2kytQkR0OHC23y2Iy2MbAM\n toepqN+AtepeDSLSkGiPd1E+h+5muvHaHr9P8olipqzlsNNKxQ6uf5hhWQWu5TCLpdfy\n /Zp2uNKqpfJE3+He5tgvFP7bdbIWDCHCoP3fza/0xovcKKmqUeTxHohUCUMDXBEiVDYa\n w2hQ==", "X-Gm-Message-State": "AOJu0Yyg7qf0eyZu70M4VFzjdSmARq58MDwCmwGZ2XL7fgpqRY4kCSpI\n a9xiwqvhVmtd0jGcDwRBI3KZhceHiYUaoxCpgNR8q1l9eMMQtjpN3NLOrAXoLfxkG2B7vJgqrF7\n UBQKYFQb9JNU48b+5JoY9SDyNIwbwa9YZ5tNaRdYqbwEx0uNPgxU9zyK/cNfK", "X-Gm-Gg": "AZuq6aIhCEe9iDcNhisNXMYX+dNlAJVxQhL+X94wH+66J7dh+Uhp0dC7yvblgbZ0Yi/\n UCrAb/UKeKxkd6aWWF/M6/EKJM8JBb3Th2nd2HwjtrykiC6v0eRrn/z2v2j+AtkfdJ+VAWKJ/p3\n tnfZjK4pZlls2g+/xQxZXa3Ip7FSCfUnOwLPYkEp/t1vFcGR2MN6s+tgcjZivJNSVPZcaPj0GF4\n vYe/vfvsKugkvYJehT4pZX+y614XmwY8ezCnxf9PXeOmg4o6wl00HMXPabrexACJ4m0qM2+ZaSE\n 5UYahlbVuJAJ4VXP+WnYGRoj5Xft66HMXpCkgw88e9R8A05666yQDV1sg79yaPpTWg0PIocnXRi\n /YrkKU6mRLO2DQRrl3+R+bSI1Str2yNxy7z/VWH+rM+yF5nUGy0ikQnXt4Q9/MDF/ZZ3i/TUJeq\n GqxWDwNGrDpOUK80KoRT+YEL0hIWwhm+MIqijzPA==", "X-Received": "by 2002:a05:7300:e427:b0:2ae:5c71:3535 with SMTP id\n 5a478bee46e88-2b6fd626710mr1144689eec.9.1768909835762;\n Tue, 20 Jan 2026 03:50:35 -0800 (PST)", "To": "dev@openvswitch.org", "Date": "Tue, 20 Jan 2026 08:49:48 -0300", "Message-Id": "<20260120114948.2289909-10-guilherme.paulo@luizalabs.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20260120114948.2289909-1-guilherme.paulo@luizalabs.com>", "References": "<20260120114948.2289909-1-guilherme.paulo@luizalabs.com>", "MIME-Version": "1.0", "Subject": "[ovs-dev] [PATCH ovn v0 9/9] ovn-ic: Refactor engine-node 'en-ic'.", "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": "Paulo Guilherme Silva via dev <ovs-dev@openvswitch.org>", "Reply-To": "Paulo Guilherme Silva <guilherme.paulo@luizalabs.com>", "Content-Type": "text/plain; charset=\"iso-8859-1\"", "Content-Transfer-Encoding": "quoted-printable", "Errors-To": "ovs-dev-bounces@openvswitch.org", "Sender": "\"dev\" <ovs-dev-bounces@openvswitch.org>" }, "content": "There is a need to refactor by cleaning up the remaining code from the 'ic'\nengine-node after completing the decentralization from a single engine to\nmultiple engines. In the dependency graph of the incremental processing\nengine (I+P), it becomes the output node.\n\nSigned-off-by: Paulo Guilherme Silva <guilherme.paulo@luizalabs.com>\n---\n ic/en-ic.c | 100 ++----------------------------------------\n ic/en-ic.h | 6 ---\n ic/inc-proc-ic.c | 18 --------\n ic/ovn-ic.c | 21 ---------\n ic/ovn-ic.h | 38 ----------------\n lib/stopwatch-names.h | 1 -\n 6 files changed, 4 insertions(+), 180 deletions(-)", "diff": "diff --git a/ic/en-ic.c b/ic/en-ic.c\nindex ecdc1ab5d..0e7f510db 100644\n--- a/ic/en-ic.c\n+++ b/ic/en-ic.c\n@@ -19,90 +19,15 @@\n #include <stdio.h>\n \n /* OVS includes. */\n-#include \"openvswitch/vlog.h\"\n+#include \"openvswitch/util.h\"\n \n /* OVN includes. */\n-#include \"ovn-ic.h\"\n #include \"en-ic.h\"\n-#include \"en-enum-datapaths.h\"\n-#include \"lib/ovn-ic-sb-idl.h\"\n #include \"lib/inc-proc-eng.h\"\n-#include \"lib/ovn-util.h\"\n-#include \"lib/stopwatch-names.h\"\n-#include \"coverage.h\"\n-#include \"stopwatch.h\"\n-#include \"stopwatch-names.h\"\n-\n-VLOG_DEFINE_THIS_MODULE(en_ic);\n-COVERAGE_DEFINE(ic_run);\n-\n-void ic_destroy(struct ic_data *data);\n-void ic_init(struct ic_data *data);\n-\n-static void\n-ic_get_input_data(struct engine_node *node,\n- struct ic_input *input_data)\n-{\n- /* Table references */\n- input_data->nbrec_logical_switch_table =\n- EN_OVSDB_GET(engine_get_input(\"NB_logical_switch\", node));\n- input_data->nbrec_logical_router_table =\n- EN_OVSDB_GET(engine_get_input(\"NB_logical_router\", node));\n- input_data->sbrec_chassis_table =\n- EN_OVSDB_GET(engine_get_input(\"SB_chassis\", node));\n- input_data->icsbrec_ic_sb_global_table =\n- EN_OVSDB_GET(engine_get_input(\"ICSB_ic_sb_global\", node));\n- input_data->icsbrec_availability_zone_table =\n- EN_OVSDB_GET(engine_get_input(\"ICSB_availability_zone\", node));\n-\n- /* Indexes */\n- input_data->nbrec_ls_by_name =\n- engine_ovsdb_node_get_index(\n- engine_get_input(\"NB_logical_switch\", node),\n- \"nbrec_ls_by_name\");\n- input_data->nbrec_lr_by_name =\n- engine_ovsdb_node_get_index(\n- engine_get_input(\"NB_logical_router\", node),\n- \"nbrec_lr_by_name\");\n- input_data->nbrec_lrp_by_name =\n- engine_ovsdb_node_get_index(\n- engine_get_input(\"NB_logical_router\", node),\n- \"nbrec_lrp_by_name\");\n- input_data->nbrec_port_by_name =\n- engine_ovsdb_node_get_index(\n- engine_get_input(\"NB_logical_switch\", node),\n- \"nbrec_port_by_name\");\n- input_data->sbrec_chassis_by_name =\n- engine_ovsdb_node_get_index(\n- engine_get_input(\"SB_chassis\", node),\n- \"sbrec_chassis_by_name\");\n-}\n \n enum engine_node_state\n-en_ic_run(struct engine_node *node, void *data)\n+en_ic_run(struct engine_node *node OVS_UNUSED, void *data OVS_UNUSED)\n {\n- const struct engine_context *eng_ctx = engine_get_context();\n- struct ic_data *ic_data = data;\n- struct ic_input input_data;\n-\n- struct ed_type_enum_datapaths *dp_node_data =\n- engine_get_input_data(\"enum_datapaths\", node);\n-\n- if (!dp_node_data) {\n- return EN_UNCHANGED;\n- }\n-\n- ic_data->dp_tnlids = &dp_node_data->dp_tnlids;\n- ic_data->isb_ts_dps = &dp_node_data->isb_ts_dps;\n- ic_data->isb_tr_dps = &dp_node_data->isb_tr_dps;\n-\n- ic_get_input_data(node, &input_data);\n- input_data.runned_az = eng_ctx->client_ctx;\n-\n- COVERAGE_INC(ic_run);\n- stopwatch_start(IC_OVN_DB_RUN_STOPWATCH_NAME, time_msec());\n- ovn_db_run(&input_data, ic_data, (struct engine_context *) eng_ctx);\n- stopwatch_stop(IC_OVN_DB_RUN_STOPWATCH_NAME, time_msec());\n return EN_UPDATED;\n }\n \n@@ -110,28 +35,11 @@ void *\n en_ic_init(struct engine_node *node OVS_UNUSED,\n struct engine_arg *arg OVS_UNUSED)\n {\n- struct ic_data *data = xzalloc(sizeof *data);\n-\n- ic_init(data);\n-\n- return data;\n-}\n-\n-void\n-en_ic_cleanup(void *data)\n-{\n- ic_destroy(data);\n+ return NULL;\n }\n \n void\n-ic_destroy(struct ic_data *data OVS_UNUSED)\n+en_ic_cleanup(void *data OVS_UNUSED)\n {\n-}\n \n-void\n-ic_init(struct ic_data *data)\n-{\n- data->dp_tnlids = NULL;\n- data->isb_ts_dps = NULL;\n- data->isb_tr_dps = NULL;\n }\ndiff --git a/ic/en-ic.h b/ic/en-ic.h\nindex ab1fbaf42..13db7570a 100644\n--- a/ic/en-ic.h\n+++ b/ic/en-ic.h\n@@ -1,12 +1,6 @@\n #ifndef EN_IC_H\n #define EN_IC_H 1\n \n-#include <config.h>\n-\n-#include <getopt.h>\n-#include <stdlib.h>\n-#include <stdio.h>\n-\n #include \"lib/inc-proc-eng.h\"\n \n enum engine_node_state en_ic_run(struct engine_node *node OVS_UNUSED,\ndiff --git a/ic/inc-proc-ic.c b/ic/inc-proc-ic.c\nindex 0fe787a19..10b7c86f7 100644\n--- a/ic/inc-proc-ic.c\n+++ b/ic/inc-proc-ic.c\n@@ -43,9 +43,7 @@ VLOG_DEFINE_THIS_MODULE(inc_proc_ic);\n NB_NODE(nb_global, \"nb_global\") \\\n NB_NODE(logical_router_static_route, \"logical_router_static_route\") \\\n NB_NODE(logical_router, \"logical_router\") \\\n- NB_NODE(logical_router_port, \"logical_router_port\") \\\n NB_NODE(logical_switch, \"logical_switch\") \\\n- NB_NODE(logical_switch_port, \"logical_switch_port\") \\\n NB_NODE(load_balancer, \"load_balancer\") \\\n NB_NODE(load_balancer_group, \"load_balancer_group\")\n \n@@ -68,8 +66,6 @@ VLOG_DEFINE_THIS_MODULE(inc_proc_ic);\n #define SB_NODES \\\n SB_NODE(sb_global, \"sb_global\") \\\n SB_NODE(chassis, \"chassis\") \\\n- SB_NODE(encap, \"encap\") \\\n- SB_NODE(datapath_binding, \"datapath_binding\") \\\n SB_NODE(port_binding, \"port_binding\") \\\n SB_NODE(service_monitor, \"service_monitor\")\n \n@@ -112,8 +108,6 @@ VLOG_DEFINE_THIS_MODULE(inc_proc_ic);\n #undef ICNB_NODE\n \n #define ICSB_NODES \\\n- ICSB_NODE(ic_sb_global, \"ic_sb_global\") \\\n- ICSB_NODE(availability_zone, \"availability_zone\") \\\n ICSB_NODE(service_monitor, \"service_monitor\") \\\n ICSB_NODE(route, \"route\") \\\n ICSB_NODE(datapath_binding, \"datapath_binding\") \\\n@@ -230,18 +224,6 @@ void inc_proc_ic_init(struct ovsdb_idl_loop *nb,\n engine_add_input(&en_ic, &en_route, NULL);\n engine_add_input(&en_ic, &en_srv_mon, NULL);\n \n- engine_add_input(&en_ic, &en_nb_logical_router, NULL);\n- engine_add_input(&en_ic, &en_nb_logical_router_port, NULL);\n- engine_add_input(&en_ic, &en_nb_logical_switch, NULL);\n- engine_add_input(&en_ic, &en_nb_logical_switch_port, NULL);\n-\n- engine_add_input(&en_ic, &en_sb_chassis, NULL);\n- engine_add_input(&en_ic, &en_sb_encap, NULL);\n- engine_add_input(&en_ic, &en_sb_datapath_binding, NULL);\n-\n- engine_add_input(&en_ic, &en_icsb_ic_sb_global, NULL);\n- engine_add_input(&en_ic, &en_icsb_availability_zone, NULL);\n-\n struct engine_arg engine_arg = {\n .nb_idl = nb->idl,\n .sb_idl = sb->idl,\ndiff --git a/ic/ovn-ic.c b/ic/ovn-ic.c\nindex 3406c4d5d..35e4a80ba 100644\n--- a/ic/ovn-ic.c\n+++ b/ic/ovn-ic.c\n@@ -20,32 +20,19 @@\n #include <stdlib.h>\n #include <stdio.h>\n \n-#include \"bitmap.h\"\n #include \"command-line.h\"\n #include \"daemon.h\"\n-#include \"dirs.h\"\n-#include \"openvswitch/dynamic-string.h\"\n #include \"fatal-signal.h\"\n-#include \"hash.h\"\n-#include \"openvswitch/hmap.h\"\n #include \"lib/ovn-ic-nb-idl.h\"\n #include \"lib/ovn-ic-sb-idl.h\"\n #include \"lib/ovn-nb-idl.h\"\n #include \"lib/ovn-sb-idl.h\"\n-#include \"lib/ovn-util.h\"\n #include \"memory.h\"\n #include \"openvswitch/poll-loop.h\"\n-#include \"ovsdb-idl.h\"\n #include \"simap.h\"\n-#include \"smap.h\"\n-#include \"sset.h\"\n #include \"stream.h\"\n #include \"stream-ssl.h\"\n-#include \"unixctl.h\"\n-#include \"util.h\"\n-#include \"uuid.h\"\n #include \"openvswitch/vlog.h\"\n-#include \"vec.h\"\n #include \"inc-proc-ic.h\"\n #include \"ovn-ic.h\"\n #include \"stopwatch-names.h\"\n@@ -358,13 +345,6 @@ inc_proc_graph_dump(const char *end_node)\n ovsdb_idl_loop_destroy(&ovnisb_idl_loop);\n }\n \n-void\n-ovn_db_run(struct ic_input *input_data OVS_UNUSED,\n- struct ic_data *ic_data OVS_UNUSED,\n- struct engine_context *eng_ctx OVS_UNUSED)\n-{\n-\n-}\n \f\n static void\n parse_options(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)\n@@ -765,7 +745,6 @@ main(int argc, char *argv[])\n ovn_conn_show, ovnisb_idl_loop.idl);\n \n stopwatch_create(OVN_IC_LOOP_STOPWATCH_NAME, SW_MS);\n- stopwatch_create(IC_OVN_DB_RUN_STOPWATCH_NAME, SW_MS);\n stopwatch_create(OVN_IC_ENUM_DATAPATHS_RUN_STOPWATCH_NAME, SW_MS);\n stopwatch_create(OVN_IC_PORT_BINDING_RUN_STOPWATCH_NAME, SW_MS);\n stopwatch_create(OVN_IC_ROUTE_RUN_STOPWATCH_NAME, SW_MS);\ndiff --git a/ic/ovn-ic.h b/ic/ovn-ic.h\nindex f60e218f6..7cb346c7d 100644\n--- a/ic/ovn-ic.h\n+++ b/ic/ovn-ic.h\n@@ -18,42 +18,6 @@\n #include \"unixctl.h\"\n #include \"lib/inc-proc-eng.h\"\n \n-struct ic_input {\n- /* Northbound table references */\n- const struct nbrec_logical_switch_table *nbrec_logical_switch_table;\n- const struct nbrec_logical_router_table *nbrec_logical_router_table;\n-\n- /* Southbound table references */\n- const struct sbrec_chassis_table *sbrec_chassis_table;\n- const struct sbrec_sb_global_table *sbrec_sb_global_table;\n-\n- /* InterconnectNorthbound table references */\n- const struct icnbrec_transit_switch_table *icnbrec_transit_switch_table;\n-\n- /* InterconnectSouthbound table references */\n- const struct icsbrec_encap_table *icsbrec_encap_table;\n- const struct icsbrec_ic_sb_global_table *icsbrec_ic_sb_global_table;\n- const struct icsbrec_datapath_binding_table\n- *icsbrec_datapath_binding_table;\n- const struct icsbrec_availability_zone_table\n- *icsbrec_availability_zone_table;\n-\n- /* Indexes */\n- const struct icsbrec_availability_zone *runned_az;\n- struct ovsdb_idl_index *nbrec_ls_by_name;\n- struct ovsdb_idl_index *nbrec_lr_by_name;\n- struct ovsdb_idl_index *nbrec_lrp_by_name;\n- struct ovsdb_idl_index *nbrec_port_by_name;\n- struct ovsdb_idl_index *sbrec_chassis_by_name;\n- struct ovsdb_idl_index *sbrec_port_binding_by_name;\n-};\n-\n-struct ic_data {\n- /* Global state for 'en-enum-datapaths'. */\n- struct hmap *dp_tnlids;\n- struct shash *isb_ts_dps;\n- struct shash *isb_tr_dps;\n-};\n struct ic_state {\n bool had_lock;\n bool paused;\n@@ -84,7 +48,5 @@ enum ic_port_binding_type\n const struct icsbrec_availability_zone *\n az_run(struct ovsdb_idl *ovnnb_idl, struct ovsdb_idl *ovnisb_idl,\n struct ovsdb_idl_txn *ovnisb_idl_txn);\n-void ovn_db_run(struct ic_input *input_data, struct ic_data *ic_data,\n- struct engine_context *eng_ctx);\n \n #endif /* OVN_IC_H */\ndiff --git a/lib/stopwatch-names.h b/lib/stopwatch-names.h\nindex ec4edf83c..b3f8dd1f5 100644\n--- a/lib/stopwatch-names.h\n+++ b/lib/stopwatch-names.h\n@@ -41,7 +41,6 @@\n #define GROUP_ECMP_ROUTE_RUN_STOPWATCH_NAME \"group_ecmp_route\"\n \n #define OVN_IC_LOOP_STOPWATCH_NAME \"ovn-ic-loop\"\n-#define IC_OVN_DB_RUN_STOPWATCH_NAME \"ovn_db_run\"\n #define OVN_IC_GATEWAY_RUN_STOPWATCH_NAME \"gateway_run\"\n #define OVN_IC_ENUM_DATAPATHS_RUN_STOPWATCH_NAME \"enum_datapaths_run\"\n #define OVN_IC_TRANSIT_SWITCH_RUN_STOPWATCH_NAME \"transit_switch_run\"\n", "prefixes": [ "ovs-dev", "v0", "9/9" ] }