Rename struct queue to struct ofp_queue.

Fixes namespace conflict for partner development.

diff --git a/include/queue.h b/include/queue.h
index cecc15d..8221c44 100644 (file)
--- a/include/queue.h
+++ b/include/queue.h
@@ -35,17 +35,17 @@
 #define QUEUE_H 1
 
 /* Packet queue. */
-struct queue {
+struct ofp_queue {
     int n;                      /* Number of queued packets. */
     struct ofpbuf *head;        /* First queued packet, null if n == 0. */
     struct ofpbuf *tail;        /* Last queued packet, null if n == 0. */
 };
 
-void queue_init(struct queue *);
-void queue_destroy(struct queue *);
-void queue_clear(struct queue *);
-void queue_advance_head(struct queue *, struct ofpbuf *next);
-void queue_push_tail(struct queue *, struct ofpbuf *);
-struct ofpbuf *queue_pop_head(struct queue *);
+void queue_init(struct ofp_queue *);
+void queue_destroy(struct ofp_queue *);
+void queue_clear(struct ofp_queue *);
+void queue_advance_head(struct ofp_queue *, struct ofpbuf *next);
+void queue_push_tail(struct ofp_queue *, struct ofpbuf *);
+struct ofpbuf *queue_pop_head(struct ofp_queue *);
 
 #endif /* queue.h */

diff --git a/lib/queue.c b/lib/queue.c
index 33acc7e..04610cf 100644 (file)
--- a/lib/queue.c
+++ b/lib/queue.c
@@ -36,11 +36,11 @@
 #include <assert.h>
 #include "ofpbuf.h"
 
-static void check_queue(struct queue *q);
+static void check_queue(struct ofp_queue *q);
 
 /* Initializes 'q' as an empty packet queue. */
 void
-queue_init(struct queue *q)
+queue_init(struct ofp_queue *q)
 {
     q->n = 0;
     q->head = NULL;
@@ -49,7 +49,7 @@ queue_init(struct queue *q)
 
 /* Destroys 'q' and all of the packets that it contains. */
 void
-queue_destroy(struct queue *q)
+queue_destroy(struct ofp_queue *q)
 {
     struct ofpbuf *cur, *next;
     for (cur = q->head; cur != NULL; cur = next) {
@@ -60,7 +60,7 @@ queue_destroy(struct queue *q)
 
 /* Removes and destroys all of the packets in 'q', rendering it empty. */
 void
-queue_clear(struct queue *q)
+queue_clear(struct ofp_queue *q)
 {
     queue_destroy(q);
     queue_init(q);
@@ -73,7 +73,7 @@ queue_clear(struct queue *q)
  * passed to a function for possible consumption (and destruction) and only
  * dropped from the queue if that function actually accepts it. */
 void
-queue_advance_head(struct queue *q, struct ofpbuf *next)
+queue_advance_head(struct ofp_queue *q, struct ofpbuf *next)
 {
     assert(q->n);
     assert(q->head);
@@ -86,7 +86,7 @@ queue_advance_head(struct queue *q, struct ofpbuf *next)
 
 /* Appends 'b' to the tail of 'q'. */
 void
-queue_push_tail(struct queue *q, struct ofpbuf *b)
+queue_push_tail(struct ofp_queue *q, struct ofpbuf *b)
 {
     check_queue(q);
 
@@ -105,7 +105,7 @@ queue_push_tail(struct queue *q, struct ofpbuf *b)
  * it.  The caller must free the buffer (with ofpbuf_delete()) when it is no
  * longer needed. */
 struct ofpbuf *
-queue_pop_head(struct queue *q)
+queue_pop_head(struct ofp_queue *q)
 {
     struct ofpbuf *head = q->head;
     queue_advance_head(q, head->next);
@@ -114,7 +114,7 @@ queue_pop_head(struct queue *q)
 
 /* Checks the internal integrity of 'q'.  For use in debugging. */
 static void
-check_queue(struct queue *q)
+check_queue(struct ofp_queue *q)
 {
 #if 0
     struct ofpbuf *iter;

diff --git a/lib/rconn.c b/lib/rconn.c
index 3fce80e..ceeb137 100644 (file)
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -83,7 +83,7 @@ struct rconn {
     char *name;
     bool reliable;
 
-    struct queue txq;
+    struct ofp_queue txq;
 
     int backoff;
     int max_backoff;

diff --git a/secchan/secchan.c b/secchan/secchan.c
index 42e99da..d1df828 100644 (file)
--- a/secchan/secchan.c
+++ b/secchan/secchan.c
@@ -810,7 +810,7 @@ struct rate_limiter {
     struct rconn *remote_rconn;
 
     /* One queue per physical port. */
-    struct queue queues[OFPP_MAX];
+    struct ofp_queue queues[OFPP_MAX];
     int n_queued;               /* Sum over queues[*].n. */
     int next_tx_port;           /* Next port to check in round-robin. */
 
@@ -837,9 +837,9 @@ struct rate_limiter {
 static void
 drop_packet(struct rate_limiter *rl)
 {
-    struct queue *longest;      /* Queue currently selected as longest. */
+    struct ofp_queue *longest;  /* Queue currently selected as longest. */
     int n_longest;              /* # of queues of same length as 'longest'. */
-    struct queue *q;
+    struct ofp_queue *q;
 
     longest = &rl->queues[0];
     n_longest = 1;
@@ -871,7 +871,7 @@ dequeue_packet(struct rate_limiter *rl)
 
     for (i = 0; i < OFPP_MAX; i++) {
         unsigned int port = (rl->next_tx_port + i) % OFPP_MAX;
-        struct queue *q = &rl->queues[port];
+        struct ofp_queue *q = &rl->queues[port];
         if (q->n) {
             rl->next_tx_port = (port + 1) % OFPP_MAX;
             rl->n_queued--;