philip's inet tcp fix

benchmarks/Makefile

@@ -0,0 +1,7 @@
+# Makefile for the benchmarks.
+
+all::
+	chmod 755 run
+
+all clean::
+	for b in *bench*; do cd $$b && $(MAKE) $@; done

benchmarks/run

@@ -0,0 +1,51 @@
+#!/bin/sh
+
+set -e
+
+make
+
+BENCHDIR=/usr/local/benchmarks
+
+basebenchmarks=`echo *bench*`
+
+if [ -d $BENCHDIR ]
+then	packagebenchmarks=`(cd $BENCHDIR && echo *bench*)`
+fi
+
+runbench() {
+	bench=$1
+	out="Results/$bench.`date +%Y%m%d.%H%M%S`"
+	if [ -d $bench ]
+	then	dir=$bench
+	fi
+	if [ -d $BENCHDIR/$bench ]
+	then	dir=$BENCHDIR/$bench
+	fi
+	clear
+	echo "Running $dir."
+	echo "Saving output to $out."
+	echo ""
+	( cd $dir && sh run.sh 2>&1 ) | tee $out
+}
+
+clear
+n=1
+for b in $basebenchmarks $packagebenchmarks
+do	echo "$n. $b"
+	eval "n$n=$b"
+	n=`expr $n + 1`
+done
+echo
+echo -n "Run which benchmark or 'all'? "
+read bench
+eval var=\$n$bench
+if [ "$bench" = all ]
+then	for b in $basebenchmarks $packagebenchmarks
+	do	runbench $b
+	done
+else	if [ -d "$var" -o -d "$BENCHDIR/$var" ]
+	then	runbench $var
+	else	echo "Unknown benchmark $var."
+		exit 1
+	fi
+fi

benchmarks/unixbench-5.1.2/run.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+export CC=cc
+export MINIX=1
+if perl -e 'exit 0'
+then	perl -w Run
+else	echo "perl not installed. please install perl to run unixbench." >&2
+	exit 1
+fi

commands/Makefile

@@ -10,30 +10,17 @@ usage:
 	@echo "Usage: make all          # Compile all commands" >&2
 	@echo "       make install      # Install the result (run as bin!)" >&2
 	@echo "       make clean        # Delete .o files and other junk" >&2
-	@echo "       make big          # Compile all big commands" >&2
-	@echo "       make biginstall   # Install all big commands" >&2
-	@echo "       make small        # Install all small commands" >&2
-	@echo "       make smallinstall # Install all small commands" >&2
-	@echo " "
-	@echo "big compiles the commands the require large compiler sizes."
-	@echo "small compiles the rest. all compiles all."
 
-all: big  small
+all:
-
-install: big biginstall small smallinstall
-
-big:
-	binsizes big
 	cd zmodem && make
 	cd $(BZIP2) && /bin/sh build build
-	binsizes normal
+	set -e; for p in $(SMALLPROGRAMS); do ( cd $$p && make all ); done
 
-biginstall: big
+install:
-	binsizes big
+	set -e; for p in $(SMALLPROGRAMS); do ( cd $$p && make install ); done
 	cd zmodem && make install
 	cd $(BZIP2) && make install
 	cd $(FLEX) && sh build
-	binsizes normal
 
 clean::
 	cd $(BZIP2) && make clean
@@ -41,9 +28,4 @@ clean::
 	if [ -f $(FLEX)/Makefile ]; then cd $(FLEX) && make distclean ; fi
 	for p in $(SMALLPROGRAMS); do ( cd $$p && make clean ); done
 
-small::
-	set -e; for p in $(SMALLPROGRAMS); do ( cd $$p && make all ); done
-
-smallinstall::
-	set -e; for p in $(SMALLPROGRAMS); do ( cd $$p && make install ); done
 

commands/i386/acd.descr

@@ -36,7 +36,7 @@ ACK_CG =	$A/$ARCH/cg
 ACK_AS =	$A/$ARCH/as \-
 ACK_LED =	$A/em_led -a0:$W -a1:$W -a2:$W -a3:$W
 ACK_CV =	$A/cv
-ASMCONV =	$L/asmconv
+ASMCONV =	/usr/bin/asmconv
 AAL =		/usr/bin/aal
 
 # Minix predefined symbols.

commands/i386/asmconv/Makefile

@@ -13,9 +13,9 @@ asmconv:	$(OBJ)
 	$(CC) $(LDFLAGS) -o $@ $(OBJ)
 	install -S 8kw $@
 
-install:	/usr/lib/asmconv
+install:	/usr/bin/asmconv
 
-/usr/lib/asmconv:	asmconv
+/usr/bin/asmconv:	asmconv
 	install -cs -o bin asmconv $@
 
 clean:

commands/i386/asmconv/emit_gnu.c

@@ -506,6 +506,10 @@ void gnu_emit_instruction(asm86_t *a)
 		}
 	}
 
+	if (a->opcode == DOT_END) {
+		/* Stop translating after .sect .end. */
+		exit(0);
+	} else
 	if (a->opcode == DOT_LABEL) {
 		assert(a->args->operator == ':');
 		gnu_printf("%s:", a->args->name);

commands/scripts/binsizes.sh

@@ -13,7 +13,7 @@ if [ "$1" != normal ]
 then	t=$t.$1
 fi
 
-chmem =250000 /usr/lib/em_* /usr/lib/cpp* /usr/lib/cv /usr/lib/asmconv >/dev/null 2>&1
+chmem =250000 /usr/lib/em_* /usr/lib/cpp* /usr/lib/cv >/dev/null 2>&1
 chmem =600000 /usr/lib/ego/*  >/dev/null 2>&1
 if [ -f $t ]
 then	cat "$t" | while read line

drivers/dec21140A/dec21140A.c

@@ -85,6 +85,8 @@ int sef_cb_init(int type, sef_init_info_t *info)
     notify(tasknr);
   else if(r != ESRCH)
     printf("%s unable to notify inet: %d\n", str_DevName, r);
+
+  return OK;
 }
 
 /*===========================================================================*
@@ -731,7 +733,6 @@ PRIVATE void do_interrupt(dpeth_t *dep){
 
 PRIVATE void de_reset(dpeth_t *dep){
   io_outl(CSR_ADDR(dep, CSR0), CSR0_SWR);
-  micro_delay(1000000);
 }
 
 PRIVATE void de_hw_conf(dpeth_t *dep){

lib/generate.sh

@@ -133,7 +133,7 @@ gnuCommands()
 	
 	case $srcfile in
 	*.s )
-		echo "	gcc $CFLAGS -E -x assembler-with-cpp -I. $srcfile | asmconv -mi386 ack gnu > $GNUBASE/$OBJDIR/$srcfile.gnu || true"
+		echo "	gcc $CFLAGS -E -x assembler-with-cpp -I. $srcfile | asmconv -mi386 ack gnu > $GNUBASE/$OBJDIR/$srcfile.gnu"
 		echo "	gas -o $dstfile $GNUBASE/$OBJDIR/$srcfile.gnu"
 		
 		echo "	mkdep 'gcc $CFLAGS -E -x assembler-with-cpp -I.' $srcfile | $sedcmd >> .depend-gnu" >&4

servers/inet/generic/tcp_send.c

@@ -540,7 +540,7 @@ u16_t new_win;
 	acc_t *pack;
 	clock_t retrans_time, curr_time, rtt, artt, drtt, srtt;
 	u32_t queue_lo, queue_hi;
-	u16_t mss, cthresh;
+	u16_t mss, cthresh, new_cthresh;
 	unsigned window;
 
 	DBLOCK(0x10, printf("tcp_release_retrans, conn[%d]: ack %lu, win %u\n",
@@ -640,9 +640,11 @@ u16_t new_win;
 	cthresh= tcp_conn->tc_snd_cthresh;
 	if (window > cthresh)
 	{
-		cthresh += tcp_conn->tc_snd_cinc;
+		new_cthresh= cthresh + tcp_conn->tc_snd_cinc;
-		tcp_conn->tc_snd_cthresh= cthresh;
+		if (new_cthresh < cthresh)
-		window= cthresh;
+			new_cthresh= cthresh;		/* overflow */
+		tcp_conn->tc_snd_cthresh= new_cthresh;
+		window= new_cthresh;
 	}
 
 	/* If the window is larger than the window advertised by the

test/Makefile

@@ -16,12 +16,9 @@ BIGOBJ=  test20 test24
 ROOTOBJ= test11 test33 test43 test46
 GCCOBJ=  test45-gcc test49-gcc
 
-all:	$(OBJ) $(BIGOBJ) $(GCCOBJ) $(ROOTOBJ) Benchmarks
+all:	$(OBJ) $(BIGOBJ) $(GCCOBJ) $(ROOTOBJ)
 	chmod 755 *.sh run
 
-Benchmarks:
-	cd benchmarks && for d in *bench*; do cd $$d && $(MAKE) || exit 1; done
-
 $(OBJ):
 	$(CC) $(CFLAGS) -o $@ $@.c
 
@@ -38,7 +35,6 @@ $(ROOTOBJ):
 
 clean:	
 	cd select && make clean
-	cd benchmarks && for d in *bench*; do cd $$d && $(MAKE) clean || exit 1; done
 	-rm -rf *.o *.s *.bak test? test?? test??-gcc t10a t11a t11b \
 		t40a t40b t40c t40d t40e t40f t43 DIR*
 

test/benchmarks/unixbench-5.1.2/run.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-export CC=cc
-export MINIX=1
-./Run

test/run-bench

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd benchmarks
-
-benchmarks=`echo *bench*`
-
-runbench() {
-	out="Results/$1.`date +%Y%m%d.%H%M%S`"
-	echo "Running $1, saving output to $out."
-	( cd $1 && sh run.sh 2>&1 ) | tee $out
-}
-
-clear
-n=1
-for b in $benchmarks
-do	echo "$n. $b"
-	eval "n$n=$b"
-	n=`expr $n + 1`
-done
-echo
-echo -n "Run which benchmark or 'all'? "
-read bench
-var=`eval echo "\\$n$bench"`
-if [ "$bench" = all ]
-then	for b in $benchmarks
-	do	runbench $b
-	done
-else	if [ -d "$var" ]
-	then	runbench $var
-	else	echo "Unknown benchmark."
-		exit 1
-	fi
-fi

tools/packages.install

@@ -10,7 +10,8 @@ apr-0.9.12
 apr-util-0.9.12
 ascii-3.8
 atk-1.9.0
-automake-1.9
+autoconf-2.60
+automake-1.10.3
 avra-0.7
 bash-3.0
 bc-1.06
@@ -29,7 +30,6 @@ exim-4.66
 fb
 flawfinder-1.26
 flex-2.5.4
-fltk-1.1.7
 fltk-2.0.0-5220
 gawk-3.1.4
 gcc-4.1.1
@@ -38,6 +38,7 @@ gettext-0.14
 ghostscript-8.54-gpl
 ghostscript-fonts-std-8.11
 glib-1.2.10
+glib-2.10.0
 gnu-coreutils-5.2.1
 gnupg-1.4.8
 grep-2.5.1a
@@ -45,6 +46,7 @@ groff-1.19.2
 gv-3.5.8
 gzip-1.2.4
 hexcat-0.0.3
+iperf-2.0.4
 irssi-0.8.10
 jikes-1.22
 john-1.7.2
@@ -60,7 +62,7 @@ libxml2-2.6.28
 links-2.1pre26
 lpr
 lynx2-8-5
-m4-1.4.3
+m4-1.4.8
 make-3.80
 mdf2iso
 mtools-3.9.7
@@ -72,7 +74,7 @@ neon-0.25.5
 nethack-3.4.3-2
 nomarch-1.3
 nvi-1.79
-openssh-4.3p2
+openssh-5.3p1
 openssl-0.9.8a
 patch-2.5.4
 pce-0.1.7
@@ -83,14 +85,14 @@ pine-4.64
 pkg-config-0.20
 psutils
 python-2.4.3
-qemu-0.10.5
+qemu-0.12.2
 rcs-5.7
 readline-5.1
 rman-3.2
 rsync-2.6.7
 postgresql-8.4.0
 screen-4.0.2
-sed-3.02
+sed-4.2.1
 shhmsg-1.4.1
 simhv35-2
 sip-0.4