[Spread-cvs] commit: r667 - trunk/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2014-01-21 18:26:55 -0500 (Tue, 21 Jan 2014)
New Revision: 667

Modified:
   trunk/daemon/membership.c
   trunk/daemon/protocol.c
Log:
svn merge -r 662:665 branches/spread_4_2_debug trunk



Modified: trunk/daemon/membership.c
===================================================================
--- trunk/daemon/membership.c	2014-01-21 23:20:18 UTC (rev 666)
+++ trunk/daemon/membership.c	2014-01-21 23:26:55 UTC (rev 667)
@@ -1517,6 +1517,11 @@
 		/*Net_ucast_token( My.id, &send_scat );*/
 	}
 
+	if ( Alarm_get_priority() >= SPLOG_INFO && ( Alarm_get_types() & MEMB ) != 0 ) {
+		Alarmp( SPLOG_INFO, MEMB, "Create_form1: SENT following token:\n" );
+	        Memb_print_form_token( &send_scat );
+	}
+
 	E_dequeue( Send_join_event, 0, NULL );
 	E_queue( Memb_token_loss_event, 0, NULL, Form_timeout );
     	E_dequeue( Prot_token_hurry_event, 0, NULL );
@@ -1549,10 +1554,6 @@
         int             num_to_copy;
         members_info    valid_members;
 
-	if ( Alarm_get_priority() >= SPLOG_INFO && ( Alarm_get_types() & MEMB ) != 0 ) {
-	        Memb_print_form_token( scat );
-	}
-
 	num_bytes  = 0;
 
 	form_token = (token_header *)scat->elements[0].buf;
@@ -1921,6 +1922,11 @@
 		/*Net_ucast_token( m_info->members[0], &send_scat );*/
 	}
 
+	if ( Alarm_get_priority() >= SPLOG_INFO && ( Alarm_get_types() & MEMB ) != 0 ) {
+		Alarmp( SPLOG_INFO, MEMB, "Fill_form1: SENT following token:\n" );
+	        Memb_print_form_token( scat );
+	}
+
 	E_dequeue( Send_join_event, 0, NULL );
 	E_dequeue( Form_or_fail_event, 0, NULL );
 	E_dequeue( Shift_to_seg_event, 0, NULL );
@@ -1953,6 +1959,7 @@
         int32           memb_time = 0;
 
 	if ( Alarm_get_priority() >= SPLOG_INFO && ( Alarm_get_types() & MEMB ) != 0 ) {
+		Alarmp( SPLOG_INFO, MEMB, "Read_form2: RECEIVED following token:\n" );
 	        Memb_print_form_token( scat );
 	}
 	

Modified: trunk/daemon/protocol.c
===================================================================
--- trunk/daemon/protocol.c	2014-01-21 23:20:18 UTC (rev 666)
+++ trunk/daemon/protocol.c	2014-01-21 23:26:55 UTC (rev 667)
@@ -515,8 +515,8 @@
 		goto END;
         }
 
-        Alarmp( SPLOG_INFO, PROTOCOL, 
-	       "\nProt_handle_token: type = 0x%08X; transmitter = 0x%08X; seq = %d; proc_id = 0x%08X; aru = %d; aru_last_id = 0x%08X;\n", 
+	Alarmp( SPLOG_INFO | SPLOG_NODATE, PROTOCOL, "\n" );
+        Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: type = 0x%08X; transmitter = 0x%08X; seq = %d; proc_id = 0x%08X; aru = %d; aru_last_id = 0x%08X;\n", 
 	       Token->type, Token->transmiter_id, Token->seq, Token->proc_id, Token->aru, Token->aru_last_id );
 
 	if( ret != sizeof(token_header) + Token->rtr_len )
@@ -707,7 +707,7 @@
 
 	/* 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, Token->seq = %d, Memb_state() = %d\n",
+	Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: calculating Token->aru: 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 is missing packets: lower aru to My_aru */