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

[jschultz at spread.org]

Author: jschultz
Date: 2013-10-24 13:22:28 -0400 (Thu, 24 Oct 2013)
New Revision: 610

Modified:
   branches/spread_4_2_debug/daemon/network.c
   branches/spread_4_2_debug/daemon/protocol.c
Log:
Further updates to token prints


Modified: branches/spread_4_2_debug/daemon/network.c
===================================================================
--- branches/spread_4_2_debug/daemon/network.c	2013-10-24 17:18:05 UTC (rev 609)
+++ branches/spread_4_2_debug/daemon/network.c	2013-10-24 17:22:28 UTC (rev 610)
@@ -643,8 +643,11 @@
         token_ptr->conf_hash = Cn->hash_code;
 	token_ptr->transmiter_id = My.id;
 
-	Alarm(PROTOCOL, "Net_send_token: type = 0x%08X; transmitter_id = 0x%08X; aru = %d; Token_address = 0x%08X\n", 
-	      token_ptr->type, token_ptr->transmiter_id, token_ptr->aru, Token_address);
+	Alarm(PROTOCOL, 
+	      "Net_send_token: type = 0x%08X; transmitter_id = 0x%08X; seq = %d; proc_id = 0x%08X\n"
+	      "\taru = %d; aru_last_id = 0x%08X; Token_address = 0x%08X\n", 
+	      token_ptr->type, token_ptr->transmiter_id, token_ptr->seq, token_ptr->proc_id, 
+	      token_ptr->aru, token_ptr->aru_last_id, Token_address);
 
         if ( token_ptr->rtr_len > (MAX_PACKET_SIZE - sizeof(token_header) ) )
         {

Modified: branches/spread_4_2_debug/daemon/protocol.c
===================================================================
--- branches/spread_4_2_debug/daemon/protocol.c	2013-10-24 17:18:05 UTC (rev 609)
+++ branches/spread_4_2_debug/daemon/protocol.c	2013-10-24 17:22:28 UTC (rev 610)
@@ -455,8 +455,10 @@
 	r2 = get_rand() % (r1+3 );
 	if ( r2 == 0 ) return; */
 
-        Alarm( PROTOCOL, "Prot_handle_token: received token: type = 0x%08X; transmitter = 0x%08X; proc_id = 0x%08X; aru = %d\n", 
-	       Token->type, Token->transmiter_id, Token->proc_id, Token->aru );
+        Alarm( PROTOCOL, 
+	       "Prot_handle_token: received token: type = 0x%08X; transmitter = 0x%08X; seq = %d; proc_id = 0x%08X;\n"
+	       "\taru = %d; aru_last_id = 0x%08X;\n", 
+	       Token->type, Token->transmiter_id, Token->seq, Token->proc_id, Token->aru, Token->aru_last_id );
 
 	/* check if it is a regular token */
 	if( Is_form( Token->type ) )