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

[jschultz at spread.org]

Author: jschultz
Date: 2013-10-24 11:32:18 -0400 (Thu, 24 Oct 2013)
New Revision: 607

Modified:
   branches/spread_4_2_debug/daemon/membership.c
Log:
Added debug prints to when we set Aru on tokens


Modified: branches/spread_4_2_debug/daemon/membership.c
===================================================================
--- branches/spread_4_2_debug/daemon/membership.c	2013-10-23 19:17:06 UTC (rev 606)
+++ branches/spread_4_2_debug/daemon/membership.c	2013-10-24 15:32:18 UTC (rev 607)
@@ -833,7 +833,7 @@
 	    }
 	    break;
     }
-    Alarm( MEMB, "Memb_token_loss: I lost my token, state is %d\n",State);
+    Alarm( MEMB, "Memb_token_loss: ############### I lost my token, state is %d\n\n", State);
     Shift_to_seg();
 
     Token_alive = 0;
@@ -1365,6 +1365,8 @@
 	rg_info->aru		= Aru;
 	rg_info->highest_seq	= Highest_seq;
 
+	Alarm(MEMB, "Create_form1: putting Aru = %d and Highest_Seq = %d on rg_info form1 token\n", Aru, Highest_seq);
+
 	/* update holes */
 	rg_info->num_holes	= 0;
 	for( index = My_aru+1; index <= Highest_seq; index++ )
@@ -1647,6 +1649,8 @@
 	new_rg_info->aru	 = Aru;
 	new_rg_info->highest_seq = Highest_seq;
 
+	Alarm(MEMB, "Fill_form1: Putting Aru = %d and Highest_seq = %d on new_rg_info of form1 token\n", Aru, Highest_seq);
+
 	if( my_rg_info == NULL )
 	{
 
@@ -1716,11 +1720,15 @@
 	
 	    members_info temp_set;
 
-	    if( my_rg_info->aru         > Aru )
+	    if( my_rg_info->aru         > Aru ) {
 		new_rg_info->aru 	= my_rg_info->aru;
+		Alarm(MEMB, "my_rg_info->aru (%d) > Aru (%d) -> setting new_rg_info->aru to my_rg_info\n", my_rg_info->aru, Aru);
+	    }
 
-	    if( my_rg_info->highest_seq > Highest_seq )
+	    if( my_rg_info->highest_seq > Highest_seq ) {
 		new_rg_info->highest_seq= my_rg_info->highest_seq;
+		Alarm(MEMB, "my_rg_info->highest_seq (%d) > Highest_seq (%d) -> setting new_rg_info->highest_seq to my_rg_info\n", my_rg_info->highest_seq, Highest_seq);
+	    }
 
 	    for( i=0; i < my_rg_info->num_holes; i++ )
 	    {