ofproto: Remove ->timeout_mutex from struct rule (just use ->mutex).
authorBen Pfaff <blp@nicira.com>
Wed, 11 Sep 2013 04:18:09 +0000 (21:18 -0700)
committerBen Pfaff <blp@nicira.com>
Fri, 13 Sep 2013 00:43:57 +0000 (17:43 -0700)
commitd10976b78206d35b446da2d32e210f57e1ea02b9
tree0b6dbf226b36342fc3286592f2306b1732d2534c
parentc7c9a7c8ba4bb5b77d1e2f60975317aa8b3d252e
ofproto: Remove ->timeout_mutex from struct rule (just use ->mutex).

I think that ->timeout_mutex and ->mutex were separate because the latter
(which was actually a rwlock named ->rwlock until recently) was held for
long periods of time, which meant that having a separate ->timeout_mutex
reduced lock contention.  But ->mutex is now only held briefly, so it seems
reasonable to just use it.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
ofproto/connmgr.c
ofproto/ofproto-dpif.c
ofproto/ofproto-provider.h
ofproto/ofproto.c