Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-owner AT cygwin DOT com Delivered-To: mailing list cygwin AT cygwin DOT com From: "Ralf Habacker" To: "cygwin" Subject: RE: Old Thread: Cygwin Performance Date: Wed, 30 Jan 2002 10:58:23 +0100 Message-ID: <008801c1a974$a78e35e0$b66607d5@BRAMSCHE> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0089_01C1A97D.09529DE0" X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook 8.5, Build 4.71.2173.0 X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400 In-Reply-To: <004901c1a819$f8794370$b66607d5@BRAMSCHE> Importance: Normal ------=_NextPart_000_0089_01C1A97D.09529DE0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Hi all, this is my current patch for get running the lmbench-20 patch1 source from http://www.bitmover.com Content * initial patches from me. * Tim Prince lib_timing.c patch. * patch for disabling rpc checking without adding a new file. * bug fix of lat_select check (based on a hint of Christopher Failor) * prelimary fix for printing network informations Open Things: * full netstat -i support * uptime is missing Have fun Ralf ------=_NextPart_000_0089_01C1A97D.09529DE0 Content-Type: application/octet-stream; name="lmbench_2002_01_30.dif" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="lmbench_2002_01_30.dif" Common subdirectories: ./BitKeeper and ../LMbench_new/./BitKeeper=0A= Common subdirectories: ./SCCS and ../LMbench_new/./SCCS=0A= Only in ../LMbench_new/.: bin=0A= Common subdirectories: ./doc and ../LMbench_new/./doc=0A= Only in ../LMbench_new/.: lat_pipe.strace=0A= Only in ../LMbench_new/.: lat_unix.strace=0A= Common subdirectories: ./results and ../LMbench_new/./results=0A= Only in ../LMbench_new/.: results.txt=0A= Common subdirectories: ./scripts and ../LMbench_new/./scripts=0A= Common subdirectories: ./src and ../LMbench_new/./src=0A= Common subdirectories: ./BitKeeper/deleted and = ../LMbench_new/./BitKeeper/deleted=0A= Common subdirectories: ./BitKeeper/etc and ../LMbench_new/./BitKeeper/etc=0A= Common subdirectories: ./BitKeeper/log and ../LMbench_new/./BitKeeper/log=0A= Common subdirectories: ./BitKeeper/tmp and ../LMbench_new/./BitKeeper/tmp=0A= Common subdirectories: ./BitKeeper/deleted/SCCS and = ../LMbench_new/./BitKeeper/deleted/SCCS=0A= Common subdirectories: ./BitKeeper/etc/SCCS and = ../LMbench_new/./BitKeeper/etc/SCCS=0A= Only in ../LMbench_new/./doc: Makefile.bak=0A= Common subdirectories: ./doc/SCCS and ../LMbench_new/./doc/SCCS=0A= Only in ../LMbench_new/./doc: USENIX.PS=0A= Only in ../LMbench_new/./results: HTML=0A= Only in ../LMbench_new/./results: PS=0A= Common subdirectories: ./results/SCCS and ../LMbench_new/./results/SCCS=0A= Only in ../LMbench_new/./results: i686-pc-cygwin=0A= Only in ../LMbench_new/./results: i686-pc-linux-gnu=0A= Only in ../LMbench_new/./results: tmp=0A= Common subdirectories: ./scripts/SCCS and ../LMbench_new/./scripts/SCCS=0A= diff -ubB ./scripts/lmbench ../LMbench_new/./scripts/lmbench=0A= --- ./scripts/lmbench Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./scripts/lmbench Fri Jan 25 11:04:14 2002=0A= @@ -84,8 +84,11 @@=0A= =0A= echo \[`date`] 1>&2=0A= echo \[`uptime`] 1>&2=0A= -netstat -i | while read i=0A= -do echo \[net: "$i"] 1>&2=0A= +if test `uname -s | grep "CYGWIN" >/dev/null`; then =0A= + ifconfig /all=0A= +else =0A= + netstat -i | while read i=0A= + do echo \[net: "$i"] 1>&2=0A= set `echo $i`=0A= case $1 in=0A= *ame) ;;=0A= @@ -94,8 +97,8 @@=0A= done=0A= ;;=0A= esac=0A= -done=0A= -=0A= + done=0A= +fi =0A= mount | while read i=0A= do echo \[mount: "$i"] 1>&2=0A= done=0A= @@ -111,19 +114,34 @@=0A= =0A= date >> ${OUTPUT}=0A= echo Latency measurements >> ${OUTPUT}=0A= +echo -n "*" =0A= lat_syscall null=0A= +echo -n "*" =0A= lat_syscall read=0A= +echo -n "*" =0A= lat_syscall write=0A= +echo -n "*" =0A= lat_syscall stat $STAT=0A= +echo -n "*" =0A= lat_syscall fstat $STAT=0A= +echo -n "*" =0A= lat_syscall open $STAT=0A= +echo -n "*" =0A= for i in 10 100 250 500; do lat_select file $i; done=0A= +echo -n "*" =0A= for i in 10 100 250 500; do lat_select tcp $i; done=0A= +echo -n "*" =0A= lat_sig install=0A= +echo -n "*" =0A= lat_sig catch=0A= +echo -n "*" =0A= +echo -n "*" =0A= lat_sig prot lat_sig=0A= +echo -n "*" =0A= lat_pipe=0A= +echo -n "*" =0A= lat_unix=0A= +echo -n "*" =0A= cp hello /tmp/hello=0A= for i in fork exec shell; do lat_proc $i; done=0A= rm /tmp/hello =0A= @@ -141,6 +159,7 @@=0A= lat_fs $FSDIR=0A= echo "" 1>&2=0A= fi=0A= +echo -n "*" =0A= =0A= if [ X"$DISKS" !=3D X ]=0A= then for i in $DISKS=0A= @@ -151,6 +170,7 @@=0A= fi=0A= done=0A= fi=0A= +echo -n "*" =0A= =0A= date >> ${OUTPUT}=0A= echo Local networking >> ${OUTPUT}=0A= @@ -166,19 +186,31 @@=0A= for i in localhost=0A= do=0A= lat_udp $i=0A= +echo -n "*" =0A= lat_udp -$i=0A= +echo -n "*" =0A= lat_tcp $i=0A= +echo -n "*" =0A= lat_tcp -$i=0A= +echo -n "*" =0A= lat_rpc $i=0A= +echo -n "*" =0A= lat_rpc -$i=0A= +echo -n "*" =0A= lat_connect $i=0A= +echo -n "*" =0A= lat_connect -$i=0A= +echo -n "*" =0A= bw_tcp $i=0A= +echo -n "*" =0A= bw_tcp -$i=0A= # I want a hot cache number=0A= lat_http $i 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1=0A= +echo -n "*" =0A= lat_http $i 8008 < ../../src/webpage-lm/URLS=0A= +echo -n "*" =0A= lat_http -$i 8008=0A= +echo -n "*" =0A= done=0A= =0A= for remote in $REMOTE =0A= @@ -190,15 +222,24 @@=0A= $RSH $remote -n 'cd /tmp; tar xf webpage-lm.tar; cd webpage-lm; = ../lmhttp 8008' &=0A= sleep 10=0A= echo "[ Networking remote to $remote: `$RSH $remote uname -a` ]" 1>&2=0A= +echo -n "*" =0A= lat_udp $remote; lat_udp -$remote;=0A= +echo -n "*" =0A= lat_tcp $remote; lat_tcp -$remote;=0A= +echo -n "*" =0A= lat_rpc $remote udp; lat_rpc $remote tcp; lat_rpc -$remote; =0A= +echo -n "*" =0A= lat_connect $remote; lat_connect -$remote;=0A= +echo -n "*" =0A= bw_tcp $remote; bw_tcp -$remote =0A= # I want a hot cache number=0A= +echo -n "*" =0A= lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1=0A= +echo -n "*" =0A= lat_http $remote 8008 < ../../src/webpage-lm/URLS=0A= +echo -n "*" =0A= lat_http -$remote 8008=0A= +echo -n "*" =0A= RM=3D=0A= for server in $SERVERS=0A= do RM=3D"/tmp/$server $RM"=0A= @@ -209,55 +250,71 @@=0A= date >> ${OUTPUT}=0A= echo Bandwidth measurements >> ${OUTPUT}=0A= bw_unix=0A= +echo -n "*" =0A= bw_pipe=0A= +echo -n "*" =0A= echo "" 1>&2=0A= echo \"read bandwidth 1>&2=0A= for i in $ALL; do bw_file_rd $i io_only $FILE; done=0A= echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "" 1>&2=0A= echo \"read open2close bandwidth 1>&2=0A= for i in $ALL; do bw_file_rd $i open2close $FILE; done=0A= echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"Mmap read bandwidth 1>&2=0A= for i in $ALL; do bw_mmap_rd $i mmap_only $FILE; done=0A= echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"Mmap read open2close bandwidth 1>&2=0A= for i in $ALL; do bw_mmap_rd $i open2close $FILE; done=0A= echo "" 1>&2=0A= rm -f $FILE=0A= +echo -n "*" =0A= =0A= echo \"libc bcopy unaligned 1>&2=0A= for i in $HALF; do bw_mem $i bcopy; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"libc bcopy aligned 1>&2=0A= for i in $HALF; do bw_mem $i bcopy conflict; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"unrolled bcopy unaligned 1>&2=0A= for i in $HALF; do bw_mem $i fcp; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"unrolled partial bcopy unaligned 1>&2=0A= for i in $HALF; do bw_mem $i cp; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory read bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i frd; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory partial read bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i rd; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory write bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i fwr; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory partial write bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i wr; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory partial read/write bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i rdwr; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory bzero bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i bzero; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= date >> ${OUTPUT}=0A= msleep 250=0A= Only in ../LMbench_new/./scripts: lmbench.bak=0A= --- ./scripts/lmbench Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./scripts/lmbench Fri Jan 25 11:04:14 2002=0A= @@ -84,8 +84,11 @@=0A= =0A= echo \[`date`] 1>&2=0A= echo \[`uptime`] 1>&2=0A= -netstat -i | while read i=0A= -do echo \[net: "$i"] 1>&2=0A= +if test `uname -s | grep "CYGWIN" >/dev/null`; then =0A= + ifconfig /all=0A= +else =0A= + netstat -i | while read i=0A= + do echo \[net: "$i"] 1>&2=0A= set `echo $i`=0A= case $1 in=0A= *ame) ;;=0A= @@ -94,8 +97,8 @@=0A= done=0A= ;;=0A= esac=0A= -done=0A= -=0A= + done=0A= +fi =0A= mount | while read i=0A= do echo \[mount: "$i"] 1>&2=0A= done=0A= @@ -111,19 +114,34 @@=0A= =0A= date >> ${OUTPUT}=0A= echo Latency measurements >> ${OUTPUT}=0A= +echo -n "*" =0A= lat_syscall null=0A= +echo -n "*" =0A= lat_syscall read=0A= +echo -n "*" =0A= lat_syscall write=0A= +echo -n "*" =0A= lat_syscall stat $STAT=0A= +echo -n "*" =0A= lat_syscall fstat $STAT=0A= +echo -n "*" =0A= lat_syscall open $STAT=0A= +echo -n "*" =0A= for i in 10 100 250 500; do lat_select file $i; done=0A= +echo -n "*" =0A= for i in 10 100 250 500; do lat_select tcp $i; done=0A= +echo -n "*" =0A= lat_sig install=0A= +echo -n "*" =0A= lat_sig catch=0A= +echo -n "*" =0A= +echo -n "*" =0A= lat_sig prot lat_sig=0A= +echo -n "*" =0A= lat_pipe=0A= +echo -n "*" =0A= lat_unix=0A= +echo -n "*" =0A= cp hello /tmp/hello=0A= for i in fork exec shell; do lat_proc $i; done=0A= rm /tmp/hello =0A= @@ -141,6 +159,7 @@=0A= lat_fs $FSDIR=0A= echo "" 1>&2=0A= fi=0A= +echo -n "*" =0A= =0A= if [ X"$DISKS" !=3D X ]=0A= then for i in $DISKS=0A= @@ -151,6 +170,7 @@=0A= fi=0A= done=0A= fi=0A= +echo -n "*" =0A= =0A= date >> ${OUTPUT}=0A= echo Local networking >> ${OUTPUT}=0A= @@ -166,19 +186,31 @@=0A= for i in localhost=0A= do=0A= lat_udp $i=0A= +echo -n "*" =0A= lat_udp -$i=0A= +echo -n "*" =0A= lat_tcp $i=0A= +echo -n "*" =0A= lat_tcp -$i=0A= +echo -n "*" =0A= lat_rpc $i=0A= +echo -n "*" =0A= lat_rpc -$i=0A= +echo -n "*" =0A= lat_connect $i=0A= +echo -n "*" =0A= lat_connect -$i=0A= +echo -n "*" =0A= bw_tcp $i=0A= +echo -n "*" =0A= bw_tcp -$i=0A= # I want a hot cache number=0A= lat_http $i 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1=0A= +echo -n "*" =0A= lat_http $i 8008 < ../../src/webpage-lm/URLS=0A= +echo -n "*" =0A= lat_http -$i 8008=0A= +echo -n "*" =0A= done=0A= =0A= for remote in $REMOTE =0A= @@ -190,15 +222,24 @@=0A= $RSH $remote -n 'cd /tmp; tar xf webpage-lm.tar; cd webpage-lm; = ../lmhttp 8008' &=0A= sleep 10=0A= echo "[ Networking remote to $remote: `$RSH $remote uname -a` ]" 1>&2=0A= +echo -n "*" =0A= lat_udp $remote; lat_udp -$remote;=0A= +echo -n "*" =0A= lat_tcp $remote; lat_tcp -$remote;=0A= +echo -n "*" =0A= lat_rpc $remote udp; lat_rpc $remote tcp; lat_rpc -$remote; =0A= +echo -n "*" =0A= lat_connect $remote; lat_connect -$remote;=0A= +echo -n "*" =0A= bw_tcp $remote; bw_tcp -$remote =0A= # I want a hot cache number=0A= +echo -n "*" =0A= lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1=0A= +echo -n "*" =0A= lat_http $remote 8008 < ../../src/webpage-lm/URLS=0A= +echo -n "*" =0A= lat_http -$remote 8008=0A= +echo -n "*" =0A= RM=3D=0A= for server in $SERVERS=0A= do RM=3D"/tmp/$server $RM"=0A= @@ -209,55 +250,71 @@=0A= date >> ${OUTPUT}=0A= echo Bandwidth measurements >> ${OUTPUT}=0A= bw_unix=0A= +echo -n "*" =0A= bw_pipe=0A= +echo -n "*" =0A= echo "" 1>&2=0A= echo \"read bandwidth 1>&2=0A= for i in $ALL; do bw_file_rd $i io_only $FILE; done=0A= echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "" 1>&2=0A= echo \"read open2close bandwidth 1>&2=0A= for i in $ALL; do bw_file_rd $i open2close $FILE; done=0A= echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"Mmap read bandwidth 1>&2=0A= for i in $ALL; do bw_mmap_rd $i mmap_only $FILE; done=0A= echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"Mmap read open2close bandwidth 1>&2=0A= for i in $ALL; do bw_mmap_rd $i open2close $FILE; done=0A= echo "" 1>&2=0A= rm -f $FILE=0A= +echo -n "*" =0A= =0A= echo \"libc bcopy unaligned 1>&2=0A= for i in $HALF; do bw_mem $i bcopy; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"libc bcopy aligned 1>&2=0A= for i in $HALF; do bw_mem $i bcopy conflict; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"unrolled bcopy unaligned 1>&2=0A= for i in $HALF; do bw_mem $i fcp; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo \"unrolled partial bcopy unaligned 1>&2=0A= for i in $HALF; do bw_mem $i cp; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory read bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i frd; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory partial read bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i rd; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory write bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i fwr; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory partial write bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i wr; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory partial read/write bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i rdwr; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= echo "Memory bzero bandwidth" 1>&2=0A= for i in $ALL; do bw_mem $i bzero; done; echo "" 1>&2=0A= +echo -n "*" =0A= =0A= date >> ${OUTPUT}=0A= msleep 250=0A= diff -ubB ./src/Makefile ../LMbench_new/./src/Makefile=0A= --- ./src/Makefile Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/Makefile Wed Jan 30 09:52:30 2002=0A= @@ -85,7 +85,7 @@=0A= LIBOBJS=3D $O/lib_tcp.o $O/lib_udp.o $O/lib_unix.o $O/lib_timing.o = $O/lib_stats.o=0A= =0A= lmbench: $(UTILS)=0A= - @env CFLAGS=3D-O MAKE=3D"$(MAKE)" MAKEFLAGS=3D"$(MAKEFLAGS)" = ../scripts/build all=0A= + @env CFLAGS=3D"-O2" MAKE=3D"$(MAKE)" MAKEFLAGS=3D"$(MAKEFLAGS)" = ../scripts/build all=0A= =0A= results: lmbench=0A= @../scripts/config-run=0A= Only in ../LMbench_new/./src: Makefile.bak=0A= Common subdirectories: ./src/SCCS and ../LMbench_new/./src/SCCS=0A= diff -ubB ./src/bench.h ../LMbench_new/./src/bench.h=0A= --- ./src/bench.h Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/bench.h Sun Jan 27 19:38:02 2002=0A= @@ -4,6 +4,12 @@=0A= #ifndef _BENCH_H=0A= #define _BENCH_H=0A= =0A= +// This is needed for lat_select=0A= +#ifdef __CYGWIN__=0A= +#define FD_SETSIZE 550=0A= +#define NO_PORTMAPPER=0A= +#endif =0A= +=0A= #ifdef WIN32=0A= #include =0A= typedef unsigned char bool_t;=0A= @@ -34,9 +40,13 @@=0A= #include =0A= #include =0A= #include =0A= +#ifdef __CYGWIN__=0A= +#include =0A= +#else =0A= #define PORTMAP=0A= #include =0A= #endif=0A= +#endif =0A= =0A= #ifndef HAVE_uint=0A= typedef unsigned int uint;=0A= @@ -239,9 +249,9 @@=0A= * Please do not edit this file.=0A= * It was generated using rpcgen.=0A= */=0A= -=0A= +#ifndef __CYGWIN__=0A= #include =0A= -=0A= +#endif =0A= #define XACT_PROG ((u_long)404040)=0A= #define XACT_VERS ((u_long)1)=0A= #define RPC_XACT ((u_long)1)=0A= Only in ../LMbench_new/./src: bench.h.bak=0A= diff -ubB ./src/disk.c ../LMbench_new/./src/disk.c=0A= --- ./src/disk.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/disk.c Sun Jan 27 08:30:13 2002=0A= @@ -6,12 +6,12 @@=0A= * Copyright (c) 1994-1997 Larry McVoy. All rights reserved.=0A= * Bits of this are derived from work by Ethan Solomita.=0A= */=0A= +#include "bench.h"=0A= =0A= #include =0A= #include =0A= #include =0A= #include =0A= -#include "bench.h"=0A= =0A= #ifndef sgi=0A= #define NO_LSEEK64=0A= diff -ubB ./src/lat_rpc.c ../LMbench_new/./src/lat_rpc.c=0A= --- ./src/lat_rpc.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lat_rpc.c Sun Jan 27 19:52:51 2002=0A= @@ -16,6 +16,8 @@=0A= char *id =3D "$Id$\n";=0A= #include "bench.h"=0A= =0A= +#ifndef NO_PORTMAPPER=0A= +=0A= void client_main(int ac, char **av);=0A= void server_main(void);=0A= void benchmark(char *server, char* protocol);=0A= @@ -225,3 +227,10 @@=0A= }=0A= return;=0A= }=0A= +#else=0A= +int=0A= +main(int ac, char **av)=0A= +{=0A= + return 0;=0A= +}=0A= +#endif =0A= Only in ../LMbench_new/./src: lat_rpc.c.bak=0A= Only in ../LMbench_new/./src: lib_cygwin.c=0A= diff -ubB ./src/lib_tcp.c ../LMbench_new/./src/lib_tcp.c=0A= --- ./src/lib_tcp.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lib_tcp.c Sun Jan 27 19:36:45 2002=0A= @@ -42,6 +42,7 @@=0A= exit(4);=0A= }=0A= if (prog > 0) {=0A= +#ifndef NO_PORTMAPPER=0A= #ifdef LIBTCP_VERBOSE=0A= fprintf(stderr, "Server port %d\n", sockport(sock));=0A= #endif=0A= @@ -51,6 +52,7 @@=0A= perror("pmap_set");=0A= exit(5);=0A= }=0A= +#endif =0A= }=0A= return (sock);=0A= }=0A= @@ -62,7 +64,9 @@=0A= tcp_done(int prog)=0A= {=0A= if (prog > 0) {=0A= +#ifndef NO_PORTMAPPER=0A= pmap_unset((u_long)prog, (u_long)1);=0A= +#endif =0A= }=0A= return (0);=0A= }=0A= @@ -159,7 +163,9 @@=0A= bzero((void *) &s, sizeof(s));=0A= s.sin_family =3D AF_INET;=0A= bcopy((void*)h->h_addr, (void *)&s.sin_addr, h->h_length);=0A= +=0A= if (prog > 0) {=0A= +#ifndef NO_PORTMAPPER=0A= save_port =3D pmap_getport(&s, prog,=0A= (u_long)1, IPPROTO_TCP);=0A= if (!save_port) {=0A= @@ -170,6 +176,7 @@=0A= fprintf(stderr, "Server port %d\n", save_port);=0A= #endif=0A= s.sin_port =3D htons(save_port);=0A= +#endif =0A= } else {=0A= s.sin_port =3D htons(-prog);=0A= }=0A= Only in ../LMbench_new/./src: lib_tcp.c.bak=0A= diff -ubB ./src/lib_timing.c ../LMbench_new/./src/lib_timing.c=0A= --- ./src/lib_timing.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lib_timing.c Sun Jan 27 19:19:09 2002=0A= @@ -865,7 +865,8 @@=0A= }=0A= #endif=0A= =0A= -#ifdef WIN32=0A= +#if defined(WIN32)=0A= +#if !defined(__CYGWIN__)=0A= int=0A= getpagesize()=0A= {=0A= @@ -874,6 +875,7 @@=0A= GetSystemInfo(&s);=0A= return ((int)s.dwPageSize);=0A= }=0A= +#endif=0A= =0A= LARGE_INTEGER=0A= getFILETIMEoffset()=0A= diff -ubB ./src/lib_udp.c ../LMbench_new/./src/lib_udp.c=0A= --- ./src/lib_udp.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lib_udp.c Sun Jan 27 19:44:17 2002=0A= @@ -51,7 +51,9 @@=0A= void=0A= udp_done(int prog)=0A= {=0A= +#ifndef NO_PORTMAPPER=0A= (void)pmap_unset((u_long)prog, (u_long)1);=0A= +#endif =0A= }=0A= =0A= /*=0A= Only in ../LMbench_new/./src: lib_udp.c.bak=0A= diff -ubB ./src/lmdd.c ../LMbench_new/./src/lmdd.c=0A= --- ./src/lmdd.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lmdd.c Sun Jan 27 08:29:33 2002=0A= @@ -34,6 +34,8 @@=0A= #define FLUSH=0A= #endif=0A= =0A= +#include "bench.h"=0A= +=0A= #include =0A= #include =0A= #include =0A= @@ -43,7 +45,6 @@=0A= #include =0A= #include =0A= #include =0A= -#include "bench.h"=0A= =0A= #undef ALIGN=0A= #define ALIGN(x, bs) ((x + (bs - 1)) & ~(bs - 1))=0A= Only in ../LMbench_new/./src: test.c=0A= Only in ../LMbench_new/./src: test.c.bak=0A= Only in ../LMbench_new/./src: test.exe=0A= Only in ../LMbench_new/./src: test.i=0A= Only in ../LMbench_new/./src: test.o=0A= Only in ../LMbench_new/./src: test.s=0A= diff -ubB ./src/timing.h ../LMbench_new/./src/timing.h=0A= --- ./src/timing.h Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/timing.h Fri Nov 30 17:10:18 2001=0A= @@ -42,7 +42,7 @@=0A= uint64 usecs_spent(void);=0A= void touch(char *buf, int size);=0A= =0A= -#if defined(hpux) || defined(__hpux) || defined(WIN32)=0A= +#if defined(hpux) || defined(__hpux) || (defined(WIN32) && = !defined(__CYGWIN__))=0A= int getpagesize();=0A= #endif=0A= =0A= Only in ../LMbench_new/./src: webpage-lm=0A= --- ./src/bench.h Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/bench.h Sun Jan 27 19:38:02 2002=0A= @@ -4,6 +4,12 @@=0A= #ifndef _BENCH_H=0A= #define _BENCH_H=0A= =0A= +// This is needed for lat_select=0A= +#ifdef __CYGWIN__=0A= +#define FD_SETSIZE 550=0A= +#define NO_PORTMAPPER=0A= +#endif =0A= +=0A= #ifdef WIN32=0A= #include =0A= typedef unsigned char bool_t;=0A= @@ -34,9 +40,13 @@=0A= #include =0A= #include =0A= #include =0A= +#ifdef __CYGWIN__=0A= +#include =0A= +#else =0A= #define PORTMAP=0A= #include =0A= #endif=0A= +#endif =0A= =0A= #ifndef HAVE_uint=0A= typedef unsigned int uint;=0A= @@ -239,9 +249,9 @@=0A= * Please do not edit this file.=0A= * It was generated using rpcgen.=0A= */=0A= -=0A= +#ifndef __CYGWIN__=0A= #include =0A= -=0A= +#endif =0A= #define XACT_PROG ((u_long)404040)=0A= #define XACT_VERS ((u_long)1)=0A= #define RPC_XACT ((u_long)1)=0A= --- ./src/disk.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/disk.c Sun Jan 27 08:30:13 2002=0A= @@ -6,12 +6,12 @@=0A= * Copyright (c) 1994-1997 Larry McVoy. All rights reserved.=0A= * Bits of this are derived from work by Ethan Solomita.=0A= */=0A= +#include "bench.h"=0A= =0A= #include =0A= #include =0A= #include =0A= #include =0A= -#include "bench.h"=0A= =0A= #ifndef sgi=0A= #define NO_LSEEK64=0A= --- ./src/lat_rpc.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lat_rpc.c Sun Jan 27 19:52:51 2002=0A= @@ -16,6 +16,8 @@=0A= char *id =3D "$Id$\n";=0A= #include "bench.h"=0A= =0A= +#ifndef NO_PORTMAPPER=0A= +=0A= void client_main(int ac, char **av);=0A= void server_main(void);=0A= void benchmark(char *server, char* protocol);=0A= @@ -225,3 +227,10 @@=0A= }=0A= return;=0A= }=0A= +#else=0A= +int=0A= +main(int ac, char **av)=0A= +{=0A= + return 0;=0A= +}=0A= +#endif =0A= --- ./src/lib_tcp.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lib_tcp.c Sun Jan 27 19:36:45 2002=0A= @@ -42,6 +42,7 @@=0A= exit(4);=0A= }=0A= if (prog > 0) {=0A= +#ifndef NO_PORTMAPPER=0A= #ifdef LIBTCP_VERBOSE=0A= fprintf(stderr, "Server port %d\n", sockport(sock));=0A= #endif=0A= @@ -51,6 +52,7 @@=0A= perror("pmap_set");=0A= exit(5);=0A= }=0A= +#endif =0A= }=0A= return (sock);=0A= }=0A= @@ -62,7 +64,9 @@=0A= tcp_done(int prog)=0A= {=0A= if (prog > 0) {=0A= +#ifndef NO_PORTMAPPER=0A= pmap_unset((u_long)prog, (u_long)1);=0A= +#endif =0A= }=0A= return (0);=0A= }=0A= @@ -159,7 +163,9 @@=0A= bzero((void *) &s, sizeof(s));=0A= s.sin_family =3D AF_INET;=0A= bcopy((void*)h->h_addr, (void *)&s.sin_addr, h->h_length);=0A= +=0A= if (prog > 0) {=0A= +#ifndef NO_PORTMAPPER=0A= save_port =3D pmap_getport(&s, prog,=0A= (u_long)1, IPPROTO_TCP);=0A= if (!save_port) {=0A= @@ -170,6 +176,7 @@=0A= fprintf(stderr, "Server port %d\n", save_port);=0A= #endif=0A= s.sin_port =3D htons(save_port);=0A= +#endif =0A= } else {=0A= s.sin_port =3D htons(-prog);=0A= }=0A= --- ./src/lib_timing.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lib_timing.c Sun Jan 27 19:19:09 2002=0A= @@ -865,7 +865,8 @@=0A= }=0A= #endif=0A= =0A= -#ifdef WIN32=0A= +#if defined(WIN32)=0A= +#if !defined(__CYGWIN__)=0A= int=0A= getpagesize()=0A= {=0A= @@ -874,6 +875,7 @@=0A= GetSystemInfo(&s);=0A= return ((int)s.dwPageSize);=0A= }=0A= +#endif=0A= =0A= LARGE_INTEGER=0A= getFILETIMEoffset()=0A= --- ./src/lib_udp.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lib_udp.c Sun Jan 27 19:44:17 2002=0A= @@ -51,7 +51,9 @@=0A= void=0A= udp_done(int prog)=0A= {=0A= +#ifndef NO_PORTMAPPER=0A= (void)pmap_unset((u_long)prog, (u_long)1);=0A= +#endif =0A= }=0A= =0A= /*=0A= --- ./src/lmdd.c Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/lmdd.c Sun Jan 27 08:29:33 2002=0A= @@ -34,6 +34,8 @@=0A= #define FLUSH=0A= #endif=0A= =0A= +#include "bench.h"=0A= +=0A= #include =0A= #include =0A= #include =0A= @@ -43,7 +45,6 @@=0A= #include =0A= #include =0A= #include =0A= -#include "bench.h"=0A= =0A= #undef ALIGN=0A= #define ALIGN(x, bs) ((x + (bs - 1)) & ~(bs - 1))=0A= --- ./src/Makefile Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/Makefile Wed Jan 30 09:52:30 2002=0A= @@ -85,7 +85,7 @@=0A= LIBOBJS=3D $O/lib_tcp.o $O/lib_udp.o $O/lib_unix.o $O/lib_timing.o = $O/lib_stats.o=0A= =0A= lmbench: $(UTILS)=0A= - @env CFLAGS=3D-O MAKE=3D"$(MAKE)" MAKEFLAGS=3D"$(MAKEFLAGS)" = ../scripts/build all=0A= + @env CFLAGS=3D"-O2" MAKE=3D"$(MAKE)" MAKEFLAGS=3D"$(MAKEFLAGS)" = ../scripts/build all=0A= =0A= results: lmbench=0A= @../scripts/config-run=0A= --- ./src/timing.h Mon Jul 23 07:08:47 2001=0A= +++ ../LMbench_new/./src/timing.h Fri Nov 30 17:10:18 2001=0A= @@ -42,7 +42,7 @@=0A= uint64 usecs_spent(void);=0A= void touch(char *buf, int size);=0A= =0A= -#if defined(hpux) || defined(__hpux) || defined(WIN32)=0A= +#if defined(hpux) || defined(__hpux) || (defined(WIN32) && = !defined(__CYGWIN__))=0A= int getpagesize();=0A= #endif=0A= =0A= ------=_NextPart_000_0089_01C1A97D.09529DE0 Content-Type: text/plain; charset=us-ascii -- Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple Bug reporting: http://cygwin.com/bugs.html Documentation: http://cygwin.com/docs.html FAQ: http://cygwin.com/faq/ ------=_NextPart_000_0089_01C1A97D.09529DE0--