monoid/HW12
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Compare commits

base: monoid:4eaed57a0c3a95069037096319638f7ccf583d58
Branches Tags
monoid:master
..
compare: monoid:a5e9d821b095b7b77fc91ee51fc73273ca6ddf53
Branches Tags
monoid:master

No commits in common. "4eaed57a0c3a95069037096319638f7ccf583d58" and "a5e9d821b095b7b77fc91ee51fc73273ca6ddf53" have entirely different histories.
4eaed57a0c ... a5e9d821b0

9 changed files with 161 additions and 383 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -61,4 +61,3 @@ p-server
server
client
slowclient
slowserver

31
Makefile
View File

@ -3,8 +3,7 @@ CFLAGS = -lm -Wall -O2 -pthread
ServerBin = server p-server
ClientBin = client p-client
Bin = $(ServerBin) $(ClientBin)
ClientObject = display_bar.o socket_wrapper.o
ServerObject = display_bar.o socket_wrapper.o
all:
make $(Bin)
@ -12,23 +11,19 @@ socket_wrapper.o: socket_wrapper.c socket_wrapper.h
$(CC) -c socket_wrapper.c -o socket_wrapper.o $(CFLAGS)
display_bar.o: display_bar.c display_bar.h
$(CC) -c display_bar.c -o display_bar.o $(CFLAGS)
#client
client: client.c $(ClientObject)
$(CC) -o client client.c $(ClientObject) $(CFLAGS)
p-client: p-client.c $(ClientObject)
$(CC) -o p-client p-client.c socket_wrapper.o $(CFLAGS)
p-mulclient: p-client.c $(ClientObject)
$(CC) -o p-slowclient p-client.c $(ClientObject) $(CFLAGS) -D MUL_CLIENT=10
slowclient: client.c $(ClientObject)
$(CC) -o slowclient client.c $(ClientObject) $(CFLAGS) -D SLOW_CLIENT=1000
#server
server: server.c $(ServerObject)
$(CC) -o server server.c $(ServerObject) $(CFLAGS)
p-server: p-server.c $(ServerObject)
$(CC) -o p-server p-server.c $(ServerObject) $(CFLAGS)
slowserver: server.c $(ServerObject)
$(CC) -o slowserver server.c $(ServerObject) $(CFLAGS) -D SLOW_SERVER=100000
client: socket_wrapper.o client.c
$(CC) -o client client.c socket_wrapper.o $(CFLAGS)
server: socket_wrapper.o server.c display_bar.o
$(CC) -o server server.c socket_wrapper.o display_bar.o $(CFLAGS)
p-server: socket_wrapper.o p-server.c
$(CC) -o p-server p-server.c socket_wrapper.o $(CFLAGS)
p-client: socket_wrapper.o p-client.c
$(CC) -o p-client p-client.c socket_wrapper.o $(CFLAGS)
p-mulclient: socket_wrapper.o p-client.c
$(CC) -o p-slowclient p-client.c socket_wrapper.o $(CFLAGS) -D MUL_CLIENT=10
slowclient: socket_wrapper.o client.c
$(CC) -o slowclient client.c socket_wrapper.o $(CFLAGS) -D SLOW_CLIENT=1000
.PHONY: clean test
clean:

2
README.md
View File

@ -41,5 +41,5 @@ For client
For both
- TIMEOUT: 5(second unit)
- DEFAULT_MAX_TERMINAL_ROW: 1000
- MAX_TERMINAL_ROW
- DEFAULT_PROGRESS_BAR_WIDTH: 30

136
client.c
View File

@ -16,26 +16,21 @@
#include <pthread.h>
#include "socket_wrapper.h"
#include "timerhelper.h"
#include "display_bar.h"
#ifndef DEFAULT_TIMEOUT
static const int TIMEOUT = 5;
#else
static const int TIMEOUT = DEFAULT_TIMEOUT;
#endif
#ifndef DEFAULT_PROGRESS_BAR_WIDTH
static const int PROGRESS_BAR_WIDTH = 30;
#else
static const int PROGRESS_BAR_WIDTH = DEFAULT_PROGRESS_BAR_WIDTH;
#endif
enum{
FILENAME_BUF_SIZE = 1024
};
static bool DisplayProgress = true;
static inline void server_perror(const char * msg){
if(DisplayProgress)
myd_perror(msg);
else
perror(msg);
}
/*========
*Operation
*========*/
@ -45,63 +40,93 @@ int sendReadOp(int sock,const char * filename){
op.file_url_size = strlen(filename);
op.padding0 = 0;
if(send(sock,&op,sizeof(op),0)<0){
server_perror("readop send fail");
perror("readop send fail");
return -1;
}
#ifdef MUL_CLIENT
sleep(MUL_CLIENT);
#endif
if(send(sock,filename,op.file_url_size,0)<0){
server_perror("readop filename send fail");
perror("readop filename send fail");
return -1;
}
return 0;
}
/**
* @arg cur_progress : it is percentage.
*/
bool isProgressBarNeedUpdate(size_t offset,size_t total,double cur_progress){
return ((double)offset / (double)total) > (cur_progress / 100.0);
}
void DisplayProgressBar(size_t offset,size_t total,double cur_progress){
char buf[PROGRESS_BAR_WIDTH];
size_t i;
size_t cur_pos = (cur_progress / 100.0 * PROGRESS_BAR_WIDTH); //must be less than SIZE_MAX. other value is undefined behavior.
for (i = 0; i < PROGRESS_BAR_WIDTH; i++)
{
if (i < cur_pos)
buf[i] = '=';
else if(i == cur_pos)
buf[i] = '>';
else buf[i] = '.';
}
printf("\r[%s]: %.2f%% bytes: %ld/%ld bytes",buf,cur_progress,total,offset);
}
void DisplayProgressBar100Percent(size_t total){
size_t i;
char buf[PROGRESS_BAR_WIDTH+1];
for (i = 0; i < PROGRESS_BAR_WIDTH; i++){
buf[i] = '=';
}
buf[PROGRESS_BAR_WIDTH] = '\0';
printf("\r[%s]: 100%% bytes: %ld/%ld bytes\n",buf,total,total);
}
static bool DisplayProgress = true;
int recvFile(int sock, const char * filename,size_t file_size){
int fd;
size_t count = 0;
int i;
double cur_progress = 1;
int return_value = 0;
int buf_sz = getBufferSizeFrom(sock);
progress_bar_t pbar;
uint8_t * buf = malloc(buf_sz*sizeof(*buf));
if (buf == NULL){
return -1;
}
fd = open(filename,O_WRONLY|O_CREAT|O_TRUNC,S_IRWXU|S_IRWXG|S_IROTH);
if (fd < 0){
server_perror("file open fail");
if (fd < 0)
{
perror("file open fail");
return -1;
}
if(DisplayProgress){
init_progress_bar(&pbar,10);
}
while (file_size - count > 0)
{
int readed = buf_sz < file_size - count ? buf_sz : file_size - count;
if(DisplayProgress){
DisplayProgressBar(&pbar,count,file_size,filename,false);
}
if((i = recv_until_byte(sock,buf,readed,TIMEOUT)) < 0){
if(i == -2)
fprintf(stderr,"recv file failed : timeout connetion lost\n");
else server_perror("recv file failed");
else perror("recv file failed");
return_value = -1;
goto END;
}
if(write(fd,buf,readed)<0){
server_perror("file write failed");
perror("file write failed");
return_value = -1;
goto END;
}
if( DisplayProgress && isProgressBarNeedUpdate(count,file_size,cur_progress) ){
DisplayProgressBar(count,file_size,cur_progress);
cur_progress = (int)((((double)count / (double)file_size)) * 100.0 + 1.0);
fflush(stdout);
}
count += readed;
#ifdef SLOW_CLIENT
usleep(SLOW_CLIENT);
#endif
}
if(DisplayProgress)
DisplayProgressBar(&pbar,count,file_size,filename,true);
DisplayProgressBar100Percent(file_size);
END:
free(buf);
close(fd);
@ -112,56 +137,29 @@ int recvData(int sock,const char * filename){
struct TransferResult res;
int i=0;
if((i=recv_until_byte(sock,&res,sizeof(res),TIMEOUT)) < 0){
if (i == -2) {
if(DisplayProgress && isatty_file(stderr)){
lock_scrolled();
add_scrolled_unlocked(1);
fprintf(stderr,"timeout\n");
unlock_scrolled();
}
else fprintf(stderr,"timeout\n");
}
else server_perror("recv fail");
if (i == -2) fprintf(stderr,"timeout\n");
else perror("recv fail");
return -1;
}
char error_meesage_buf[256] = "";
char error_meesage_buf[80] = "";
switch(res.res){
case RES_ERR:
strerror_r(res.err_number,error_meesage_buf,sizeof(error_meesage_buf));
if(DisplayProgress && isatty_file(stderr)){
lock_scrolled();
add_scrolled_unlocked(1);
fprintf(stderr,"Server Fail: %s\n", error_meesage_buf);
unlock_scrolled();
}
else fprintf(stderr,"Server Fail: %s\n", error_meesage_buf);
fprintf(stderr,"Server Fail: %s\n", strerror(res.err_number));
return -1;
case RES_USR_ERR:
assert(res.error_msg_size < 80);/*todo : fix*/
if((i=recv_until_byte(sock,error_meesage_buf,res.error_msg_size,TIMEOUT)) < 0){
if (i == -2) fprintf(stderr,"timeout\n");
else server_perror("recv fail");
else perror("recv fail");
return -1;
}
if(DisplayProgress && isatty_file(stderr)){
lock_scrolled();
add_scrolled_unlocked(1);
fprintf(stderr,"Error Message From Server: %s\n",error_meesage_buf);
unlock_scrolled();
}
else fprintf(stderr,"Error Message From Server: %s\n",error_meesage_buf);
return -1;
case RES_OK:
return recvFile(sock,filename,res.file_size);
break;
default:
if(DisplayProgress && isatty_file(stderr)){
lock_scrolled();
add_scrolled_unlocked(1);
fprintf(stderr,"unknown value!\n");
unlock_scrolled();
}
else fprintf(stderr,"unknown value!\n");
return -1;
}
@ -172,23 +170,17 @@ static bool quiet_mode = false;
int SendOpAndReceiveFile(const char * filename, struct sockaddr const * addr){
int sock;
int ret = -1;
if(!quiet_mode){
if(DisplayProgress && isatty_file(stdout)){
lock_scrolled();
add_scrolled_unlocked(1);
if(!quiet_mode)
fprintf(stdout,"request %s\n",filename);
unlock_scrolled();
}
else fprintf(stdout,"request %s\n",filename);
}
sock = socket(AF_INET,SOCK_STREAM,0);
if(sock < 0){
server_perror("sock create fail");
perror("sock create fail");
return -1;
}
if(connect(sock,(struct sockaddr *)addr,sizeof(*addr)) < 0){
server_perror("connect failed");
perror("connect failed");
return -1;
}
if(sendReadOp(sock,filename) == 0){
@ -351,7 +343,6 @@ static const char * show_help_message(FILE * file,const char * argv0){
"Options and arguments: \n"
"-b or --benchmark\t:benchmark mode\n"
"-nv or --no-verbose\t:no progress bar\n"
"-q or --quiet\t:show no message\n"
"-h\t:print help message.\n";
fprintf(file,msg,argv0);
return msg;
@ -393,12 +384,11 @@ static int parse_arg(int argc,const char *argv[]){
}
else if(strcmp("-h",argv[cur]) == 0 || strcmp("--help",argv[cur]) == 0){
show_help_message(stdout,argv[0]);
return -1;
return 0;
}
else if(strcmp("-q",argv[cur]) == 0 || strcmp("--quiet",argv[cur]) == 0){
cmd_args.quiet_mode = true;
quiet_mode = true;
DisplayProgress = false;
}
else break;
}
@ -423,13 +413,7 @@ int main(int argc, const char *argv[]){
err = getsockaddrbyname(AF_INET,SOCK_STREAM,0,cmd_args.server_name,(struct sockaddr *)&addr);
if (err != 0){
int check;
if(DisplayProgress && isatty_file(stderr)){
lock_scrolled();
add_scrolled_unlocked(1);
fprintf(stderr,"netdb fail: %s\n",gai_strerror(err));
unlock_scrolled();
}
else fprintf(stderr,"netdb fail: %s\n",gai_strerror(err));
//assume that sernmae is *.*.*.* and try to parse addr
check = inet_pton(AF_INET,cmd_args.server_name,&addr.sin_addr);
assert(check != -1);

4
display_bar.c
View File

@ -19,7 +19,7 @@ enum{
#ifndef DEFAULT_MAX_TERMINAL_ROW
MAX_TERMINAL_ROW = 1000,
#else
MAX_TERMINAL_ROW = DEFAULT_MAX_TERMINAL_ROW;
MAX_TERMINAL_ROW = MAX_TERMINAL_ROW;
#endif
};
@ -108,7 +108,7 @@ void DisplayProgressBar(progress_bar_t * bar,size_t offset,size_t total,const ch
clock_gettime(CLOCK_REALTIME,&ts);
if (!sync){
dif = timespec_sub(ts,bar->last_update);
diff = dif.tv_nsec / 1000000 + dif.tv_sec*1000;
diff = dif.tv_nsec / 1000000 + dif.tv_sec;
if (diff < bar->update_rate){
return;
}

2
display_bar.h
View File

@ -29,7 +29,7 @@ typedef struct {
int update_rate;
struct timespec last_update;
} progress_bar_t;
//update rate is millsecond unit
void init_progress_bar(progress_bar_t * bar,int update_rate);
void DisplayProgressBar(progress_bar_t * bar,size_t offset,size_t total,const char * filename, bool sync);

321
p-client.c
View File

@ -13,10 +13,18 @@
#include <assert.h>
#include <fcntl.h>
#include <time.h>
#include <pthread.h>
#include <sys/time.h>
#include <sys/times.h>
#include "socket_wrapper.h"
#include "timerhelper.h"
#ifdef USE_SENDFILE
#include <sys/sendfile.h>
#ifndef DEFAULT_SEND_FILE_CHUNK_SIZE
const size_t SEND_FILE_CHUNK_SIZE = 0x100000; /*1MB*/
#else
const size_t SEND_FILE_CHUNK_SIZE = DEFAULT_SEND_FILE_CHUNK_SIZE; /*1MB*/
#endif
#endif
#ifndef DEFAULT_TIMEOUT
static const int TIMEOUT = 5;
#else
@ -27,14 +35,10 @@ static const int PROGRESS_BAR_WIDTH = 30;
#else
static const int PROGRESS_BAR_WIDTH = DEFAULT_PROGRESS_BAR_WIDTH;
#endif
enum{
FILENAME_BUF_SIZE = 1024
};
/*========
*Operation
*========*/
//if success, return zero
int sendReadOp(int sock,const char * filename){
struct ReadOp op;
op.file_url_size = strlen(filename);
@ -129,7 +133,6 @@ int recvFile(int sock, const char * filename,size_t file_size){
DisplayProgressBar100Percent(file_size);
END:
free(buf);
close(fd);
return return_value;
}
@ -141,7 +144,7 @@ int recvData(int sock,const char * filename){
else perror("recv fail");
return -1;
}
char error_meesage_buf[80] = "";
static char error_meesage_buf[80] = "";
switch(res.res){
case RES_ERR:
fprintf(stderr,"Server Fail: %s\n", strerror(res.err_number));
@ -165,33 +168,6 @@ int recvData(int sock,const char * filename){
return 0;
}
static bool quiet_mode = false;
int SendOpAndReceiveFile(const char * filename, struct sockaddr const * addr){
int sock;
int ret = -1;
if(!quiet_mode)
fprintf(stdout,"request %s\n",filename);
sock = socket(AF_INET,SOCK_STREAM,0);
if(sock < 0){
perror("sock create fail");
return -1;
}
if(connect(sock,(struct sockaddr *)addr,sizeof(*addr)) < 0){
perror("connect failed");
return -1;
}
if(sendReadOp(sock,filename) == 0){
ret = recvData(sock,filename);
}
close(sock);
return ret;
}
//====
//bench
//====
struct benchmark_data{
bool benchmode;
struct timespec begin;
@ -211,248 +187,89 @@ void init_bench_data(){
clock_getres(bench.clock_id,&bench.resolution);
}
}
//====
//simple queue
//====
typedef enum{
From_CharArray,
From_FileStream
} queueing_method_t;
typedef struct SimpleCharQueue{
queueing_method_t method;
const char ** filename_begin;
const char ** filename_end;
FILE * fs;
} simple_queue_t;
//
// q have lifetime of arg b or arg e.
// do not deallocate before queue closed.
static bool init_queue_from_chararray(simple_queue_t * restrict q,const char ** b, const char ** e){
q->method = From_CharArray;
q->filename_begin = b;
q->filename_end = e;
return true;
static inline struct timespec timespec_sub(struct timespec a,struct timespec b){
struct timespec ret;
ret.tv_sec = a.tv_sec - b.tv_sec;
ret.tv_nsec = a.tv_nsec - b.tv_nsec;
if (ret.tv_nsec < 0){
ret.tv_sec--;
ret.tv_nsec += 1000000000L;
}
//
// q have lifetime of arg f.
// do not close file f before queue closed.
static bool init_queue_from_file(simple_queue_t * restrict q, FILE * f){
q->method = From_FileStream;
q->fs = f;
return true;
}
static const char * dequeue_from_simplecharqueue(simple_queue_t * restrict q,char * restrict buf, size_t size){
const char * filename;
if (q->method == From_CharArray){
if (__glibc_unlikely(q->filename_begin == q->filename_end)) {
return NULL;
}
filename = *(q->filename_begin++);
}
else{
//unsafe.
int t = fscanf(q->fs,"%s",buf);
if (__glibc_unlikely(t != 1)) {
return NULL;
}
filename = buf;
}
return filename;
}
//====
//thread
//====
struct SimpleThreadGlobal{
size_t thread_arr_size;
pthread_t * thread_arr;
pthread_mutex_t queueing_mutex;
simple_queue_t queue;
} global_state;
//if initialization is success, return true
bool init_global_state(struct SimpleThreadGlobal * t, size_t size){
pthread_mutex_init(&t->queueing_mutex,NULL);
t->thread_arr_size = size;
t->thread_arr = (pthread_t *)malloc(sizeof(*global_state.thread_arr) * global_state.thread_arr_size);
if (t->thread_arr == NULL){
return false;
}
return true;
}
typedef struct SimpleThreadReturn{
int retval;
int op_count;
} worker_return_t;
__attribute_malloc__ worker_return_t * create_worker_return(){
return (worker_return_t *)malloc(sizeof(worker_return_t));
}
void destroy_worker_return(worker_return_t * r){
free(r);
}
typedef struct SimpleThreadArg{
struct sockaddr addr;
} worker_arg_t;
__attribute_malloc__ worker_arg_t * create_thread_arg(struct sockaddr * r){
worker_arg_t * ret = (worker_arg_t *)malloc(sizeof(*ret));
memcpy(&ret->addr,r,sizeof(*r));
return ret;
}
void destroy_thread_arg(worker_arg_t * arg){
free(arg);
}
void * WorkerProc(void * args){
worker_arg_t * arg = (worker_arg_t *)(args);
worker_return_t * ret = create_worker_return();
char filename_buf[FILENAME_BUF_SIZE];
const char * filename;
for(;;)
{
pthread_mutex_lock(&global_state.queueing_mutex);
filename = dequeue_from_simplecharqueue(&global_state.queue,filename_buf,FILENAME_BUF_SIZE);
pthread_mutex_unlock(&global_state.queueing_mutex);
if(filename == NULL) break;
ret->retval += SendOpAndReceiveFile(filename,&arg->addr);
ret->op_count++;
}
destroy_thread_arg(arg);
return ret;
}
//====
// cmd parse
//====
static struct {
const char * server_name;
in_port_t server_port;
bool stdinisatty;
int thread_number_option;
bool quiet_mode;
} cmd_args = {
.server_name = "",
.server_port = 0
};
static const char * show_help_message(FILE * file,const char * argv0){
static const char * msg =
"USAUE: %s SERVERNAME PORT [Option]... [FILENAME]...\n"
"Options and arguments: \n"
"-b or --benchmark\t:benchmark mode\n"
"-nv or --no-verbose\t:no progress bar\n"
"-h\t:print help message.\n";
fprintf(file,msg,argv0);
return msg;
}
static int parse_arg(int argc,const char *argv[]){
int cur;
cmd_args.stdinisatty = isatty(STDIN_FILENO);
if (argc < (cmd_args.stdinisatty ? 4 : 3)){
show_help_message(stderr,argv[0]);
return 1;
}
cmd_args.server_name = argv[1];
cmd_args.server_port = atoi(argv[2]);
if (cmd_args.server_port == 0){
fprintf(stderr,"port invalid\n");
return -1;
}
cmd_args.quiet_mode = false;
cmd_args.thread_number_option = 1;
for(cur = 3;cur < argc; cur++){
if (strcmp("-b",argv[cur])==0||strcmp("--benchmark",argv[cur])==0){
bench.benchmode = true;
}
else if(strcmp("-nv",argv[cur]) == 0||strcmp("--no-verbose",argv[cur])==0){
DisplayProgress = false;
}
else if(strcmp("-t",argv[cur]) == 0 || strcmp("--thread",argv[cur]) == 0){
cur++;
if (cur >= argc){
fprintf(stderr,"need number");
return -2;
}
cmd_args.thread_number_option = atoi(argv[cur]);
if(cmd_args.thread_number_option == 0){
fprintf(stderr,"not number or zero");
return -2;
}
}
else if(strcmp("-h",argv[cur]) == 0 || strcmp("--help",argv[cur]) == 0){
show_help_message(stdout,argv[0]);
return -1;
}
else if(strcmp("-q",argv[cur]) == 0 || strcmp("--quiet",argv[cur]) == 0){
cmd_args.quiet_mode = true;
quiet_mode = true;
}
else break;
}
if (cmd_args.stdinisatty){
init_queue_from_chararray(&global_state.queue, &argv[cur],&argv[argc]);
}
else{
init_queue_from_file(&global_state.queue,stdin);
}
return 0;
}
int main(int argc, const char *argv[]){
struct sockaddr_in addr;
const char * filename;
int err;
const char * server_name;
in_port_t server_port = 0;
int arg_filename_start = 3;
int sock, err;
int retval = 0;
init_bench_data();
if(parse_arg(argc,argv) < 0) return EXIT_FAILURE;
err = getsockaddrbyname(AF_INET,SOCK_STREAM,0,cmd_args.server_name,(struct sockaddr *)&addr);
if (argc < 4){
fprintf(stderr,"USAUE: %s SERVERNAME PORT [Option]... [FILENAME]...\n",argv[0]);
return 1;
}
server_name = argv[1];
server_port = atoi(argv[2]);
for(;;){
if (strcmp("-b",argv[arg_filename_start])==0
||strcmp("--benchmark",argv[arg_filename_start])==0){
arg_filename_start++;
bench.benchmode = true;
}
else if(strcmp("--nogui",argv[arg_filename_start])==0){
arg_filename_start++;
DisplayProgress = false;
}
else break;
}
if (server_port == 0){
fprintf(stderr,"port invalid\n");
return 1;
}
err = getsockaddrbyname(AF_INET,SOCK_STREAM,0,server_name,(struct sockaddr *)&addr);
if (err != 0){
int check;
fprintf(stderr,"netdb fail: %s\n",gai_strerror(err));
//assume that sernmae is *.*.*.* and try to parse addr
check = inet_pton(AF_INET,cmd_args.server_name,&addr.sin_addr);
check = inet_pton(AF_INET,server_name,&addr.sin_addr);
assert(check != -1);
if (check == 0){
fprintf(stderr,"parsing fail : invaild format\n");
return -1;
return 1;
}
}
addr.sin_family = AF_INET;
addr.sin_port = htons(cmd_args.server_port);
addr.sin_port = htons(server_port);
if (bench.benchmode){
clock_gettime(bench.clock_id,&bench.begin);
}
if(cmd_args.thread_number_option == 1){
char filename_buf[FILENAME_BUF_SIZE];
for (;;){
filename = dequeue_from_simplecharqueue(&global_state.queue,filename_buf,FILENAME_BUF_SIZE);
if (filename == NULL) break;
while (arg_filename_start < argc){
filename = argv[arg_filename_start++];
sock = socket(AF_INET,SOCK_STREAM,0);
if(sock < 0){
perror("sock create fail");
return 1;
}
retval += SendOpAndReceiveFile(filename,(struct sockaddr *)&addr);
if(connect(sock,(struct sockaddr *)&addr,sizeof(addr)) < 0){
perror("connect failed");
return 1;
}
if(sendReadOp(sock,filename) == 0){
int ret = recvData(sock,filename);
retval += ret;
}
close(sock);
bench.op_count++;
}
}
else{
int i = 0;
init_global_state(&global_state,cmd_args.thread_number_option);
for (i = 0; i < global_state.thread_arr_size; i++){
worker_arg_t * arg = create_thread_arg((struct sockaddr *)&addr);
pthread_create(&global_state.thread_arr[i],NULL,WorkerProc,arg);
}
for (i = 0; i < global_state.thread_arr_size; i++){
worker_return_t * ret;
pthread_join(global_state.thread_arr[i],(void **)&ret);
bench.op_count += ret->op_count;
retval += ret->retval;
destroy_worker_return(ret);
}
}
if (bench.benchmode){
struct timespec result;
double avg;
@ -461,7 +278,7 @@ int main(int argc, const char *argv[]){
if (result.tv_sec == 0) avg = result.tv_nsec;
else avg = result.tv_sec * 1e9 + result.tv_nsec;
avg /= bench.op_count;
fprintf(stdout,"operation: %lf us/op\n",avg / 1000.0);
fprintf(stdout,"operation: %lf ns/op\n",avg);
fprintf(stdout,"resolution: %ld sec %ld ns\n",bench.resolution.tv_sec,bench.resolution.tv_nsec);
}

14
p-server.c
View File

@ -58,16 +58,8 @@ static const int RESPONSE_REQUEST = DEFAULT_RESPONSE_REQUEST;
#include "timerhelper.h"
enum{
#ifndef DEFAULT_TOP_TRACE_TIMER_ID
Top_Trace_Timer_ID = CLOCK_REALTIME,
#else
Top_Trace_Timer_ID = DEFAULT_TOP_TRACE_TIMER_ID,
#endif
#ifndef DEFAULT_BOTTOM_TRACE_TIMER_ID
Bottom_Trace_Timer_ID = CLOCK_THREAD_CPUTIME_ID
#else
Bottom_Trace_Timer_ID = DEFAULT_BOTTOM_TRACE_TIMER_ID
#endif
};
static inline void report_resolution()
@ -319,7 +311,7 @@ int main(int argc, const char *argv[]){
#ifdef USE_TRACE
clock_gettime(Top_Trace_Timer_ID,&ts_top_begin);
#endif
fprintf(stdout,"Connected on : %s:%d\n",msg == NULL ? "(null)" : msg , ntohs(client_addr.sin_port));
fprintf(stderr,"Connected on : %s:%d\n",msg == NULL ? "(null)" : msg , ntohs(client_addr.sin_port));
pid = fork();
if(pid == 0){
#ifdef USE_TRACE
@ -336,8 +328,8 @@ int main(int argc, const char *argv[]){
#ifdef USE_TRACE
clock_gettime(Bottom_Trace_Timer_ID,&ts_bottom_end);
struct timespec tophalf = timespec_sub(ts_top_end,ts_top_begin);
struct timespec bottomhalf = timespec_sub(ts_bottom_end,ts_bottom_begin);
fprintf(stderr,"top: %ld ns, bottom: %ld ns\n",tophalf.tv_nsec,bottomhalf.tv_nsec);
struct timespec bottomhelf = timespec_sub(ts_bottom_end,ts_bottom_end);
fprintf(stderr,"top: %ld ns, bottom: %ld ns\n",tophalf.tv_nsec,bottomhelf.tv_nsec);
#endif
free(buf);
return retval;

25
server.c
View File

@ -68,16 +68,8 @@ static const int SLOW_SERVER_TIME = SLOW_SERVER;
#ifdef USE_TRACE
#include "timerhelper.h"
enum{
#ifndef DEFAULT_TOP_TRACE_TIMER_ID
Top_Trace_Timer_ID = CLOCK_REALTIME,
#else
Top_Trace_Timer_ID = DEFAULT_TOP_TRACE_TIMER_ID,
#endif
#ifndef DEFAULT_BOTTOM_TRACE_TIMER_ID
Bottom_Trace_Timer_ID = CLOCK_THREAD_CPUTIME_ID
#else
Bottom_Trace_Timer_ID = DEFAULT_BOTTOM_TRACE_TIMER_ID
#endif
};
static inline void report_resolution()
@ -229,8 +221,6 @@ int send_response(int sock,int fd, uint8_t * buf, size_t bufsize){
#else
while (offset < r.file_size)
{
if(use_gui)
DisplayProgressBar(&pbar,offset,r.file_size,"",false);
readed = bufsize < (r.file_size - offset) ? bufsize : r.file_size - offset;
if(read(fd,buf,readed)<0){
server_perror("send response read fail");
@ -241,6 +231,8 @@ int send_response(int sock,int fd, uint8_t * buf, size_t bufsize){
return -1;
}
offset += readed;
if(use_gui)
DisplayProgressBar(&pbar,offset,r.file_size,"",false);
#ifdef SLOW_SERVER
usleep(SLOW_SERVER_TIME);
#endif
@ -383,15 +375,14 @@ void * worker_proc(void * data){
}
#ifdef USE_TRACE
clock_gettime(Bottom_Trace_Timer_ID,&ts_bottom_end);
struct timespec tophalf = timespec_sub(ts_top_end,ts_top_begin);
struct timespec bottomhalf = timespec_sub(ts_bottom_end,ts_bottom_begin);
struct timespec tophalf = timespec_sub(ts_top_end,ts_top_end);
struct timespec bottomhelf = timespec_sub(ts_bottom_end,ts_bottom_begin);
if(use_gui&&isatty_file(stderr)){
lock_scrolled();
add_scrolled_unlocked(1);
fprintf(stderr,"top : %ld ns, bottom : %ld ns\n",tophalf.tv_nsec,bottomhalf.tv_nsec);
fprintf(stderr,"top : %ld ns, bottom : %ld ns\n",tophalf.tv_nsec,bottomhelf.tv_nsec);
unlock_scrolled();
}
else fprintf(stderr,"top : %ld ns, bottom : %ld ns\n",tophalf.tv_nsec,bottomhalf.tv_nsec);
#endif
if(close(csock) < 0)
server_perror("csock close error");
@ -418,14 +409,14 @@ void * worker_proc(void * data){
#ifdef USE_TRACE
clock_gettime(Bottom_Trace_Timer_ID,&ts_bottom_end);
struct timespec tophalf = timespec_sub(ts_top_end,ts_top_begin);
struct timespec bottomhalf = timespec_sub(ts_bottom_end,ts_bottom_begin);
struct timespec bottomhelf = timespec_sub(ts_bottom_end,ts_bottom_begin);
if(use_gui&&isatty_file(stderr)){
lock_scrolled();
add_scrolled_unlocked(1);
fprintf(stderr,"top : %ld ns, bottom : %ld ns\n",tophalf.tv_nsec,bottomhalf.tv_nsec);
fprintf(stderr,"top : %ld ns, bottom : %ld ns\n",tophalf.tv_nsec,bottomhelf.tv_nsec);
unlock_scrolled();
}
else fprintf(stderr,"top : %ld ns, bottom : %ld ns\n",tophalf.tv_nsec,bottomhalf.tv_nsec);
else fprintf(stderr,"top : %ld ns, bottom : %ld ns\n",tophalf.tv_nsec,bottomhelf.tv_nsec);
#endif
if(close(csock) < 0)
server_perror("csock close error");