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

[jschultz at spread.org]

Author: jschultz
Date: 2014-01-21 13:56:10 -0500 (Tue, 21 Jan 2014)
New Revision: 664

Modified:
   branches/spread_4_2_debug/daemon/membership.c
   branches/spread_4_2_debug/daemon/protocol.c
Log:
Add print form token to Create_form1; other minor print changes


Modified: branches/spread_4_2_debug/daemon/membership.c
===================================================================
--- branches/spread_4_2_debug/daemon/membership.c	2014-01-21 03:49:35 UTC (rev 663)
+++ branches/spread_4_2_debug/daemon/membership.c	2014-01-21 18:56:10 UTC (rev 664)
@@ -1448,6 +1448,10 @@
 		/*Net_ucast_token( My.id, &send_scat );*/
 	}
 
+	if ( Alarm_get_priority() >= SPLOG_INFO && ( Alarm_get_types() & MEMB ) != 0 ) {
+	        Memb_print_form_token( &send_scat );
+	}
+
 	E_dequeue( Send_join, 0, NULL );
 	E_queue( Memb_token_loss, 0, NULL, Form_timeout );
     	E_dequeue( Prot_token_hurry, 0, NULL );

Modified: branches/spread_4_2_debug/daemon/protocol.c
===================================================================
--- branches/spread_4_2_debug/daemon/protocol.c	2014-01-21 03:49:35 UTC (rev 663)
+++ branches/spread_4_2_debug/daemon/protocol.c	2014-01-21 18:56:10 UTC (rev 664)
@@ -466,8 +466,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 )
@@ -612,7 +612,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 */