Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Cluster Development (http://www.linux-archive.org/cluster-development/)
-   -   libcman: remove superfluous cman_dispatch outer loop condition (http://www.linux-archive.org/cluster-development/710942-libcman-remove-superfluous-cman_dispatch-outer-loop-condition.html)

Jan Pokorný 10-09-2012 06:31 PM

libcman: remove superfluous cman_dispatch outer loop condition
 
My grasp is that "len < 0" will never occur at the point of condition
check[*]. Under this assumption, the other check (for errno != EAGAIN)
does not decide anything, only making the code more obfuscated.

Please note that there used to be some discrepancies around in the past,
notably see commit bd910f7e9de2d320f10a12cd9a3e7a26fb00083a.
[*] proof is left ... ok, below:

We consider CMAN_DISPATCH_ALL only as it is prerequisite to even get
further in the evaluation of the discussed condition.

1. we can get into the loop condition when processing a message from
the waitlist and "len" is then set to the lenght of such handled
message

1a. message is added to the waitlist only indirectly from within
cman_dispatch, but cman_dispatch may proceed a received
message this far only if it was indeed received OK
(this includes nonzero lenght indicated in the header part
[although this is not checked directly], which is exactly
the value set to "len" checked in the discussed condition)

1b. hence, "len" cannot be negative when we reach the condition
this way (effectively skipping final errno comparison)

2. we can get into the loop condition also after processing directly
received message, where "len" carries the return value of either
recv or read

2a. any case of negative-or-zero "len" is captured immediately
after setting it, always resulting in returning from call

2b. ditto 1b.

3. 1b. + 2b. -> Q.E.D.

Please correct me if I am wrong.

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
cman/lib/libcman.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cman/lib/libcman.c b/cman/lib/libcman.c
index 26c09f2..4ecdd35 100644
--- a/cman/lib/libcman.c
+++ b/cman/lib/libcman.c
@@ -554,8 +554,7 @@ int cman_dispatch(cman_handle_t handle, int flags)
if (res)
break;

- } while ( flags & CMAN_DISPATCH_ALL &&
- !(len < 0 && errno == EAGAIN) );
+ } while (flags & CMAN_DISPATCH_ALL);

return len;
}
--
1.7.11.4


All times are GMT. The time now is 03:54 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.