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

dpif: Make dpif_flow_dump_next() thread-safe.

Browse Source 
This patch makes it the caller's responsibility to initialize a
per-thread 'state' object and pass it down to the dpif_flow_dump_next()
implementation. The implementation can expect to be called from multiple
threads with the same 'iter' and different 'state' objects.

When flow_dump_next() returns non-zero, the implementation must ensure
that subsequent calls with the same arguments also return non-zero.
Subsequent calls with the same 'iter' and different 'state' may return
zero, but should make progress towards returning non-zero.

Signed-off-by: Joe Stringer <joestringer@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Joe Stringer
2014-02-27 14:13:08 -08:00
committed by Ben Pfaff
parent e723fd32d5
commit d2ad7ef178
8 changed files with 99 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/dpif.c
View File

@@ -992,12 +992,17 @@ dpif_flow_dump_start(struct dpif_flow_dump *dump, const struct dpif *dpif)
log_operation(dpif, "flow_dump_start", dump->error);
}
/* Attempts to retrieve another flow from 'dump', which must have been
* initialized with dpif_flow_dump_start(). On success, updates the output
* parameters as described below and returns true. Otherwise, returns false.
* Failure might indicate an actual error or merely the end of the flow table.
* An error status for the entire dump operation is provided when it is
* completed by calling dpif_flow_dump_done().
/* Attempts to retrieve another flow from 'dump', using 'state' for
* thread-local storage. 'dump' must have been initialized with
* dpif_flow_dump_start(), and 'state' must have been initialized with
* dpif_flow_state_init().
*
* On success, updates the output parameters as described below and returns
* true. Otherwise, returns false. Failure might indicate an actual error or
* merely the end of the flow table. An error status for the entire dump
* operation is provided when it is completed by calling dpif_flow_dump_done().
* Multiple threads may use the same 'dump' with this function, but all other
* parameters must not be shared.
*
* On success, if 'key' and 'key_len' are nonnull then '*key' and '*key_len'
* will be set to Netlink attributes with types OVS_KEY_ATTR_* representing the
@@ -1009,9 +1014,9 @@ dpif_flow_dump_start(struct dpif_flow_dump *dump, const struct dpif *dpif)
* All of the returned data is owned by 'dpif', not by the caller, and the
* caller must not modify or free it. 'dpif' guarantees that it remains
* accessible and unchanging until at least the next call to 'flow_dump_next'
* or 'flow_dump_done' for 'dump'. */
* or 'flow_dump_done' for 'dump' and 'state'. */
bool
dpif_flow_dump_next(struct dpif_flow_dump *dump,
dpif_flow_dump_next(struct dpif_flow_dump *dump, void *state,
const struct nlattr **key, size_t *key_len,
const struct nlattr **mask, size_t *mask_len,
const struct nlattr **actions, size_t *actions_len,
@@ -1021,7 +1026,7 @@ dpif_flow_dump_next(struct dpif_flow_dump *dump,
int error = dump->error;
if (!error) {
error = dpif->dpif_class->flow_dump_next(dpif, dump->iter,
error = dpif->dpif_class->flow_dump_next(dpif, dump->iter, state,
key, key_len,
mask, mask_len,
actions, actions_len,