/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "rconn.h"
#include "sat-math.h"
#include "timeval.h"
-#include "token-bucket.h"
-#include "vconn.h"
+#include "openvswitch/token-bucket.h"
+#include "openvswitch/vconn.h"
struct pinqueue {
struct hmap_node node; /* In struct pinsched's 'queues' hmap. */
- ofp_port_t port_no; /* Port number. */
- struct list packets; /* Contains "struct ofpbuf"s. */
+ ofp_port_t port_no; /* Port number. */
+ struct ovs_list packets; /* Contains "struct ofpbuf"s. */
int n; /* Number of packets in 'packets'. */
};
/* One queue per physical port. */
struct hmap queues; /* Contains "struct pinqueue"s. */
- int n_queued; /* Sum over queues[*].n. */
+ unsigned int n_queued; /* Sum over queues[*].n. */
struct pinqueue *next_txq; /* Next pinqueue check in round-robin. */
- /* Transmission queue. */
- int n_txq; /* No. of packets waiting in rconn for tx. */
-
/* Statistics reporting. */
unsigned long long n_normal; /* # txed w/o rate limit queuing. */
unsigned long long n_limited; /* # queued for rate limiting. */
static struct pinqueue *
pinqueue_get(struct pinsched *ps, ofp_port_t port_no)
{
- uint32_t hash = hash_int(ofp_to_u16(port_no), 0);
+ uint32_t hash = hash_ofp_port(port_no);
struct pinqueue *q;
HMAP_FOR_EACH_IN_BUCKET (q, node, hash, &ps->queues) {
void
pinsched_send(struct pinsched *ps, ofp_port_t port_no,
- struct ofpbuf *packet, pinsched_tx_cb *cb, void *aux)
+ struct ofpbuf *packet, struct ovs_list *txq)
{
+ list_init(txq);
if (!ps) {
- cb(packet, aux);
+ list_push_back(txq, &packet->list_node);
} else if (!ps->n_queued && get_token(ps)) {
/* In the common case where we are not constrained by the rate limit,
* let the packet take the normal path. */
ps->n_normal++;
- cb(packet, aux);
+ list_push_back(txq, &packet->list_node);
} else {
/* Otherwise queue it up for the periodic callback to drain out. */
- struct pinqueue *q;
-
- /* We might be called with a buffer obtained from dpif_recv() that has
- * much more allocated space than actual content most of the time.
- * Since we're going to store the packet for some time, free up that
- * otherwise wasted space. */
- ofpbuf_trim(packet);
-
if (ps->n_queued * 1000 >= ps->token_bucket.burst) {
drop_packet(ps);
}
- q = pinqueue_get(ps, port_no);
+
+ struct pinqueue *q = pinqueue_get(ps, port_no);
list_push_back(&q->packets, &packet->list_node);
q->n++;
ps->n_queued++;
}
void
-pinsched_run(struct pinsched *ps, pinsched_tx_cb *cb, void *aux)
+pinsched_run(struct pinsched *ps, struct ovs_list *txq)
{
+ list_init(txq);
if (ps) {
int i;
/* Drain some packets out of the bucket if possible, but limit the
* number of iterations to allow other code to get work done too. */
for (i = 0; ps->n_queued && get_token(ps) && i < 50; i++) {
- cb(get_tx_packet(ps), aux);
+ struct ofpbuf *packet = get_tx_packet(ps);
+ list_push_back(txq, &packet->list_node);
}
}
}
hmap_init(&ps->queues);
ps->n_queued = 0;
ps->next_txq = NULL;
- ps->n_txq = 0;
ps->n_normal = 0;
ps->n_limited = 0;
ps->n_queue_dropped = 0;
}
}
-/* Returns the number of packets scheduled to be sent eventually by 'ps'.
- * Returns 0 if 'ps' is null. */
-unsigned int
-pinsched_count_txqlen(const struct pinsched *ps)
+/* Retrieves statistics for 'ps'. The statistics will be all zero if 'ps' is
+ * null. */
+void
+pinsched_get_stats(const struct pinsched *ps, struct pinsched_stats *stats)
{
- return ps ? ps->n_txq : 0;
+ if (ps) {
+ stats->n_queued = ps->n_queued;
+ stats->n_normal = ps->n_normal;
+ stats->n_limited = ps->n_limited;
+ stats->n_queue_dropped = ps->n_queue_dropped;
+ } else {
+ memset(stats, 0, sizeof *stats);
+ }
}