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

jschultz at spread.org jschultz at spread.org
Tue Jan 21 17:57:17 EST 2014


Author: jschultz
Date: 2014-01-21 17:57:16 -0500 (Tue, 21 Jan 2014)
New Revision: 665

Modified:
   branches/spread_4_2_debug/daemon/membership.c
Log:
Print form1 tokens when created/sent, form2 when received.
Now logs should collectively contain all form tokens w/o each daemon printing both recv+send form tokens


Modified: branches/spread_4_2_debug/daemon/membership.c
===================================================================
--- branches/spread_4_2_debug/daemon/membership.c	2014-01-21 18:56:10 UTC (rev 664)
+++ branches/spread_4_2_debug/daemon/membership.c	2014-01-21 22:57:16 UTC (rev 665)
@@ -1449,6 +1449,7 @@
 	}
 
 	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 );
 	}
 
@@ -1484,10 +1485,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;
@@ -1856,6 +1853,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, 0, NULL );
 	E_dequeue( Form_or_fail, 0, NULL );
 	E_dequeue( Shift_to_seg, 0, NULL );
@@ -1888,6 +1890,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 );
 	}
 	




More information about the Spread-cvs mailing list