[Spread-cvs] cvs commit: spread/daemon Changelog protocol.c

[jonathan at spread.org]

jonathan    05/04/07 00:04:58

  Modified:    daemon   Changelog protocol.c
  Log:
  Remove use of Wide_delay from protocol.c. This was needed back in the old
  days when the Internet was very lossy. It now seems to just slow us down.
  
  Revision  Changes    Path
  1.9       +9 -0      spread/daemon/Changelog
  
  Index: Changelog
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/Changelog,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Changelog	7 Apr 2005 04:00:57 -0000	1.8
  +++ Changelog	7 Apr 2005 04:04:58 -0000	1.9
  @@ -1,3 +1,12 @@
  +Wed Apr  6 23:41:44 2005  Jonathan Stanton  <jonathan at cnds.jhu.edu>
  +
  +	* protocol.c (Answer_retrans,Send_new_packets,Prot_handle_token): 
  +	Remove all use of Wide_delay.
  +	This only added extra delay when sending if we though the network
  +	was a WAN. Originally this helped deal with high loss levels on 
  +	the Internet (circa 1993) However, it appears no longer needed
  +	and actually hurts performance.
  +
   Thu Mar 31 23:44:04 2005  Jonathan Stanton  <jonathan at cnds.jhu.edu>
   
   	* sp.c (SP_internal_multicast): Check for short writes on network 
  
  
  
  1.10      +0 -17     spread/daemon/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/protocol.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- protocol.c	3 Oct 2004 05:21:11 -0000	1.9
  +++ protocol.c	7 Apr 2005 04:04:58 -0000	1.10
  @@ -67,7 +67,6 @@
   
   static	packet_header	*Hurry_head;
   static	sys_scatter	Hurry_pack;
  -static	sp_time		Wide_delay = { 0, 10000 };
   
   /* ### Pack: 1 line */
   static	packet_info	Buffered_packets[ARCH_SCATTER_SIZE];
  @@ -598,14 +597,6 @@
   		Net_send_token( &New_token );
   #endif  /* ARCH_SGI_IRIX */
   
  -		if( Wide_network && 
  -		    Conf_seg_last(Memb_active_ptr(), My.seg_index) == My.id )
  -		{
  -			/* sending again to another segment */
  -			Net_send_token( &New_token );
  -			E_delay( Wide_delay );
  -			Net_send_token( &New_token );
  -		}
   		if( Get_retrans( Token->type ) > 1 )
   		{
   			/* problems */ 
  @@ -752,8 +743,6 @@
                                   }
   				if( ret > 0 )
   				{
  -					if( Wide_network ) E_delay( Wide_delay );
  -					if( Wide_network && (num_retrans % 2 == 1 )) E_delay( Wide_delay ); 
                                   	num_retrans++;
   				}
                           }else{
  @@ -783,8 +772,6 @@
   	if( ret > 0 )
   	{
   		GlobalStatus.b_retrans++;
  -		if( Wide_network ) E_delay( Wide_delay );
  -		if( Wide_network && (num_retrans % 2 == 1 )) E_delay( Wide_delay ); 
   		num_retrans++;
   	}
   	return (num_retrans);
  @@ -858,8 +845,6 @@
   #endif
   		if( ret > 0 )
   		{
  -			if( Wide_network ) E_delay( Wide_delay ); 
  -			if( Wide_network && (num_sent % 2 == 1 )) E_delay( Wide_delay ); 
   			num_sent++;
   		}
   
  @@ -881,8 +866,6 @@
   	ret = Net_flush_bcast();
   	if( ret > 0 )
   	{
  -		if( Wide_network ) E_delay( Wide_delay ); 
  -		if( Wide_network && (num_sent % 2 == 1 )) E_delay( Wide_delay ); 
   		num_sent++;
   	}
   	return ( num_sent );