mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-23 01:21:31 +01:00
Code Issues Projects Releases Wiki Activity

ofctl_v1_0/2/3: check lock timeout by lock.is_set().

Browse Source 
send_stats_request never catches hub.Timeout exception because it
has been caught by the event wait function itself.

Signed-off-by: Wei-Li Tang <alextwl@xinguard.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Wei-Li Tang 2014-10-08 19:24:28 +08:00 committed by FUJITA Tomonori
parent 39f06bff87
commit bcc2c13484
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ryu/lib/ofctl_v1_0.py
View File

@ -201,9 +201,8 @@ def send_stats_request(dp, stats, waiters, msgs):
waiters_per_dp[stats.xid] = (lock, msgs)
dp.send_msg(stats)
try:
lock.wait(timeout=DEFAULT_TIMEOUT)
except hub.Timeout:
lock.wait(timeout=DEFAULT_TIMEOUT)
if not lock.is_set():
del waiters_per_dp[stats.xid]

5
ryu/lib/ofctl_v1_2.py
View File

@ -543,9 +543,8 @@ def send_stats_request(dp, stats, waiters, msgs):
waiters_per_dp[stats.xid] = (lock, msgs)
dp.send_msg(stats)
try:
lock.wait(timeout=DEFAULT_TIMEOUT)
except hub.Timeout:
lock.wait(timeout=DEFAULT_TIMEOUT)
if not lock.is_set():
del waiters_per_dp[stats.xid]

5
ryu/lib/ofctl_v1_3.py
View File

@ -571,9 +571,8 @@ def send_stats_request(dp, stats, waiters, msgs):
waiters_per_dp[stats.xid] = (lock, msgs)
dp.send_msg(stats)
try:
lock.wait(timeout=DEFAULT_TIMEOUT)
except hub.Timeout:
lock.wait(timeout=DEFAULT_TIMEOUT)
if not lock.is_set():
del waiters_per_dp[stats.xid]