From c0365fc854ab7ba09b2639ee8e3b63418b3cdf2c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 15 Aug 2013 20:25:44 +0900 Subject: [PATCH] ofproto-dpif: move per-backer wait calls from wait to type_wait move per-backer wait calls (dpif_wait/udpif_wait) from ofproto_wait to ofproto_type_wait. This eliminates excessive poll slot consumption when there is more than one bridge. Signed-off-by: YAMAMOTO Takashi Signed-off-by: Ben Pfaff --- ofproto/ofproto-dpif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 229b16cc7..3bc0e9890 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1051,6 +1051,8 @@ type_wait(const char *type) } timer_wait(&backer->next_expiration); + dpif_wait(backer->dpif); + udpif_wait(backer->udpif); } /* Basic life-cycle. */ @@ -1625,8 +1627,6 @@ wait(struct ofproto *ofproto_) return; } - dpif_wait(ofproto->backer->dpif); - udpif_wait(ofproto->backer->udpif); if (ofproto->sflow) { dpif_sflow_wait(ofproto->sflow); } -- 2.43.0