[Spread-cvs] commit: r545 - trunk/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2013-03-12 16:13:48 -0400 (Tue, 12 Mar 2013)
New Revision: 545

Modified:
   trunk/daemon/membership.c
Log:
Change of default membership timers.


Modified: trunk/daemon/membership.c
===================================================================
--- trunk/daemon/membership.c	2013-03-12 19:58:45 UTC (rev 544)
+++ trunk/daemon/membership.c	2013-03-12 20:13:48 UTC (rev 545)
@@ -165,27 +165,27 @@
 
 	if( Wide_network )
 	{
-		Token_timeout.sec  =  20; Token_timeout.usec  = 0;
-		Hurry_timeout.sec  =   6; Hurry_timeout.usec  = 0;
+		Token_timeout.sec  =   5; Token_timeout.usec  = 0;
+		Hurry_timeout.sec  =   1; Hurry_timeout.usec  = 500000;
 
-		Alive_timeout.sec  =   1; Alive_timeout.usec  = 0;
-		Join_timeout.sec   =   1; Join_timeout.usec   = 0;
-		Rep_timeout.sec    =   5; Rep_timeout.usec    = 0;
-		Seg_timeout.sec    =   2; Seg_timeout.usec    = 0;
-		Gather_timeout.sec =  10; Gather_timeout.usec = 0;
-		Form_timeout.sec   =  10; Form_timeout.usec   = 0;
-		Lookup_timeout.sec =  90; Lookup_timeout.usec = 0;
+		Alive_timeout.sec  =   0; Alive_timeout.usec  = 250000;
+		Join_timeout.sec   =   0; Join_timeout.usec   = 250000;
+		Rep_timeout.sec    =   1; Rep_timeout.usec    = 250000;
+		Seg_timeout.sec    =   0; Seg_timeout.usec    = 500000;
+		Gather_timeout.sec =   2; Gather_timeout.usec = 500000;
+		Form_timeout.sec   =   2; Form_timeout.usec   = 500000;
+		Lookup_timeout.sec =  45; Lookup_timeout.usec = 0;
 	}else{
-		Token_timeout.sec  =   5; Token_timeout.usec  = 0;
-		Hurry_timeout.sec  =   2; Hurry_timeout.usec  = 0;
+		Token_timeout.sec  =   1; Token_timeout.usec  = 250000;
+		Hurry_timeout.sec  =   0; Hurry_timeout.usec  = 500000;
 
-		Alive_timeout.sec  =   1; Alive_timeout.usec  = 0;
-		Join_timeout.sec   =   1; Join_timeout.usec   = 0;
-		Rep_timeout.sec    =   2; Rep_timeout.usec    = 500000;
-		Seg_timeout.sec    =   2; Seg_timeout.usec    = 0;
-		Gather_timeout.sec =   5; Gather_timeout.usec = 0;
-		Form_timeout.sec   =   5; Form_timeout.usec   = 0;
-		Lookup_timeout.sec =  60; Lookup_timeout.usec = 0;
+		Alive_timeout.sec  =   0; Alive_timeout.usec  = 250000;
+		Join_timeout.sec   =   0; Join_timeout.usec   = 250000;
+		Rep_timeout.sec    =   0; Rep_timeout.usec    = 625000;
+		Seg_timeout.sec    =   0; Seg_timeout.usec    = 500000;
+		Gather_timeout.sec =   1; Gather_timeout.usec = 250000;
+		Form_timeout.sec   =   1; Form_timeout.usec   = 250000;
+		Lookup_timeout.sec =  30; Lookup_timeout.usec = 0;
 	}
 
         /* Lookup timeout when only one segment exists can be longer,