jonathan 05/04/06 23:49:54
Modified: daemon Tag: branch_3_17 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
No revision
No revision
1.4.2.6 +9 -0 spread/daemon/Changelog
Index: Changelog
===================================================================
RCS file: /storage/cvsroot/spread/daemon/Changelog,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- Changelog 7 Apr 2005 03:32:21 -0000 1.4.2.5
+++ Changelog 7 Apr 2005 03:49:54 -0000 1.4.2.6
@@ -1,3 +1,12 @@
+Wed Apr 6 23:41:44 2005 Jonathan Stanton <jonathan@xxxxxxxxxxxx>
+
+ * 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.
+
Wed Apr 6 23:24:33 2005 Jonathan Stanton <jonathan@xxxxxxxxxxxx>
* groups.c (G_compute_and_notify): Add missing initialization
1.9.2.1 +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.9.2.1
diff -u -r1.9 -r1.9.2.1
--- protocol.c 3 Oct 2004 05:21:11 -0000 1.9
+++ protocol.c 7 Apr 2005 03:49:54 -0000 1.9.2.1
@@ -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 );
|
