CVS: linux-atm/src/test ttcp.c,1.2,1.2.2.1

[chas w. <ch...@us...>]

Update of /cvsroot/linux-atm/linux-atm/src/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1597

Modified Files:
      Tag: V2_5_0
	ttcp.c 
Log Message:
quiet compiler warnings


Index: ttcp.c
===================================================================
RCS file: /cvsroot/linux-atm/linux-atm/src/test/ttcp.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** ttcp.c	9 Oct 2001 22:33:08 -0000	1.2
--- ttcp.c	18 Apr 2005 16:18:28 -0000	1.2.2.1
***************
*** 56,62 ****
--- 56,69 ----
  
  #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <getopt.h>
  #include <signal.h>
  #include <ctype.h>
  #include <errno.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
  #include <sys/types.h>
  #include <sys/socket.h>
***************
*** 121,127 ****
  
  struct hostent *addr;
- extern int errno;
- extern int optind;
- extern char *optarg;
  
  char Usage[] = "\
--- 128,131 ----
***************
*** 159,180 ****
  double cput, realt;		/* user, real time (seconds) */
  
! void err();
! void mes();
! int pattern();
! void prep_timer();
! double read_timer();
! int Nread();
! int Nwrite();
! void delay();
! int mread();
! char *outfmt();
! static void prusage();
! static void tvadd();
! static void tvsub();
! static void psecs();
  
  void
! sigpipe()
  {
  }
  
--- 163,185 ----
  double cput, realt;		/* user, real time (seconds) */
  
! void err(const char *);
! void mes(const char *);
! void pattern(char *, int);
! void prep_timer(void);
! double read_timer(char *,  int);
! int Nread(int, char *, int);
! int Nwrite(int, char *, int);
! void delay(long);
! int mread(int, char *, unsigned);
! char *outfmt(double);
! static void prusage(struct rusage *, struct rusage *, struct timeval *, struct timeval *, char *);
! static void tvadd(struct timeval *, struct timeval *, struct timeval *);
! static void tvsub(struct timeval *, struct timeval *, struct timeval *);
! static void psecs(long, char*);
  
  void
! sigpipe(int sig)
  {
+     return;
  }
  
***************
*** 184,190 ****
   *-------------------------------------------------------------------------
   */
! main(argc,argv)
! int argc;
! char **argv;
  {
      struct timeval td;
--- 189,194 ----
   *-------------------------------------------------------------------------
   */
! int
! main(int argc, char **argv)
  {
      struct timeval td;
***************
*** 276,282 ****
      }
  
!     if (port_name)
! 	if (atm) goto usage;
! 	else {
  	    struct servent *se;
  
--- 280,287 ----
      }
  
!     if (port_name) {
! 	if (atm) {
!             goto usage;
! 	} else {
  	    struct servent *se;
  
***************
*** 284,288 ****
  	    if (se) port = ntohs(se->s_port);
  	    else {
! 		const char *end;
  
  		port = strtoul(port_name,&end,0);
--- 289,293 ----
  	    if (se) port = ntohs(se->s_port);
  	    else {
! 		char *end;
  
  		port = strtoul(port_name,&end,0);
***************
*** 290,293 ****
--- 295,299 ----
  	    }
  	}     
+     }
  
      host = argv[optind];
***************
*** 407,440 ****
      }
  #endif
-     /* set socket buffer size */
- #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-     if (sockbufsize) {
- 	int len;
- 
- 	if (trans) {
- 	    /* set send socket buffer if we are transmitting */    
- 	    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize,
- 			   sizeof sockbufsize) < 0)
- 		err("setsockopt: sndbuf");
- 	    len = sizeof sockbufsize;
- 	    if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize, &len) < 0)
- 		perror("getsockopt: sndbuf");
- 	    mes("sndbuf");
- 	} else {
- 	    /* set receive socket buffer if we are receiving */    
- 	    if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize,
- 			   sizeof sockbufsize) < 0)
- 		err("setsockopt: rcvbuf");
- 	    len = sizeof sockbufsize;
- 	    if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize, &len) < 0)
- 		perror("getsockopt: rcvbuf");
- 	    mes("rcvbuf");
- 	}
- 	printf("real buffer size = %d\n",sockbufsize);
-     }
- #endif
  
      if (!atm || satm.sas_family == AF_ATMPVC || !trans)
! 	if (bind(fd, atm ? &satm : &sinme, atm ? satm.sas_family == AF_ATMPVC ?
  	  sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) :
  	  sizeof(sinme)) < 0)
--- 413,419 ----
      }
  #endif
  
      if (!atm || satm.sas_family == AF_ATMPVC || !trans)
! 	if (bind(fd, atm ? (struct sockaddr *) &satm : (struct sockaddr *) &sinme, atm ? satm.sas_family == AF_ATMPVC ?
  	  sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) :
  	  sizeof(sinme)) < 0)
***************
*** 454,458 ****
  	    }
  	    
! 	    if (connect(fd, atm ? &satm : &sinhim, atm ? sizeof(satm) :
  	      sizeof(sinhim)) < 0)
  		err("connect");
--- 433,437 ----
  	    }
  	    
! 	    if (connect(fd, atm ? (struct sockaddr *) &satm : (struct sockaddr *) &sinhim, atm ? sizeof(satm) :
  	      sizeof(sinhim)) < 0)
  		err("connect");
***************
*** 483,487 ****
  	    domain = AF_INET;
  	    
! 	    if ((fd=accept(fd, &frominet, &fromlen) ) < 0)
  		err("accept");
  	    
--- 462,466 ----
  	    domain = AF_INET;
  	    
! 	    if ((fd=accept(fd, (struct sockaddr *) &frominet, &fromlen) ) < 0)
  		err("accept");
  	    
***************
*** 489,493 ****
  		struct sockaddr_atmsvc peer;
  		int peerlen = sizeof(peer);
! 		if (getpeername(fd, (struct sockaddr_in *) &peer, 
  				&peerlen) < 0) {
  		    err("getpeername");
--- 468,472 ----
  		struct sockaddr_atmsvc peer;
  		int peerlen = sizeof(peer);
! 		if (getpeername(fd, (struct sockaddr *) &peer, 
  				&peerlen) < 0) {
  		    err("getpeername");
***************
*** 497,501 ****
  
  		    if (atm2text(name,MAX_ATM_ADDR_LEN+1,(struct sockaddr *)
! 		      &peer,A2T_NAME | A2T_PRETTY) < 0)
  			strcpy(name,"<invalid>");
  		    fprintf(stderr,"ttcp-r: accept from %s\n",name);
--- 476,480 ----
  
  		    if (atm2text(name,MAX_ATM_ADDR_LEN+1,(struct sockaddr *)
! 		      &peer,/* A2T_NAME | */ A2T_PRETTY) < 0)
  			strcpy(name,"<invalid>");
  		    fprintf(stderr,"ttcp-r: accept from %s\n",name);
***************
*** 516,519 ****
--- 495,527 ----
  	}
      }
+ 
+     /* set socket buffer size */
+ #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
+     if (sockbufsize) {
+ 	int len;
+ 
+ 	if (trans) {
+ 	    /* set send socket buffer if we are transmitting */    
+ 	    if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize,
+ 			   sizeof sockbufsize) < 0)
+ 		err("setsockopt: sndbuf");
+ 	    len = sizeof sockbufsize;
+ 	    if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize, &len) < 0)
+ 		perror("getsockopt: sndbuf");
+ 	    mes("sndbuf");
+         } else {
+ 	    /* set receive socket buffer if we are receiving */    
+ 	    if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize,
+ 			   sizeof sockbufsize) < 0)
+ 		err("setsockopt: rcvbuf");
+ 	    len = sizeof sockbufsize;
+ 	    if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize, &len) < 0)
+ 		perror("getsockopt: rcvbuf");
+ 	    mes("rcvbuf");
+ 	}
+ 	printf("real buffer size = %d\n",sockbufsize);
+     }
+ #endif
+ 
      if (tos) {
  	unsigned char tos_value;
***************
*** 614,618 ****
  	(void)Nwrite(fd, buf, 4);	/* rcvr end */
      }
!     
      if (cput <= 0.0)
  	cput = 0.001;
--- 622,626 ----
  	(void)Nwrite(fd, buf, 4);	/* rcvr end */
      }
! 
      if (cput <= 0.0)
  	cput = 0.001;
***************
*** 639,643 ****
  
  	fprintf(stdout,
! 		"ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n",
  		trans?"-t":"-r",
  		numCalls,
--- 647,651 ----
  
  	fprintf(stdout,
! 		"ttcp%s: %ld I/O calls, msec/call = %.2f, calls/sec = %.2f\n",
  		trans?"-t":"-r",
  		numCalls,
***************
*** 645,652 ****
  		((double)numCalls)/realt);
  	fprintf(stdout,
! 		"ttcp%s: buffer address %#x\n",
  		trans?"-t":"-r",
! 		buf);
      }
      exit(0);
  
--- 653,664 ----
  		((double)numCalls)/realt);
  	fprintf(stdout,
! 		"ttcp%s: buffer address %#lx\n",
  		trans?"-t":"-r",
! 		(unsigned long )buf);
      }
+ 
+     if (udp && trans)
+ 	sleep(1);
+ 
      exit(0);
  
***************
*** 657,662 ****
  
  void
! err(s)
! char *s;
  {
  	int	en = errno;
--- 669,673 ----
  
  void
! err(const char *s)
  {
  	int	en = errno;
***************
*** 671,676 ****
  
  void
! mes(s)
! char *s;
  {
  	fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s);
--- 682,686 ----
  
  void
! mes(const char *s)
  {
  	fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s);
***************
*** 682,685 ****
--- 692,696 ----
   *-------------------------------------------------------------------------
   */
+ void
  pattern(cp, cnt)
  register char *cp;
***************
*** 759,763 ****
   */
  void
! prep_timer()
  {
  	gettimeofday(&start_time, (struct timezone *)0);
--- 770,774 ----
   */
  void
! prep_timer(void)
  {
  	gettimeofday(&start_time, (struct timezone *)0);
***************
*** 771,774 ****
--- 782,786 ----
  double read_timer(str,len)
  char *str;
+ int len;
  {
      struct rusage ru1;
***************
*** 814,818 ****
  	cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
  #else
! 	cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
  #endif
  #endif
--- 826,830 ----
  	cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
  #else
! 	cp = (char *) "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
  #endif
  #endif
***************
*** 824,828 ****
  		case 'U':
  			tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime);
! 			sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
  			END(outp);
  			break;
--- 836,840 ----
  		case 'U':
  			tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime);
! 			sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
  			END(outp);
  			break;
***************
*** 830,834 ****
  		case 'S':
  			tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime);
! 			sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
  			END(outp);
  			break;
--- 842,846 ----
  		case 'S':
  			tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime);
! 			sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
  			END(outp);
  			break;
***************
*** 852,861 ****
  
  		case 'X':
! 			sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
  			END(outp);
  			break;
  
  		case 'D':
! 			sprintf(outp,"%d", t == 0 ? 0 :
  			    (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t);
  			END(outp);
--- 864,873 ----
  
  		case 'X':
! 			sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
  			END(outp);
  			break;
  
  		case 'D':
! 			sprintf(outp,"%ld", t == 0 ? 0 :
  			    (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t);
  			END(outp);
***************
*** 863,867 ****
  
  		case 'K':
! 			sprintf(outp,"%d", t == 0 ? 0 :
  			    ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) -
  			    (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t);
--- 875,879 ----
  
  		case 'K':
! 			sprintf(outp,"%ld", t == 0 ? 0 :
  			    ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) -
  			    (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t);
***************
*** 870,898 ****
  
  		case 'M':
! 			sprintf(outp,"%d", r1->ru_maxrss/2);
  			END(outp);
  			break;
  
  		case 'F':
! 			sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt);
  			END(outp);
  			break;
  
  		case 'R':
! 			sprintf(outp,"%d", r1->ru_minflt-r0->ru_minflt);
  			END(outp);
  			break;
  
  		case 'I':
! 			sprintf(outp,"%d", r1->ru_inblock-r0->ru_inblock);
  			END(outp);
  			break;
  
  		case 'O':
! 			sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublock);
  			END(outp);
  			break;
  		case 'C':
! 			sprintf(outp,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw,
  				r1->ru_nivcsw-r0->ru_nivcsw );
  			END(outp);
--- 882,910 ----
  
  		case 'M':
! 			sprintf(outp,"%ld", r1->ru_maxrss/2);
  			END(outp);
  			break;
  
  		case 'F':
! 			sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt);
  			END(outp);
  			break;
  
  		case 'R':
! 			sprintf(outp,"%ld", r1->ru_minflt-r0->ru_minflt);
  			END(outp);
  			break;
  
  		case 'I':
! 			sprintf(outp,"%ld", r1->ru_inblock-r0->ru_inblock);
  			END(outp);
  			break;
  
  		case 'O':
! 			sprintf(outp,"%ld", r1->ru_oublock-r0->ru_oublock);
  			END(outp);
  			break;
  		case 'C':
! 			sprintf(outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw,
  				r1->ru_nivcsw-r0->ru_nivcsw );
  			END(outp);
***************
*** 959,987 ****
   *			N R E A D
   */
! Nread( fd, buf, count )
! int fd;
! char *buf;
  int count;
  {
  	struct sockaddr_in from;
  	int len = sizeof(from);
  	register int cnt;
  	if( udp )  {
  #if 0
! 		cnt = recvfrom( fd, buf, count, 0, &from, &len );
  #else
! 		cnt = recv( fd, buf, count, 0);
  #endif
  		numCalls++;
  	} else {
  		if( b_flag )
! 			cnt = mread( fd, buf, count );	/* fill buf */
  		else {
! 			cnt = read( fd, buf, count );
  			numCalls++;
  		}
  		if (touchdata && cnt > 0) {
  			register int c = cnt, sum;
! 			register char *b = buf;
  			while (c--)
  				sum += *b++;
--- 971,1002 ----
   *			N R E A D
   */
! int
! Nread(_fd, _buf, count)
! int _fd;
! char *_buf;
  int count;
  {
+ #if 0
  	struct sockaddr_in from;
  	int len = sizeof(from);
+ #endif
  	register int cnt;
  	if( udp )  {
  #if 0
! 		cnt = recvfrom(_fd, _buf, count, 0, &from, &len );
  #else
! 		cnt = recv(_fd, _buf, count, 0);
  #endif
  		numCalls++;
  	} else {
  		if( b_flag )
! 			cnt = mread( _fd, _buf, count );	/* fill buf */
  		else {
! 			cnt = read( _fd, _buf, count );
  			numCalls++;
  		}
  		if (touchdata && cnt > 0) {
  			register int c = cnt, sum;
! 			register char *b = _buf;
  			while (c--)
  				sum += *b++;
***************
*** 995,1001 ****
   *-------------------------------------------------------------------------
   */
! Nwrite(fd, buf, count)
! int fd;
! char *buf;
  int count;
  {
--- 1010,1017 ----
   *-------------------------------------------------------------------------
   */
! int
! Nwrite(_fd, _buf, count)
! int _fd;
! char *_buf;
  int count;
  {
***************
*** 1004,1009 ****
      if (udp)  {
        again:
! 	if (atm) cnt = write(fd, buf, count);
! 	else cnt = sendto(fd, buf, count, 0, &sinhim, sizeof(sinhim));
  	numCalls++;
  	if ( cnt<0 && errno == ENOBUFS )  {
--- 1020,1025 ----
      if (udp)  {
        again:
! 	if (atm) cnt = write(_fd, _buf, count);
! 	else cnt = sendto(_fd, _buf, count, 0, (struct sockaddr *) &sinhim, sizeof(sinhim));
  	numCalls++;
  	if ( cnt<0 && errno == ENOBUFS )  {
***************
*** 1013,1017 ****
  	}
      } else {
! 	cnt = write(fd, buf, count);
  	numCalls++;
      }
--- 1029,1033 ----
  	}
      } else {
! 	cnt = write(_fd, _buf, count);
  	numCalls++;
      }
***************
*** 1021,1025 ****
  
  void
! delay(us)
  {
  	struct timeval tv;
--- 1037,1041 ----
  
  void
! delay(long us)
  {
  	struct timeval tv;
***************
*** 1027,1031 ****
  	tv.tv_sec = 0;
  	tv.tv_usec = us;
! 	(void)select( 1, (char *)0, (char *)0, (char *)0, &tv );
  }
  
--- 1043,1047 ----
  	tv.tv_sec = 0;
  	tv.tv_usec = us;
! 	(void)select( 1, (void *)0, (void *)0, (void *)0, &tv );
  }
  
***************
*** 1040,1045 ****
   */
  int
! mread(fd, bufp, n)
! int fd;
  register char	*bufp;
  unsigned	n;
--- 1056,1061 ----
   */
  int
! mread(_fd, bufp, n)
! int _fd;
  register char	*bufp;
  unsigned	n;
***************
*** 1049,1053 ****
  
  	do {
! 		nread = read(fd, bufp, n-count);
  		numCalls++;
  		if(nread < 0)  {
--- 1065,1069 ----
  
  	do {
! 		nread = read(_fd, bufp, n-count);
  		numCalls++;
  		if(nread < 0)  {