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

[jschultz at spread.org]

Author: jschultz
Date: 2013-10-22 14:52:50 -0400 (Tue, 22 Oct 2013)
New Revision: 604

Modified:
   branches/spread_4_2_debug/daemon/membership.c
   branches/spread_4_2_debug/daemon/protocol.c
   branches/spread_4_2_debug/daemon/spread.conf
Log:
Updates


Modified: branches/spread_4_2_debug/daemon/membership.c
===================================================================
--- branches/spread_4_2_debug/daemon/membership.c	2013-10-22 18:51:39 UTC (rev 603)
+++ branches/spread_4_2_debug/daemon/membership.c	2013-10-22 18:52:50 UTC (rev 604)
@@ -1958,6 +1958,8 @@
                       *num_rings, num_bytes, Membership_id.proc_id, Membership_id.time); 
         }
 
+	Alarm(MEMB, "Read_form2: updating Highest_seq %d -> %d; Aru %d -> %d\n", Highest_seq, my_rg_info->highest_seq, Aru, my_rg_info->aru);
+
 	Highest_seq = my_rg_info->highest_seq;
 	Aru	    = my_rg_info->aru;
         /* Note: this call to Discard_packets handles delivery of all the messages

Modified: branches/spread_4_2_debug/daemon/protocol.c
===================================================================
--- branches/spread_4_2_debug/daemon/protocol.c	2013-10-22 18:51:39 UTC (rev 603)
+++ branches/spread_4_2_debug/daemon/protocol.c	2013-10-22 18:52:50 UTC (rev 604)
@@ -652,10 +652,13 @@
 
 
 	/* calculating Aru */
-	if( Token->aru > Last_token->aru )
+	if( Token->aru > Last_token->aru ) {
+		Alarm(MEMB, "Prot_handle_token: updating Aru from Last_token; Aru %d -> %d\n", Aru, Last_token->aru);
 		Aru = Last_token->aru;
-	else
+	} else {
+		Alarm(MEMB, "Prot_handle_token: updating Aru from Token; Aru %d -> %d\n", Aru, Token->aru);
 		Aru = Token->aru;
+	}
 	if( Highest_seq == Aru ) Token_counter++;
 	else Token_counter = 0;
 
@@ -1304,6 +1307,8 @@
             Last_delivered	 = 0;
         }
 
+	Alarm(MEMB, "Discard_packets: Updated Aru to %d for next membership\n", Aru);
+
 	GlobalStatus.my_aru	 = My_aru;
 	Token_counter 	= 0;
 

Modified: branches/spread_4_2_debug/daemon/spread.conf
===================================================================
--- branches/spread_4_2_debug/daemon/spread.conf	2013-10-22 18:51:39 UTC (rev 603)
+++ branches/spread_4_2_debug/daemon/spread.conf	2013-10-22 18:52:50 UTC (rev 604)
@@ -71,7 +71,7 @@
 
 #EventTimeStamp
 # or
-#EventTimeStamp = "[%a %d %b %Y %H:%M:%S]"
+EventTimeStamp = "[%a %d %b %Y %H:%M:%S]"
 
 #Set whether to add a precise (microsecond) resolution timestamp to all logged
 # events or not. This option requires that EventTimeStamp is also enabled.