Browse Source

Plan 9 from Bell Labs 2004-06-19

David du Colombier 20 years ago
parent
commit
4be17f3759
4 changed files with 11 additions and 15 deletions
  1. 3 5
      dist/replica/_plan9.db
  2. 1 1
      dist/replica/plan9.db
  3. 1 0
      dist/replica/plan9.log
  4. 6 9
      sys/src/9/ip/tcp.c

+ 3 - 5
dist/replica/_plan9.db

@@ -22,8 +22,8 @@
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/1c - 775 sys sys 1063639729 306762
 386/bin/8a - 775 sys sys 1085076970 112621
-386/bin/8c - 775 sys sys 1086577386 340969
-386/bin/8l - 775 sys sys 1087498046 106966
+386/bin/8c - 775 sys sys 1087527915 341009
+386/bin/8l - 775 sys sys 1087527915 106966
 386/bin/9660srv - 775 sys sys 1085076971 101995
 386/bin/aan - 775 sys sys 1085076971 128820
 386/bin/acid - 775 sys sys 1085076972 371882
@@ -5278,7 +5278,7 @@ sys/src/9/ip/nullmedium.c - 664 sys sys 1086406910 492
 sys/src/9/ip/pktmedium.c - 664 sys sys 1084331746 1314
 sys/src/9/ip/ptclbsum.c - 664 sys sys 1022588099 1243
 sys/src/9/ip/rudp.c - 664 sys sys 1055700790 21415
-sys/src/9/ip/tcp.c - 664 sys sys 1084890717 65643
+sys/src/9/ip/tcp.c - 664 sys sys 1087606219 65623
 sys/src/9/ip/tripmedium.c - 664 sys sys 1045063515 7136
 sys/src/9/ip/udp.c - 664 sys sys 1077376216 13146
 sys/src/9/mkfile - 664 sys sys 1063857477 205
@@ -12430,5 +12430,3 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/8c - 775 sys sys 1087527915 341009
-386/bin/8l - 775 sys sys 1087527915 106966

+ 1 - 1
dist/replica/plan9.db

@@ -5278,7 +5278,7 @@ sys/src/9/ip/nullmedium.c - 664 sys sys 1086406910 492
 sys/src/9/ip/pktmedium.c - 664 sys sys 1084331746 1314
 sys/src/9/ip/ptclbsum.c - 664 sys sys 1022588099 1243
 sys/src/9/ip/rudp.c - 664 sys sys 1055700790 21415
-sys/src/9/ip/tcp.c - 664 sys sys 1084890717 65643
+sys/src/9/ip/tcp.c - 664 sys sys 1087606219 65623
 sys/src/9/ip/tripmedium.c - 664 sys sys 1045063515 7136
 sys/src/9/ip/udp.c - 664 sys sys 1077376216 13146
 sys/src/9/mkfile - 664 sys sys 1063857477 205

+ 1 - 0
dist/replica/plan9.log

@@ -15697,3 +15697,4 @@
 1087506121 1 c sys/src/cmd/cc/sub.c - 664 sys sys 1087505577 31090
 1087529405 0 c 386/bin/8c - 775 sys sys 1087527915 341009
 1087529405 1 c 386/bin/8l - 775 sys sys 1087527915 106966
+1087606820 0 c sys/src/9/ip/tcp.c - 664 sys sys 1087606219 65623

+ 6 - 9
sys/src/9/ip/tcp.c

@@ -29,7 +29,7 @@ enum
 	TcptimerDONE	= 2,
 	MAX_TIME 	= (1<<20),	/* Forever */
 	TCP_ACK		= 50,		/* Timed ack sequence in ms */
-	MAXBACKMS	= 30000,	/* longest backoff time (ms) before hangup */
+	MAXBACKMS	= 9*60*1000,	/* longest backoff time (ms) before hangup */
 
 	URG		= 0x20,		/* Data marked urgent */
 	ACK		= 0x10,		/* Acknowledge is valid */
@@ -707,10 +707,7 @@ tcphalt(Tcppriv *priv, Tcptimer *t)
 int
 backoff(int n)
 {
-	if(n < 5)
-		return 1 << n;
-
-	return 64;
+	return 1 << n;
 }
 
 void
@@ -3123,15 +3120,15 @@ tcpsettimer(Tcpctl *tcb)
 {
 	int x;
 
-	/* round trip depenency */
+	/* round trip dependency */
 	x = backoff(tcb->backoff) *
 	    (tcb->mdev + (tcb->srtt>>LOGAGAIN) + MSPTICK) / MSPTICK;
 
-	/* bounded twixt 1/2 and 10 seconds */
+	/* bounded twixt 1/2 and 64 seconds */
 	if(x < 500/MSPTICK)
 		x = 500/MSPTICK;
-	else if(x > (10000/MSPTICK))
-		x = 10000/MSPTICK;
+	else if(x > (64000/MSPTICK))
+		x = 64000/MSPTICK;
 	tcb->timer.start = x;
 }