lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-29 13:01:13 +03:00
Code Activity

benchmarks: added "data" option

Browse Source
This commit is contained in:
Aris Adamantiadis
2011-08-28 14:03:27 +03:00
parent 5d9cd8bf39
commit faaf334aa3
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/benchmarks/bench_raw.c
View File

@ -107,7 +107,7 @@ error:
int benchmarks_raw_up (ssh_session session, struct argument_s *args, int benchmarks_raw_up (ssh_session session, struct argument_s *args,
float *bps){ float *bps){
unsigned long bytes=0x1000000; unsigned long bytes=0x1000000;
char *script=get_python_eater(bytes); char *script;
char cmd[128]; char cmd[128];
static char buffer[0x10000]; static char buffer[0x10000];
int err; int err;
@ -116,6 +116,9 @@ int benchmarks_raw_up (ssh_session session, struct argument_s *args,
float ms=0.0; float ms=0.0;
unsigned long total=0; unsigned long total=0;
if(args->data != 0)
bytes = args->data * 1024 * 1024;
script =get_python_eater(bytes);
err=upload_script(session,"/tmp/eater.py",script); err=upload_script(session,"/tmp/eater.py",script);
free(script); free(script);
if(err<0) if(err<0)
@ -221,7 +224,7 @@ static char *get_python_giver(unsigned long bytes){
int benchmarks_raw_down (ssh_session session, struct argument_s *args, int benchmarks_raw_down (ssh_session session, struct argument_s *args,
float *bps){ float *bps){
unsigned long bytes=0x1000000; unsigned long bytes=0x1000000;
char *script=get_python_giver(bytes); char *script;
char cmd[128]; char cmd[128];
static char buffer[0x10000]; static char buffer[0x10000];
int err; int err;
@ -230,6 +233,9 @@ int benchmarks_raw_down (ssh_session session, struct argument_s *args,
float ms=0.0; float ms=0.0;
unsigned long total=0; unsigned long total=0;
if(args->data != 0)
bytes = args->data * 1024 * 1024;
script =get_python_giver(bytes);
err=upload_script(session,"/tmp/giver.py",script); err=upload_script(session,"/tmp/giver.py",script);
free(script); free(script);
if(err<0) if(err<0)

13
tests/benchmarks/benchmarks.c
View File

@ -78,6 +78,14 @@ static struct argp_option options[] = {
.doc = "Add a host to connect for benchmark (format user@hostname)", .doc = "Add a host to connect for benchmark (format user@hostname)",
.group = 0 .group = 0
}, },
{
.name = "data",
.key = 'd',
.arg = "MBYTES",
.flags = 0,
.doc = "MBytes of data to send/receive per test",
.group = 0
},
{NULL, 0, NULL, 0, NULL, 0} {NULL, 0, NULL, 0, NULL, 0}
}; };
@ -100,6 +108,9 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) {
case 'v': case 'v':
arguments->verbose++; arguments->verbose++;
break; break;
case 'd':
arguments->data = atoi(arg);
break;
case 'h': case 'h':
if(arguments->nhosts >= MAX_HOSTS_CONNECT){ if(arguments->nhosts >= MAX_HOSTS_CONNECT){
fprintf(stderr, "Too much hosts\n"); fprintf(stderr, "Too much hosts\n");
@ -222,7 +233,7 @@ int main(int argc, char **argv){
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (arguments.ntests==0){ if (arguments.ntests==0){
for(i=1; i < BENCHMARK_NUMBER ; ++i){ for(i=0; i < BENCHMARK_NUMBER ; ++i){
arguments.benchmarks[i]=1; arguments.benchmarks[i]=1;
} }
arguments.ntests=BENCHMARK_NUMBER; arguments.ntests=BENCHMARK_NUMBER;

1
tests/benchmarks/benchmarks.h
View File

@ -41,6 +41,7 @@ struct argument_s {
int verbose; int verbose;
int nhosts; int nhosts;
int ntests; int ntests;
int data;
}; };
/* latency.c */ /* latency.c */