add threadpool server

This commit is contained in:
ubuntu201711081 2020-12-05 01:25:54 +00:00
parent 1c0c6d923c
commit 12132229f0
9 changed files with 192 additions and 44 deletions

View File

@ -3,6 +3,7 @@
"_GNU_SOURCE" "_GNU_SOURCE"
], ],
"files.associations": { "files.associations": {
"socket_wrapper.h": "c" "socket_wrapper.h": "c",
"stdalign.h": "c"
} }
} }

View File

@ -13,7 +13,7 @@ socket_wrapper.o: socket_wrapper.c socket_wrapper.h
client: socket_wrapper.o client.c client: socket_wrapper.o client.c
$(CC) -o client client.c socket_wrapper.o $(CFLAGS) $(CC) -o client client.c socket_wrapper.o $(CFLAGS)
server: socket_wrapper.o server.c server: socket_wrapper.o server.c
$(CC) -o server server.c socket_wrapper.o $(CFLAGS) $(CC) -o server server.c socket_wrapper.o $(CFLAGS) -pthread
p-server: socket_wrapper.o p-server.c p-server: socket_wrapper.o p-server.c
$(CC) -o p-server p-server.c socket_wrapper.o $(CFLAGS) $(CC) -o p-server p-server.c socket_wrapper.o $(CFLAGS)
p-client: socket_wrapper.o p-client.c p-client: socket_wrapper.o p-client.c

View File

@ -15,9 +15,16 @@ Server OPTION and arguments:
- `-h` :print help message. - `-h` :print help message.
Available macro: Available macro:
- DEFAULT_SERVER_PORT : 9091 For server
- DEFAULT_MAX_PATH_SIZE : 256(must be less than 1000) - DEFAULT_MAX_LISTEN_SOCKET: 16
- TIMEOUT : 5(second unit) - DEFAULT_SERVER_PORT: 9091
- DEFAULT_MAX_PATH_SIZE: 256(must be less than 1000)
- USE_SENDFILE - USE_SENDFILE
- DEFAULT_SEND_FILE_CHUNK_SIZE : 0x100000(1MB) - DEFAULT_SEND_FILE_CHUNK_SIZE: 0x100000(1MB)
- SLOW_CLIENT(second unit) - DEFAULT_WORK_QUEUE_SIZE: 10
- DEFAULT_MAX_THREAD_NUMBER: 10
For client
- SLOW_CLIENT(second unit)
- DEFAULT_PROGRESS_BAR_WIDTH: 30
For both
- TIMEOUT: 5(second unit)

View File

@ -28,8 +28,11 @@ static const int TIMEOUT = 5;
#else #else
static const int TIMEOUT = DEFAULT_TIMEOUT; static const int TIMEOUT = DEFAULT_TIMEOUT;
#endif #endif
#ifndef DEFAULT_PROGRESS_BAR_WIDTH
static const int PROGRESS_BAR_WIDTH = 30; static const int PROGRESS_BAR_WIDTH = 30;
#else
static const int PROGRESS_BAR_WIDTH = DEFAULT_PROGRESS_BAR_WIDTH;
#endif
/*======== /*========
*Operation *Operation
*========*/ *========*/
@ -67,7 +70,7 @@ void DisplayProgressBar(size_t offset,size_t total,double cur_progress){
buf[i] = '='; buf[i] = '=';
else if(i == cur_pos) else if(i == cur_pos)
buf[i] = '>'; buf[i] = '>';
else buf[i] = ' '; else buf[i] = '.';
} }
printf("\r[%s]: %.2f%% bytes: %ld/%ld bytes",buf,cur_progress,total,offset); printf("\r[%s]: %.2f%% bytes: %ld/%ld bytes",buf,cur_progress,total,offset);
} }

View File

@ -272,8 +272,8 @@ int main(int argc, const char *argv[]){
perror("accept error"); perror("accept error");
return 1; return 1;
} }
msg = inet_ntop(AF_INET,&addr.sin_addr,ip_buf,sizeof(ip_buf)); msg = inet_ntop(AF_INET,&client_addr.sin_addr,ip_buf,sizeof(ip_buf));
fprintf(stderr,"Connected on : %s:%d\n",msg == NULL ? "(null)" : msg , ntohs(addr.sin_port)); fprintf(stderr,"Connected on : %s:%d\n",msg == NULL ? "(null)" : msg , ntohs(client_addr.sin_port));
pid = fork(); pid = fork();
if(pid == 0){ if(pid == 0){
if((fd = read_request(csock,buf,bufsize)) > 0){ if((fd = read_request(csock,buf,bufsize)) > 0){

View File

@ -1,3 +1,3 @@
#! /bin/bash #! /bin/bash
cd server_test cd server_test
./p-server ./server

132
server.c
View File

@ -12,8 +12,16 @@
#include <signal.h> #include <signal.h>
#include <assert.h> #include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#include "socket_wrapper.h" #include <pthread.h>
#include "socket_wrapper.h"
#include "simple_circular_buffer.h"
#ifndef DEFAULT_MAX_LISTEN_SOCKET
static const int MAX_LISTEN_SOCKET = 16;
#else
static const int MAX_LISTEN_SOCKET = DEFAULT_MAX_LISTEN_SOCKET;
#endif
#ifdef USE_SENDFILE #ifdef USE_SENDFILE
#include <sys/sendfile.h> #include <sys/sendfile.h>
#ifndef DEFAULT_SEND_FILE_CHUNK_SIZE #ifndef DEFAULT_SEND_FILE_CHUNK_SIZE
@ -39,6 +47,19 @@ static const int TIMEOUT = 5;
static const int TIMEOUT = DEFAULT_TIMEOUT; static const int TIMEOUT = DEFAULT_TIMEOUT;
#endif #endif
enum{
#ifndef DEFAULT_WORK_QUEUE_SIZE
WORK_QUEUE_SIZE = 10,
#else
WORK_QUEUE_SIZE = DEFAULT_WORK_QUEUE_SIZE,
#endif
#ifndef DEFAULT_MAX_THREAD_NUMBER
MAX_THREAD_NUMBER = 10
#else
MAX_THREAD_NUMBER = DEFAULT_MAX_THREAD_NUMBER
#endif
};
/*======== /*========
*Operation *Operation
*========*/ *========*/
@ -204,18 +225,83 @@ int parse_args(int argc,const char * argv[] , in_port_t * port){
} }
return 0; return 0;
} }
//============
//Simple Thread Pool
//============
typedef struct SharedState{
//empty if less than 0
queue_struct(int,WORK_QUEUE_SIZE) socks;
pthread_mutex_t sock_mutex;
pthread_cond_t ready;
//int progress[MAX_THREAD_NUMBER];
} shared_state_t;
void init_shared_state(shared_state_t * state) {
queue_init(&state->socks);
pthread_mutex_init(&state->sock_mutex,NULL);
pthread_cond_init(&state->ready,NULL);
}
//
typedef struct WorkerArgument
{
int id;
int bufsize;
uint8_t * buf;
//pthread_mutex_t * cond_mutex;
//pthread_cond_t cond;
} worker_argument_t;
__attribute__((malloc)) worker_argument_t * create_worker_argument(int id, int bufsize){
worker_argument_t * ret = (worker_argument_t *)malloc(sizeof(worker_argument_t));
if (ret == NULL) return ret;
ret->id = id;
ret->bufsize = bufsize;
ret->buf = (uint8_t *)malloc(sizeof(*ret->buf)*bufsize);
if(ret->buf == NULL){
free(ret);
ret = NULL;
}
return ret;
}
static shared_state_t globalState;
void * worker_proc(void * data){
worker_argument_t * args = (worker_argument_t *)data;
int fd, csock;
for(;;){
pthread_mutex_lock(&globalState.sock_mutex);
while (queue_isempty(&globalState.socks)){
pthread_cond_wait(&globalState.ready,&globalState.sock_mutex);
}
csock = dequeue(&globalState.socks);
pthread_mutex_unlock(&globalState.sock_mutex);
if((fd = read_request(csock,args->buf,args->bufsize)) > 0){
send_response(csock,fd,args->buf,args->bufsize);
close(fd);
}
if(close(csock) < 0)
perror("csock close error");
}
}
static pthread_t worker_threads[MAX_THREAD_NUMBER];
static int sock; static int sock;
void safe_exit(){ void safe_exit(){
close(sock); close(sock);
} }
int main(int argc, const char *argv[]){ int main(int argc, const char *argv[]){
uint8_t * buf;
struct sockaddr_in addr; struct sockaddr_in addr;
struct sockaddr_in client_addr; struct sockaddr_in client_addr;
socklen_t client_addr_len = sizeof(client_addr); socklen_t client_addr_len = sizeof(client_addr);
int csock; int csock;
int bufsize; int bufsize;
int i;
in_port_t binding_port_number = SERVER_PORT; in_port_t binding_port_number = SERVER_PORT;
if (argc > 1){ if (argc > 1){
int d = parse_args(argc,argv,&binding_port_number); int d = parse_args(argc,argv,&binding_port_number);
@ -234,11 +320,15 @@ int main(int argc, const char *argv[]){
perror("setsockopt"); perror("setsockopt");
} }
} }
init_shared_state(&globalState);
bufsize = getBufferSizeFrom(sock); bufsize = getBufferSizeFrom(sock);
buf = malloc(bufsize * sizeof(*buf)); for (i = 0; i < MAX_THREAD_NUMBER; i++) {
if (buf == NULL){ worker_argument_t * args = create_worker_argument(i,bufsize);
fprintf(stderr,"lack of memory"); if (args == NULL) {
return 1; fprintf(stderr,"malloc: lack of memory");
return 1;
}
pthread_create(&worker_threads[i],NULL,worker_proc,args);
} }
addr.sin_addr.s_addr = htonl(INADDR_ANY); /*0.0.0.0 모든 네트워크 인터페이스에 묶임.*/ addr.sin_addr.s_addr = htonl(INADDR_ANY); /*0.0.0.0 모든 네트워크 인터페이스에 묶임.*/
@ -255,27 +345,33 @@ int main(int argc, const char *argv[]){
fprintf(stderr,"server bind on %s:%d\n",msg ,binding_port_number); fprintf(stderr,"server bind on %s:%d\n",msg ,binding_port_number);
} }
if(listen(sock,1) < 0){ if(listen(sock,MAX_LISTEN_SOCKET) < 0){
perror("listen failed"); perror("listen failed");
return 1; return 1;
} }
while ((csock = accept(sock, (struct sockaddr *)&client_addr,&client_addr_len)) >= 0) while ((csock = accept(sock, (struct sockaddr *)&client_addr,&client_addr_len)) >= 0)
{ {
int fd;
char ip_buf[INET_ADDRSTRLEN]; char ip_buf[INET_ADDRSTRLEN];
const char * msg = inet_ntop(AF_INET,&addr.sin_addr,ip_buf,sizeof(ip_buf)); const char * msg = inet_ntop(AF_INET,&client_addr.sin_addr,ip_buf,sizeof(ip_buf));
fprintf(stderr,"Connected on : %s:%d\n",msg == NULL ? "(null)" : msg , ntohs(addr.sin_port)); fprintf(stderr,"Connected on : %s:%d\n",msg == NULL ? "(null)" : msg , ntohs(addr.sin_port));
if((fd = read_request(csock,buf,bufsize)) > 0){ for(;;){
send_response(csock,fd,buf,bufsize); pthread_mutex_lock(&globalState.sock_mutex);
close(fd); if (queue_isfull(&globalState.socks)){
pthread_mutex_unlock(&globalState.sock_mutex);
#ifdef _GNU_SOURCE
pthread_yield();
#else
usleep(400);
#endif
continue;
}
else enqueue(&globalState.socks,csock);
break;
} }
pthread_mutex_unlock(&globalState.sock_mutex);
if(close(csock) < 0) pthread_cond_signal(&globalState.ready);
perror("csock close error");
} }
free(buf);
perror("accept error");
return 1; return 1;
} }

30
simple_circular_buffer.h Normal file
View File

@ -0,0 +1,30 @@
#ifndef _SIMPLE_CIRCULAR_BUFFER_
#define _SIMPLE_CIRCULAR_BUFFER_
#include<stddef.h>
#define queue_struct(queue_type,queue_size) struct{\
queue_type data [(queue_size)+1];\
size_t begin;\
size_t end;\
}
#define queue_size(queue) ((sizeof((queue)->data)/sizeof((queue)->data[0])) - 1)
#define queue_isempty(queue) ((queue)->begin == (queue)->end)
#define queue_isfull(queue) ((queue)->begin == (((queue)->end + 1) % queue_size(queue)))
#define queue_init(queue) do{\
(queue)->begin = 0;\
(queue)->end = 0;\
}while(0)
//unchecked
#define enqueue(queue,element) do{ \
(queue)->data[(queue)->end] = (element);\
(queue)->end = ((queue)->end + 1) % (queue_size(queue) + 1);\
}while(0)
//unchecked
#define dequeue(queue) \
(((queue)->begin = ((queue)->begin + 1) % (queue_size(queue) + 1)) ,\
(queue)->data[((queue)->begin + queue_size(queue)) % (queue_size(queue) + 1)])
#endif

View File

@ -26,21 +26,32 @@ ssize_t timeout_recv(int fd,void * buf,size_t n,int timeout)
{ {
ssize_t ret = 0; ssize_t ret = 0;
int poll_ret; int poll_ret;
int try = 0;
struct pollfd fd_single; struct pollfd fd_single;
fd_single.fd = fd; timeout = timeout * 1000;
fd_single.events = POLL_IN; if (n == 0) return 0;
poll_ret = (poll(&fd_single,1,timeout * 1000)); for(;;){
if (poll_ret < 0) return -1; fd_single.fd = fd;
else if(poll_ret == 0) return -2; fd_single.events = POLL_IN;
if (fd_single.revents & POLLHUP) //We'll treat hangups state like timeouts state. poll_ret = (poll(&fd_single,1,timeout));
return -2; if (poll_ret < 0){ fprintf(stderr,"timeout %d\n",timeout); return -1;}
if ((fd_single.revents & POLLERR) || (fd_single.revents & POLLNVAL)) else if(poll_ret == 0) return -2;
return -1; if (fd_single.revents & POLLHUP) //We'll treat hangups state like timeouts state.
if (fd_single.revents & POLL_IN) return -2;
ret = recv(fd,buf,n,0); if ((fd_single.revents & POLLERR) || (fd_single.revents & POLLNVAL))
assert(ret != 0); return -1;
return ret; if (fd_single.revents & POLL_IN){
ret = recv(fd,buf,n,0);
if(ret != 0) return ret;
//try 3 times
if (try < 3){
try++;
timeout /= 2;
continue;
}
return -2;
}
}
assert(0 && "unreachable"); assert(0 && "unreachable");
} }