#include "ofp-print.h"
#include "openflow.h"
#include "poll-loop.h"
+#include "queue.h"
#include "time.h"
#include "util.h"
#include "vconn-ssl.h"
uint64_t datapath_id;
time_t last_control_hello;
- int n_txq;
- struct buffer *txq, *tx_tail;
+ struct queue txq;
};
/* -H, --hub: Use dumb hub instead of learning switch? */
}
} else {
vconn_recv_wait(this->vconn);
- if (this->n_txq) {
+ if (this->txq.n) {
vconn_send_wait(this->vconn);
}
}
do_switch_send(struct switch_ *this)
{
int retval = 0;
- if (this->n_txq) {
- struct buffer *next = this->txq->next;
-
- retval = vconn_send(this->vconn, this->txq);
+ if (this->txq.n) {
+ struct buffer *next = this->txq.head->next;
+ retval = vconn_send(this->vconn, this->txq.head);
if (retval) {
return retval;
}
-
- this->txq = next;
- if (this->txq == NULL) {
- this->tx_tail = NULL;
- }
- this->n_txq--;
+ queue_advance_head(&this->txq, next);
return 0;
}
return EAGAIN;
memset(this, 0, sizeof *this);
this->name = xstrdup(name);
this->vconn = vconn;
- this->n_txq = 0;
- this->txq = NULL;
- this->tx_tail = NULL;
+ queue_init(&this->txq);
this->last_control_hello = 0;
if (!vconn_is_passive(vconn)) {
send_control_hello(this);
close_switch(struct switch_ *this)
{
if (this) {
- struct buffer *cur, *next;
-
free(this->name);
vconn_close(this->vconn);
- for (cur = this->txq; cur != NULL; cur = next) {
- next = cur->next;
- buffer_delete(cur);
- }
+ queue_destroy(&this->txq);
free(this);
}
}
}
}
-static void
-check_txq(struct switch_ *this UNUSED)
-{
-#if 0
- struct buffer *iter;
- size_t n;
-
- assert(this->n_txq == 0
- ? this->txq == NULL && this->tx_tail == NULL
- : this->txq != NULL && this->tx_tail != NULL);
-
- n = 0;
- for (iter = this->txq; iter != NULL; iter = iter->next) {
- n++;
- assert((iter->next != NULL) == (iter != this->tx_tail));
- }
- assert(n == this->n_txq);
-#endif
-}
-
static void
queue_tx(struct switch_ *this, struct buffer *b)
{
- check_txq(this);
-
- b->next = NULL;
- if (this->n_txq++) {
- this->tx_tail->next = b;
- } else {
- this->txq = b;
- }
- this->tx_tail = b;
-
- check_txq(this);
+ queue_push_tail(&this->txq, b);
}
static void
}
if (oh->type == OFPT_PACKET_IN) {
- if (sw->n_txq >= MAX_TXQ) {
+ if (sw->txq.n >= MAX_TXQ) {
+ /* FIXME: ratelimit. */
VLOG_WARN("%s: tx queue overflow", sw->name);
} else if (noflow) {
process_noflow(sw, msg->data);
openflow-netlink.h \
packets.h \
poll-loop.h \
+ queue.h \
socket-util.h \
util.h \
vconn.h \
--- /dev/null
+/* Copyright (C) 2008 Board of Trustees, Leland Stanford Jr. University.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef QUEUE_H
+#define QUEUE_H 1
+
+/* Packet queue. */
+struct queue {
+ int n;
+ struct buffer *head;
+ struct buffer *tail;
+};
+
+void queue_init(struct queue *);
+void queue_destroy(struct queue *);
+void queue_clear(struct queue *);
+void queue_advance_head(struct queue *, struct buffer *next);
+void queue_push_tail(struct queue *, struct buffer *);
+
+#endif /* queue.h */
list.c \
ofp-print.c \
poll-loop.c \
+ queue.c \
socket-util.c \
util.c \
vconn-tcp.c \
--- /dev/null
+/* Copyright (C) 2008 Board of Trustees, Leland Stanford Jr. University.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "queue.h"
+#include <assert.h>
+#include "buffer.h"
+
+static void check_queue(struct queue *q);
+
+void
+queue_init(struct queue *q)
+{
+ q->n = 0;
+ q->head = NULL;
+ q->tail = NULL;
+}
+
+void
+queue_destroy(struct queue *q)
+{
+ struct buffer *cur, *next;
+ for (cur = q->head; cur != NULL; cur = next) {
+ next = cur->next;
+ buffer_delete(cur);
+ }
+}
+
+void
+queue_clear(struct queue *q)
+{
+ queue_destroy(q);
+ queue_init(q);
+}
+
+void
+queue_advance_head(struct queue *q, struct buffer *next)
+{
+ assert(q->n);
+ assert(q->head);
+ q->head = next;
+ if (q->head == NULL) {
+ q->tail = NULL;
+ }
+ q->n--;
+}
+
+void
+queue_push_tail(struct queue *q, struct buffer *b)
+{
+ check_queue(q);
+
+ b->next = NULL;
+ if (q->n++) {
+ q->tail->next = b;
+ } else {
+ q->head = b;
+ }
+ q->tail = b;
+
+ check_queue(q);
+}
+
+static void
+check_queue(struct queue *q)
+{
+#if 0
+ struct buffer *iter;
+ size_t n;
+
+ assert(q->n == 0
+ ? q->head == NULL && q->tail == NULL
+ : q->head != NULL && q->tail != NULL);
+
+ n = 0;
+ for (iter = q->head; iter != NULL; iter = iter->next) {
+ n++;
+ assert((iter->next != NULL) == (iter != q->tail));
+ }
+ assert(n == q->n);
+#endif
+}
git://git.onelab.eu / sliver-openvswitch.git / commitdiff