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 04:26:13 +0000 (21:26 -0700)
commite19ec650faf7777938ab26585ee6e7adfb822483
tree1a666ae2c6cfd2a19e49165fd450c41054704b32
parent5edfae025eccc1cff77e0729a63cddc3541e2fff
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