mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-17 14:28:02 +00:00
Code Issues Releases Wiki Activity

reconnect: Get rid of unused state.

Browse Source 
Nothing ever caused the reconnect FSM to transition to the S_START_CONNECT
state, so we might as well get rid of the code for it.
This commit is contained in:
Ben Pfaff
2010-03-23 14:01:54 -07:00
parent ba104a1e39
commit 024b7728cc
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/reconnect.c
View File

@@ -28,7 +28,6 @@
#define STATES \ #define STATES \
STATE(VOID, 1 << 0) \ STATE(VOID, 1 << 0) \
STATE(BACKOFF, 1 << 1) \ STATE(BACKOFF, 1 << 1) \
STATE(START_CONNECT, 1 << 2) \
STATE(CONNECT_IN_PROGRESS, 1 << 3) \ STATE(CONNECT_IN_PROGRESS, 1 << 3) \
STATE(ACTIVE, 1 << 4) \ STATE(ACTIVE, 1 << 4) \
STATE(IDLE, 1 << 5) \ STATE(IDLE, 1 << 5) \
@@ -260,8 +259,7 @@ reconnect_disable(struct reconnect *fsm, long long int now)
void void
reconnect_force_reconnect(struct reconnect *fsm, long long int now) reconnect_force_reconnect(struct reconnect *fsm, long long int now)
{ {
if (fsm->state & (S_START_CONNECT | S_CONNECT_IN_PROGRESS if (fsm->state & (S_CONNECT_IN_PROGRESS | S_ACTIVE | S_IDLE)) {
| S_ACTIVE | S_IDLE)) {
reconnect_transition__(fsm, now, S_RECONNECT); reconnect_transition__(fsm, now, S_RECONNECT);
} }
} }
@@ -402,7 +400,6 @@ reconnect_deadline__(const struct reconnect *fsm)
case S_BACKOFF: case S_BACKOFF:
return fsm->state_entered + fsm->backoff; return fsm->state_entered + fsm->backoff;
case S_START_CONNECT:
case S_CONNECT_IN_PROGRESS: case S_CONNECT_IN_PROGRESS:
return fsm->state_entered + MAX(1000, fsm->backoff); return fsm->state_entered + MAX(1000, fsm->backoff);
@@ -460,7 +457,6 @@ reconnect_run(struct reconnect *fsm, long long int now)
case S_BACKOFF: case S_BACKOFF:
return RECONNECT_CONNECT; return RECONNECT_CONNECT;
case S_START_CONNECT:
case S_CONNECT_IN_PROGRESS: case S_CONNECT_IN_PROGRESS:
return RECONNECT_DISCONNECT; return RECONNECT_DISCONNECT;
@@ -482,7 +478,7 @@ reconnect_run(struct reconnect *fsm, long long int now)
NOT_REACHED(); NOT_REACHED();
} else { } else {
return fsm->state == S_START_CONNECT ? RECONNECT_CONNECT : 0; return 0;
} }
} }