mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

vswitch: Use ovsrec_qos_get_queues() to avoid open-coding binary search.

Browse Source 
Surely this is a better approach.
This commit is contained in:
Ben Pfaff
2010-06-17 15:43:27 -07:00
parent a6ec908966
commit 44fca7f99d
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vswitchd/bridge.c
View File

@@ -3754,27 +3754,16 @@ shash_from_ovs_idl_map(char **keys, char **values, size_t n,
struct iface_delete_queues_cbdata { struct iface_delete_queues_cbdata {
struct netdev *netdev; struct netdev *netdev;
const int64_t *queue_ids; const struct ovsdb_datum *queues;
size_t n_queue_ids;
}; };
static bool static bool
queue_ids_include(const int64_t *ids, size_t n, int64_t target) queue_ids_include(const struct ovsdb_datum *queues, int64_t target)
{ {
size_t low = 0; union ovsdb_atom atom;
size_t high = n;
while (low < high) { atom.integer = target;
size_t mid = low + (high - low) / 2; return ovsdb_datum_find_key(queues, &atom, OVSDB_TYPE_INTEGER) != UINT_MAX;
if (target > ids[mid]) {
high = mid;
} else if (target < ids[mid]) {
low = mid + 1;
} else {
return true;
}
}
return false;
} }
static void static void
@@ -3783,7 +3772,7 @@ iface_delete_queues(unsigned int queue_id,
{ {
struct iface_delete_queues_cbdata *cbdata = cbdata_; struct iface_delete_queues_cbdata *cbdata = cbdata_;
if (!queue_ids_include(cbdata->queue_ids, cbdata->n_queue_ids, queue_id)) { if (!queue_ids_include(cbdata->queues, queue_id)) {
netdev_delete_queue(cbdata->netdev, queue_id); netdev_delete_queue(cbdata->netdev, queue_id);
} }
} }
@@ -3806,8 +3795,8 @@ iface_update_qos(struct iface *iface, const struct ovsrec_qos *qos)
/* Deconfigure queues that were deleted. */ /* Deconfigure queues that were deleted. */
cbdata.netdev = iface->netdev; cbdata.netdev = iface->netdev;
cbdata.queue_ids = qos->key_queues; cbdata.queues = ovsrec_qos_get_queues(qos, OVSDB_TYPE_INTEGER,
cbdata.n_queue_ids = qos->n_queues; OVSDB_TYPE_UUID);
netdev_dump_queues(iface->netdev, iface_delete_queues, &cbdata); netdev_dump_queues(iface->netdev, iface_delete_queues, &cbdata);
/* Configure queues for 'iface'. */ /* Configure queues for 'iface'. */