[Spread-cvs] commit: r661 - branches/spread_4_2_debug/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2014-01-20 21:54:48 -0500 (Mon, 20 Jan 2014)
New Revision: 661

Modified:
   branches/spread_4_2_debug/daemon/membership.c
   branches/spread_4_2_debug/daemon/protocol.c
Log:
Print and whitespace changes


Modified: branches/spread_4_2_debug/daemon/membership.c
===================================================================
--- branches/spread_4_2_debug/daemon/membership.c	2014-01-21 00:34:17 UTC (rev 660)
+++ branches/spread_4_2_debug/daemon/membership.c	2014-01-21 02:54:48 UTC (rev 661)
@@ -2049,8 +2049,8 @@
 
 		form_token->type = 0;
 		form_token->seq = 0;
-		form_token->aru = INT32_MAX;  /* leader will lower to his My_aru */
-		form_token->aru_last_id = 0;  /* leader will set to My.id */
+		form_token->aru = INT32_MAX;   /* leader will lower to his My_aru */
+		form_token->aru_last_id = -1;  /* leader will set to My.id */
 		form_token->flow_control = 0;
 		form_token->rtr_len = 0;
 

Modified: branches/spread_4_2_debug/daemon/protocol.c
===================================================================
--- branches/spread_4_2_debug/daemon/protocol.c	2014-01-21 00:34:17 UTC (rev 660)
+++ branches/spread_4_2_debug/daemon/protocol.c	2014-01-21 02:54:48 UTC (rev 661)
@@ -612,12 +612,11 @@
 
 	/* Calculating Token->aru and Token->aru_last_id */
 
-	Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: calculating Token->aru and Token->aru_last_id: Token->aru = %d, My_aru = %d, Token->aru_last_id = 0x%08X, My.id = 0x%08X, Highest_seq = %d, Token->seq = %d, Memb_state() = %d\n",
-		Token->aru, My_aru, Token->aru_last_id, My.id, Highest_seq, Token->seq, Memb_state() );
+	Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: calculating Token->aru and Token->aru_last_id: Token->aru = %d, My_aru = %d, Token->aru_last_id = 0x%08X, My.id = 0x%08X, Token->seq = %d, Memb_state() = %d\n",
+		Token->aru, My_aru, Token->aru_last_id, My.id, Token->seq, Memb_state() );
 
-	if ( Token->aru > My_aru         ||                           /* this daemon may be missing packets: lower aru to My_aru */
+	if ( Token->aru > My_aru         ||                           /* this daemon is missing packets: lower aru to My_aru */
 	     Token->aru_last_id == My.id ||                           /* this daemon last updated aru: try raising to My_aru */
-	     /*Token->aru == Highest_seq   ||*/                           /* everyone has everything so far: try raising to My_aru; NOTE: Highest_seq already incorporated Token->seq above */
 	     ( Token->aru == Token->seq && Memb_state() != EVS ) ) {  /* everyone has everything so far: try raising to My_aru; NOTE: Token->seq is meaningless in EVS */
 
 		Token->aru         = My_aru;