An upcoming patch will make stats messages much more like other messages,
in that their structures will include all of the headers. This means that
struct ofp_aggregate_stats_reply will no longer be appropriate as a
member of struct nx_aggregate_stats_reply, because it will then include
those additional header members.
Also, struct nx_aggregate_stats_reply doesn't need to use the special
ovs_32aligned_be64 type, since its 64-bit members are correctly aligned,
which is another reasonable reason to keep it separate.
---
include/openflow/nicira-ext.h | 11 ++++-----
lib/ofp-print.c | 4 ++-
ofproto/ofproto.c | 44 +++++++++++++++++++++++++++++-----------
3 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index 738fd90..384b956 100644
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -1329,14 +1329,13 @@ struct nx_aggregate_stats_request {
OFP_ASSERT(sizeof(struct nx_aggregate_stats_request) == 32);
/* Body for nicira_stats_msg reply of type NXST_AGGREGATE (analogous to
- * OFPST_AGGREGATE reply).
- *
- * ofp_aggregate_stats_reply does not contain an ofp_match structure, so we
- * reuse it entirely. (It would be very odd to use OFPST_AGGREGATE to reply to
- * an NXST_AGGREGATE request, so we don't do that.) */
+ * OFPST_AGGREGATE reply). */
struct nx_aggregate_stats_reply {
struct nicira_stats_msg nsm;
- struct ofp_aggregate_stats_reply asr;
+ ovs_be64 packet_count; /* Number of packets in flows. */
+ ovs_be64 byte_count; /* Number of bytes in flows. */
+ ovs_be32 flow_count; /* Number of flows. */
+ uint8_t pad[4]; /* Align to 64 bits. */
};
OFP_ASSERT(sizeof(struct nx_aggregate_stats_reply) == 48);
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 5a430cf..74a47e6 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -1155,7 +1155,9 @@ static void
ofp_print_nxst_aggregate_reply(struct ds *string,
const struct nx_aggregate_stats_reply *nasr)
{
- ofp_print_ofp_aggregate_stats_reply(string, &nasr->asr);
+ ds_put_format(string, " packet_count=%"PRIu64, ntohll(nasr->packet_count));
+ ds_put_format(string, " byte_count=%"PRIu64, ntohll(nasr->byte_count));
+ ds_put_format(string, " flow_count=%"PRIu32, ntohl(nasr->flow_count));
}
static void print_port_stat(struct ds *string, const char *leader,
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 6db3b2c..70bc19e 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2018,7 +2018,8 @@ ofproto_port_get_cfm_fault(const struct ofproto *ofproto,
uint16_t ofp_port)
static void
query_aggregate_stats(struct ofproto *ofproto, struct cls_rule *target,
ovs_be16 out_port, uint8_t table_id,
- struct ofp_aggregate_stats_reply *oasr)
+ uint64_t *total_packetsp, uint64_t *total_bytesp,
+ uint32_t *n_flowsp)
{
uint64_t total_packets = 0;
uint64_t total_bytes = 0;
@@ -2047,10 +2048,9 @@ query_aggregate_stats(struct ofproto *ofproto, struct
cls_rule *target,
}
}
- oasr->flow_count = htonl(n_flows);
- put_32aligned_be64(&oasr->packet_count, htonll(total_packets));
- put_32aligned_be64(&oasr->byte_count, htonll(total_bytes));
- memset(oasr->pad, 0, sizeof oasr->pad);
+ *total_packetsp = total_packets;
+ *total_bytesp = total_bytes;
+ *n_flowsp = n_flows;
}
static int
@@ -2060,31 +2060,44 @@ handle_aggregate_stats_request(struct ofconn *ofconn,
const struct ofp_flow_stats_request *request = ofputil_stats_body(oh);
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
struct ofp_aggregate_stats_reply *reply;
+ uint64_t total_packets, total_bytes;
struct cls_rule target;
struct ofpbuf *msg;
+ uint32_t n_flows;
ofputil_cls_rule_from_match(&request->match, 0, &target);
msg = start_ofp_stats_reply(oh, sizeof *reply);
reply = append_ofp_stats_reply(sizeof *reply, ofconn, &msg);
query_aggregate_stats(ofproto, &target, request->out_port,
- request->table_id, reply);
+ request->table_id,
+ &total_packets, &total_bytes, &n_flows);
+
+ reply->flow_count = htonl(n_flows);
+ put_32aligned_be64(&reply->packet_count, htonll(total_packets));
+ put_32aligned_be64(&reply->byte_count, htonll(total_bytes));
+ memset(reply->pad, 0, sizeof reply->pad);
+
ofconn_send_reply(ofconn, msg);
+
return 0;
}
static int
-handle_nxst_aggregate(struct ofconn *ofconn, const struct ofp_header *oh)
+handle_nxst_aggregate(struct ofconn *ofconn,
+ const struct nx_aggregate_stats_request *nasr)
{
struct ofproto *ofproto = ofconn_get_ofproto(ofconn);
struct nx_aggregate_stats_request *request;
- struct ofp_aggregate_stats_reply *reply;
+ struct nx_aggregate_stats_reply *reply;
+ uint64_t total_packets, total_bytes;
struct cls_rule target;
struct ofpbuf b;
struct ofpbuf *buf;
+ uint32_t n_flows;
int error;
- ofpbuf_use_const(&b, oh, ntohs(oh->length));
+ ofpbuf_use_const(&b, nasr, ntohs(nasr->nsm.header.length));
/* Dissect the message. */
request = ofpbuf_pull(&b, sizeof *request);
@@ -2096,12 +2109,19 @@ handle_nxst_aggregate(struct ofconn *ofconn, const
struct ofp_header *oh)
return ofp_mkerr(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN);
}
+ /* Count statistics. */
+ query_aggregate_stats(ofproto, &target, request->out_port,
+ request->table_id,
+ &total_packets, &total_bytes, &n_flows);
+
/* Reply. */
COVERAGE_INC(ofproto_flows_req);
buf = start_nxstats_reply(&request->nsm, sizeof *reply);
reply = ofpbuf_put_uninit(buf, sizeof *reply);
- query_aggregate_stats(ofproto, &target, request->out_port,
- request->table_id, reply);
+ reply->flow_count = htonl(n_flows);
+ reply->packet_count = htonll(total_packets);
+ reply->byte_count = htonll(total_bytes);
+ memset(reply->pad, 0, sizeof reply->pad);
ofconn_send_reply(ofconn, buf);
return 0;
@@ -2701,7 +2721,7 @@ handle_openflow__(struct ofconn *ofconn, const struct
ofpbuf *msg)
return handle_nxst_flow(ofconn, oh);
case OFPUTIL_NXST_AGGREGATE_REQUEST:
- return handle_nxst_aggregate(ofconn, oh);
+ return handle_nxst_aggregate(ofconn, msg->data);
case OFPUTIL_INVALID:
case OFPUTIL_OFPT_HELLO:
--
1.7.4.4
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
