Re: [ovs-dev] [PATCH 2/2] ovn-trace: Include source file and line number reference in output.

[Ben Pfaff]

On Fri, Oct 07, 2016 at 02:39:00PM -0700, Andy Zhou wrote:
> On Fri, Oct 7, 2016 at 10:02 AM, Ben Pfaff  wrote:
> 
> > This should make it that much easier to track down the code that emitted
> > a particular flow.
> >
> > Signed-off-by: Ben Pfaff 
> >
> 
>  Acked-by: Andy Zhou 
> 
> Also tested in the OVN sandbox.

Thanks, I applied both of these to master.
___
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Re: [ovs-dev] [PATCH 2/2] ovn-trace: Include source file and line number reference in output.

[Andy Zhou]

On Fri, Oct 7, 2016 at 10:02 AM, Ben Pfaff  wrote:

> This should make it that much easier to track down the code that emitted
> a particular flow.
>
> Signed-off-by: Ben Pfaff 
>

 Acked-by: Andy Zhou 

Also tested in the OVN sandbox.
___
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

[ovs-dev] [PATCH 2/2] ovn-trace: Include source file and line number reference in output.

[Ben Pfaff]

This should make it that much easier to track down the code that emitted
a particular flow.

Signed-off-by: Ben Pfaff 
---
 ovn/northd/ovn-northd.c   | 40 +++-
 ovn/ovn-sb.xml|  5 +
 ovn/utilities/ovn-trace.8.xml |  7 ---
 ovn/utilities/ovn-trace.c |  9 -
 4 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
index 2e79156..281dc62 100644
--- a/ovn/northd/ovn-northd.c
+++ b/ovn/northd/ovn-northd.c
@@ -1635,6 +1635,7 @@ struct ovn_lflow {
 uint16_t priority;
 char *match;
 char *actions;
+const char *where;
 };
 
 static size_t
@@ -1658,30 +1659,36 @@ ovn_lflow_equal(const struct ovn_lflow *a, const struct 
ovn_lflow *b)
 
 static void
 ovn_lflow_init(struct ovn_lflow *lflow, struct ovn_datapath *od,
-  enum ovn_stage stage, uint16_t priority,
-  char *match, char *actions)
+   enum ovn_stage stage, uint16_t priority,
+   char *match, char *actions, const char *where)
 {
 lflow->od = od;
 lflow->stage = stage;
 lflow->priority = priority;
 lflow->match = match;
 lflow->actions = actions;
+lflow->where = where;
 }
 
 /* Adds a row with the specified contents to the Logical_Flow table. */
 static void
-ovn_lflow_add(struct hmap *lflow_map, struct ovn_datapath *od,
-  enum ovn_stage stage, uint16_t priority,
-  const char *match, const char *actions)
+ovn_lflow_add_at(struct hmap *lflow_map, struct ovn_datapath *od,
+ enum ovn_stage stage, uint16_t priority,
+ const char *match, const char *actions, const char *where)
 {
 ovs_assert(ovn_stage_to_datapath_type(stage) == ovn_datapath_get_type(od));
 
 struct ovn_lflow *lflow = xmalloc(sizeof *lflow);
 ovn_lflow_init(lflow, od, stage, priority,
-   xstrdup(match), xstrdup(actions));
+   xstrdup(match), xstrdup(actions), where);
 hmap_insert(lflow_map, >hmap_node, ovn_lflow_hash(lflow));
 }
 
+/* Adds a row with the specified contents to the Logical_Flow table. */
+#define ovn_lflow_add(LFLOW_MAP, OD, STAGE, PRIORITY, MATCH, ACTIONS) \
+ovn_lflow_add_at(LFLOW_MAP, OD, STAGE, PRIORITY, MATCH, ACTIONS,  \
+ OVS_SOURCE_LOCATOR)
+
 static struct ovn_lflow *
 ovn_lflow_find(struct hmap *lflows, struct ovn_datapath *od,
enum ovn_stage stage, uint16_t priority,
@@ -1689,7 +1696,8 @@ ovn_lflow_find(struct hmap *lflows, struct ovn_datapath 
*od,
 {
 struct ovn_lflow target;
 ovn_lflow_init(, od, stage, priority,
-   CONST_CAST(char *, match), CONST_CAST(char *, actions));
+   CONST_CAST(char *, match), CONST_CAST(char *, actions),
+   NULL);
 
 struct ovn_lflow *lflow;
 HMAP_FOR_EACH_WITH_HASH (lflow, hmap_node, ovn_lflow_hash(),
@@ -4337,8 +4345,22 @@ build_lflows(struct northd_context *ctx, struct hmap 
*datapaths,
 sbrec_logical_flow_set_match(sbflow, lflow->match);
 sbrec_logical_flow_set_actions(sbflow, lflow->actions);
 
-const struct smap ids = SMAP_CONST1(, "stage-name",
-ovn_stage_to_str(lflow->stage));
+/* Trim the source locator lflow->where, which looks something like
+ * "ovn/northd/ovn-northd.c:1234", down to just the part following the
+ * last slash, e.g. "ovn-northd.c:1234". */
+const char *slash = strrchr(lflow->where, '/');
+#if _WIN32
+const char *backslash = strrchr(lflow->where, '\\');
+if (!slash || backslash > slash) {
+slash = backslash;
+}
+#endif
+const char *where = slash ? slash + 1 : lflow->where;
+
+const struct smap ids = SMAP_CONST2(
+,
+"stage-name", ovn_stage_to_str(lflow->stage),
+"source", where);
 sbrec_logical_flow_set_external_ids(sbflow, );
 
 ovn_lflow_destroy(, lflow);
diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml
index 61b0f52..b484f59 100644
--- a/ovn/ovn-sb.xml
+++ b/ovn/ovn-sb.xml
@@ -1455,6 +1455,11 @@ tcp.flags = RST;
   Human-readable name for this flow's stage in the pipeline.
 
 
+
+  Source file and line number of the code that added this flow to the
+  pipeline.
+
+
 
   The overall purpose of these columns is described under Common
   Columns at the beginning of this document.
diff --git a/ovn/utilities/ovn-trace.8.xml b/ovn/utilities/ovn-trace.8.xml
index 747e130..92dcb17 100644
--- a/ovn/utilities/ovn-trace.8.xml
+++ b/ovn/utilities/ovn-trace.8.xml
@@ -114,9 +114,10 @@
   
 The detailed form of output is also the default form.  This form groups
 output into sections headed up by the ingress or egress pipeline being
-traversed.  Each pipeline lists each table that was visited (by number
-and name), the match expression and