mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

dpif-netlink: Use dpif logging functions

Browse Source 
Remove redundant logging functions and reuse
the exposed dpif logging functions.

Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Paul Blakey <paulb@mellanox.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
This commit is contained in:
Roi Dayan
2017-06-13 18:03:54 +03:00
committed by Simon Horman
parent eff1e5b091
commit 3cd9988619
1 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/dpif-netlink.c
View File

@@ -2186,32 +2186,6 @@ out:
return err;
}
static void
dbg_print_flow(const struct nlattr *key, size_t key_len,
const struct nlattr *mask, size_t mask_len,
const struct nlattr *actions, size_t actions_len,
const ovs_u128 *ufid,
const char *op)
{
struct ds s;
ds_init(&s);
ds_put_cstr(&s, op);
ds_put_cstr(&s, " (");
odp_format_ufid(ufid, &s);
ds_put_cstr(&s, ")");
if (key_len) {
ds_put_cstr(&s, "\nflow (verbose): ");
odp_flow_format(key, key_len, mask, mask_len, NULL, &s, true);
ds_put_cstr(&s, "\nflow: ");
odp_flow_format(key, key_len, mask, mask_len, NULL, &s, false);
}
ds_put_cstr(&s, "\nactions: ");
format_odp_actions(&s, actions, actions_len);
VLOG_DBG("\n%s", ds_cstr(&s));
ds_destroy(&s);
}
static int
try_send_to_netdev(struct dpif_netlink *dpif, struct dpif_op *op)
{
@@ -2224,9 +2198,8 @@ try_send_to_netdev(struct dpif_netlink *dpif, struct dpif_op *op)
if (!put->ufid) {
break;
}
dbg_print_flow(put->key, put->key_len, put->mask, put->mask_len,
put->actions, put->actions_len, put->ufid,
(put->flags & DPIF_FP_MODIFY ? "PUT(MODIFY)" : "PUT"));
log_flow_put_message(&dpif->dpif, &this_module, put, 0);
err = parse_flow_put(dpif, put);
break;
}
@@ -2236,8 +2209,8 @@ try_send_to_netdev(struct dpif_netlink *dpif, struct dpif_op *op)
if (!del->ufid) {
break;
}
dbg_print_flow(del->key, del->key_len, NULL, 0, NULL, 0,
del->ufid, "DEL");
log_flow_del_message(&dpif->dpif, &this_module, del, 0);
err = netdev_ports_flow_del(DPIF_HMAP_KEY(&dpif->dpif), del->ufid,
del->stats);
break;
@@ -2248,8 +2221,8 @@ try_send_to_netdev(struct dpif_netlink *dpif, struct dpif_op *op)
if (!op->u.flow_get.ufid) {
break;
}
dbg_print_flow(get->key, get->key_len, NULL, 0, NULL, 0,
get->ufid, "GET");
log_flow_get_message(&dpif->dpif, &this_module, get, 0);
err = parse_flow_get(dpif, get);
break;
}