ofproto-dpif-xlate: Fix clash between macro argument and struct member name.

[cascardo/ovs.git] / ofproto / pinsched.h

diff --git a/ofproto/pinsched.h b/ofproto/pinsched.h
index 8cce1f2..96993df 100644 (file)
--- a/ofproto/pinsched.h
+++ b/ofproto/pinsched.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include "flow.h"
 
-struct list;
+struct ovs_list;
 struct ofpbuf;
 
 struct pinsched *pinsched_create(int rate_limit, int burst_limit);
@@ -29,10 +29,17 @@ void pinsched_get_limits(const struct pinsched *,
 void pinsched_set_limits(struct pinsched *, int rate_limit, int burst_limit);
 void pinsched_destroy(struct pinsched *);
 void pinsched_send(struct pinsched *, ofp_port_t port_no, struct ofpbuf *,
-                   struct list *txq);
-void pinsched_run(struct pinsched *, struct list *txq);
+                   struct ovs_list *txq);
+void pinsched_run(struct pinsched *, struct ovs_list *txq);
 void pinsched_wait(struct pinsched *);
 
-unsigned int pinsched_count_txqlen(const struct pinsched *);
+struct pinsched_stats {
+    unsigned int n_queued;              /* # currently queued to send. */
+    unsigned long long n_normal;        /* # txed w/o rate limit queuing. */
+    unsigned long long n_limited;       /* # queued for rate limiting. */
+    unsigned long long n_queue_dropped; /* # dropped due to queue overflow. */
+};
+
+void pinsched_get_stats(const struct pinsched *, struct pinsched_stats *);
 
 #endif /* pinsched.h */