[Spread-cvs] commit: r897 - branches/work_4_4_1/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2018-03-28 13:13:45 -0400 (Wed, 28 Mar 2018)
New Revision: 897

Modified:
   branches/work_4_4_1/daemon/protocol.c
Log:
Documentation + non-functional code changes that indicate a token's seq is meaningless in EVS (always 0)


Modified: branches/work_4_4_1/daemon/protocol.c
===================================================================
--- branches/work_4_4_1/daemon/protocol.c	2018-03-28 05:00:40 UTC (rev 896)
+++ branches/work_4_4_1/daemon/protocol.c	2018-03-28 17:13:45 UTC (rev 897)
@@ -572,7 +572,7 @@
 
         /* Deal with wrapping seq values (2^32) by triggering a membership by dropping the token */
 
-        if ( Memb_state() != EVS && Token->seq > MAX_WRAP_SEQUENCE_VALUE )
+        if ( Memb_state() != EVS && Token->seq > MAX_WRAP_SEQUENCE_VALUE )  /* NOTE: Token->seq is meaningless in EVS */
         {
                 Alarmp( SPLOG_WARNING, PROTOCOL, "Prot_handle_token: seq (%d) rollover; swallowing token to trigger membership\n", Token->seq );
                 goto END;
@@ -639,10 +639,7 @@
                 }
         }
 
-        if ( Highest_seq < Token->seq ) 
-        {
-                Highest_seq = Token->seq;
-        }
+        if ( Memb_state() != EVS && Highest_seq < Token->seq ) Highest_seq = Token->seq;  /* NOTE: Token->seq is meaningless in EVS */
                 
         /* I don't want to process my next token until I have processed
          *  all bcast packets sent in the previous round, so I should give 
@@ -711,7 +708,7 @@
          * numbers between the sequence on the last token this process sent
          * and the sequence on the token it just received may still be in
          * transit or not yet sent, so they should not be requested at this point*/
-        if ( FC_accelerated_ring() && Memb_state() != EVS ){
+        if ( FC_accelerated_ring() && Memb_state() != EVS ){  /* NOTE: Last_token->seq is meaningless in EVS */
                 max_rtr_seq = Last_token->seq;
         }else{
                 max_rtr_seq = Highest_seq;
@@ -769,7 +766,7 @@
         }
         
         Token->proc_id = My.id;
-        if ( Memb_state() != EVS ) Token->seq = Highest_seq;
+        if ( Memb_state() != EVS ) Token->seq = Highest_seq; /* NOTE: Token->seq is meaningless in EVS */
 
         if ( Conf_leader( Memb_active_ptr() ) == My.id )
         {