mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +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

19
lib/dpif-linux.c
View File

@@ -1000,7 +1000,7 @@ struct dpif_linux_flow_state {
struct dpif_linux_flow_iter {
struct nl_dump dump;
void *state;
atomic_int status;
};
static void
@@ -1041,21 +1041,20 @@ dpif_linux_flow_dump_start(const struct dpif *dpif_, void **iterp)
dpif_linux_flow_to_ofpbuf(&request, buf);
nl_dump_start(&iter->dump, NETLINK_GENERIC, buf);
ofpbuf_delete(buf);
dpif_linux_flow_dump_state_init(&iter->state);
atomic_init(&iter->status, 0);
return 0;
}
static int
dpif_linux_flow_dump_next(const struct dpif *dpif_, void *iter_,
dpif_linux_flow_dump_next(const struct dpif *dpif_, void *iter_, 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,
const struct dpif_flow_stats **stats)
{
struct dpif_linux_flow_iter *iter = iter_;
struct dpif_linux_flow_state *state = iter->state;
struct dpif_linux_flow_state *state = state_;
struct ofpbuf buf;
int error;
@@ -1069,6 +1068,7 @@ dpif_linux_flow_dump_next(const struct dpif *dpif_, void *iter_,
error = dpif_linux_flow_from_ofpbuf(&state->flow, &buf);
if (error) {
atomic_store(&iter->status, error);
return error;
}
@@ -1108,10 +1108,13 @@ static int
dpif_linux_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *iter_)
{
struct dpif_linux_flow_iter *iter = iter_;
int error = nl_dump_done(&iter->dump);
dpif_linux_flow_dump_state_uninit(iter->state);
int dump_status;
unsigned int nl_status = nl_dump_done(&iter->dump);
atomic_read(&iter->status, &dump_status);
atomic_destroy(&iter->status);
free(iter);
return error;
return dump_status ? dump_status : nl_status;
}
static void