d/iperf3-tls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrected interval statics calculation

Browse Source
This commit is contained in:
kaustubhprabhu 2009-06-29 18:20:40 +00:00
parent b406b735e8
commit e1634906f1
2 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/iperf_api.c
View File

@ -44,8 +44,7 @@ static struct option longopts[] =
void add_interval_list(struct iperf_stream_result *rp, struct iperf_interval_results temp)
{
{
struct iperf_interval_results *n;
struct iperf_interval_results *ip = (struct iperf_interval_results *) malloc(sizeof(struct iperf_interval_results));
@ -61,11 +60,24 @@ void add_interval_list(struct iperf_stream_result *rp, struct iperf_interval_res
n = rp->interval_results;
while(n->next)
n = n->next;
n->next = ip;
}
}
void display_interval_list(struct iperf_stream_result *rp)
{
struct iperf_interval_results *n;
n = rp->interval_results;
while(n)
{
printf("Interval = %d\tBytes transferred = %llu\n", n->interval_duration, n->bytes_transferred);
n = n->next;
}
}
void send_result_to_client(struct iperf_stream *sp)
{
int result;
@ -521,6 +533,7 @@ void iperf_free_test(struct iperf_test *test)
void *iperf_stats_callback(struct iperf_test *test)
{
iperf_size_t cumulative_bytes = 0;
int i;
struct iperf_stream *sp = test->streams;
struct iperf_stream_result *rp = test->streams->result;
@ -531,41 +544,44 @@ void *iperf_stats_callback(struct iperf_test *test)
rp = sp->result;
if(!rp->interval_results)
{
printf(" 1st time \n");
{
if(test ->role == 'c')
temp.bytes_transferred = rp->bytes_sent;
else
temp.bytes_transferred = rp->bytes_received;
temp.interval_duration = test->stats_interval;
printf("\tnew = %llu \t total bytes = %llu \n", temp.bytes_transferred, sp->result->bytes_sent);
gettimeofday( &sp->result->end_time, NULL);
add_interval_list(rp, temp);
}
else
{
ip = sp->result->interval_results;
while(1)
{
cumulative_bytes+= ip->bytes_transferred;
if(ip->next!= NULL)
ip = ip->next;
else
break;
}
while(ip->next!= NULL)
ip = ip->next;
if(test ->role == 'c')
temp.bytes_transferred = rp->bytes_sent - ip->bytes_transferred;
temp.bytes_transferred = rp->bytes_sent - cumulative_bytes;
else
temp.bytes_transferred = rp->bytes_received - ip->bytes_transferred;
temp.bytes_transferred = rp->bytes_received - cumulative_bytes;
temp.interval_duration = test->stats_interval + ip->interval_duration;
printf("\tnew = %llu \t total bytes = %llu and duration = %d\n", temp.bytes_transferred, sp->result->bytes_sent, temp.interval_duration);
temp.interval_duration = test->stats_interval + ip->interval_duration;
gettimeofday( &sp->result->end_time, NULL);
add_interval_list(rp, temp);
}
add_interval_list(rp, temp);
}
//display_interval_list(rp);
cumulative_bytes =0;
sp= sp->next;
}
}
return 0;
}
@ -638,8 +654,6 @@ char *iperf_reporter_callback(struct iperf_test *test)
else
bytes+= sp->result->bytes_received;
gettimeofday( &sp->result->end_time, NULL);
sprintf(message,report_bw_header);
strcat(message_final, message);

22
src/iperf_api.h
View File

@ -125,20 +125,20 @@ enum {
RATE = 1000000,
MAX_BUFFER_SIZE =10,
DEFAULT_UDP_BLKSIZE = 1470,
DEFAULT_TCP_BLKSIZE = 8192
DEFAULT_TCP_BLKSIZE = 8192,
TEST_START = 1,
TEST_RUNNING = 2,
RESULT_REQUEST = 3,
RESULT_RESPOND = 4,
TEST_END = 5,
STREAM_BEGIN = 6,
STREAM_END = 7,
ALL_STREAMS_END = 8,
SEC_TO_US = 1000000
};
#define SEC_TO_NS 1000000000 /* too big for enum on some platforms */
#define SEC_TO_US 1000000
#define TEST_START 1
#define TEST_RUNNING 2
#define RESULT_REQUEST 3
#define RESULT_RESPOND 4
#define TEST_END 5
#define STREAM_BEGIN 6
#define STREAM_END 7
#define ALL_STREAMS_END 8
/**
* iperf_new_test -- return a new iperf_test with default values