mirror of
https://git.freebsd.org/ports.git
synced 2025-06-28 16:10:33 -04:00
73 lines
1.6 KiB
C
73 lines
1.6 KiB
C
--- ubench.c.orig 2000-05-28 20:07:21.000000000 -0700
|
|
+++ ubench.c 2010-11-23 14:20:52.000000000 -0800
|
|
@@ -37,11 +37,11 @@
|
|
#define sys_errlist _sys_errlist
|
|
#endif
|
|
|
|
-int cpubench();
|
|
-int membench();
|
|
+int cpubench(int);
|
|
+int membench(int);
|
|
#ifdef DISKNETYES
|
|
-int diskbench();
|
|
-int netbench();
|
|
+int diskbench(int);
|
|
+int netbench(int);
|
|
#endif
|
|
void signalSetup();
|
|
|
|
@@ -66,10 +66,10 @@
|
|
{
|
|
#ifdef DISKNETYES
|
|
fprintf(stderr,
|
|
- "Usage: ubench [-cmhs] [-d [raw_device]] [-n [interface]]\n");
|
|
+ "Usage: ubench [-cmhs] [-d [raw_device]] [-n [interface]] [-t testtime]\n");
|
|
#else
|
|
fprintf(stderr,
|
|
- "Usage: ubench [-cmhs]\n");
|
|
+ "Usage: ubench [-cmhs] [-t testtime]\n");
|
|
#endif
|
|
}
|
|
/*****************************************************************************/
|
|
@@ -81,6 +81,7 @@
|
|
int s = 1;
|
|
int k = 1;
|
|
int i = 1;
|
|
+ int timeout = 180;
|
|
|
|
while ( argc[i] )
|
|
if ( argc[i][0]=='-' )
|
|
@@ -112,6 +113,17 @@
|
|
s++;
|
|
ONEflag=1;
|
|
goto prgs;
|
|
+ case 't':
|
|
+ if (!argc[i][++s]) {
|
|
+ if (!argc[++i]) {
|
|
+ print_usage();
|
|
+ exit(1);
|
|
+ }
|
|
+ s = 0;
|
|
+ }
|
|
+ timeout = atoi(argc[i] + s);
|
|
+ s += strlen(argc[i] + s);
|
|
+ goto prgs;
|
|
default:
|
|
print_version();
|
|
print_usage();
|
|
@@ -156,11 +168,11 @@
|
|
#endif
|
|
}
|
|
i=0;
|
|
- if ( CPUflag ) i+=cpubench();
|
|
- if ( MEMflag ) i+=membench();
|
|
+ if ( CPUflag ) i+=cpubench(timeout);
|
|
+ if ( MEMflag ) i+=membench(timeout);
|
|
#ifdef DISKNETYES
|
|
- if ( DISKflag ) i+=diskbench();
|
|
- if ( NETflag ) i+=netbench();
|
|
+ if ( DISKflag ) i+=diskbench(timeout);
|
|
+ if ( NETflag ) i+=netbench(timeout);
|
|
if ( CPUflag&MEMflag&DISKflag&NETflag )
|
|
{
|
|
if ( ONEflag )
|