fumiama/simple-kanban
1
0
Fork 0
mirror of https://github.com/fumiama/simple-kanban.git synced 2026-06-20 09:30:29 +08:00
Code Activity

修正ipv6，优化内存占用

Browse Source
This commit is contained in:
fumiama
2021-08-14 13:39:09 +08:00
parent c1710949e5
commit 0884d024c7
1 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
server.c
View File

@@ -28,11 +28,13 @@ CONFIG* cfg;
int fd; int fd;
#ifdef LISTEN_ON_IPV6 #ifdef LISTEN_ON_IPV6
socklen_t struct_len = sizeof(struct sockaddr_in6); static socklen_t struct_len = sizeof(struct sockaddr_in6);
struct sockaddr_in6 server_addr; static struct sockaddr_in6 server_addr;
static struct sockaddr_in6 client_addr;
#else #else
socklen_t struct_len = sizeof(struct sockaddr_in); static socklen_t struct_len = sizeof(struct sockaddr_in);
struct sockaddr_in server_addr; static struct sockaddr_in server_addr;
static struct sockaddr_in client_addr;
#endif #endif
char *data_path; char *data_path;
@@ -41,6 +43,8 @@ char *kanban_path;
#define THREADCNT 16 #define THREADCNT 16
pthread_t accept_threads[THREADCNT]; pthread_t accept_threads[THREADCNT];
static pthread_attr_t attr;
#define MAXWAITSEC 10 #define MAXWAITSEC 10
struct THREADTIMER { struct THREADTIMER {
pthread_t *thread; pthread_t *thread;
@@ -58,7 +62,7 @@ typedef struct THREADTIMER THREADTIMER;
void accept_client(); void accept_client();
void accept_timer(void *p); void accept_timer(void *p);
int bind_server(uint16_t port, u_int try_times); int bind_server(uint16_t port, uint32_t try_times);
int check_buffer(THREADTIMER *timer); int check_buffer(THREADTIMER *timer);
void close_file(FILE *fp); void close_file(FILE *fp);
int close_file_and_send(THREADTIMER *timer, char *data, size_t numbytes); int close_file_and_send(THREADTIMER *timer, char *data, size_t numbytes);
@@ -66,7 +70,7 @@ void handle_accept(void *accept_fd_p);
void handle_pipe(int signo); void handle_pipe(int signo);
void handle_quit(int signo); void handle_quit(int signo);
void kill_thread(THREADTIMER* timer); void kill_thread(THREADTIMER* timer);
int listen_socket(u_int try_times); int listen_socket(uint32_t try_times);
FILE *open_file(char* file_path, int lock_type, char* mode); FILE *open_file(char* file_path, int lock_type, char* mode);
int send_all(char* file_path, THREADTIMER *timer); int send_all(char* file_path, THREADTIMER *timer);
int send_data(int accept_fd, char *data, size_t length); int send_data(int accept_fd, char *data, size_t length);
@@ -77,7 +81,7 @@ int s1_get(THREADTIMER *timer);
int s2_set(THREADTIMER *timer); int s2_set(THREADTIMER *timer);
int s3_set_data(THREADTIMER *timer); int s3_set_data(THREADTIMER *timer);
int bind_server(uint16_t port, u_int try_times) { int bind_server(uint16_t port, uint32_t try_times) {
int fail_count = 0; int fail_count = 0;
int result = -1; int result = -1;
#ifdef LISTEN_ON_IPV6 #ifdef LISTEN_ON_IPV6
@@ -102,7 +106,7 @@ int bind_server(uint16_t port, u_int try_times) {
} }
} }
int listen_socket(u_int try_times) { int listen_socket(uint32_t try_times) {
int fail_count = 0; int fail_count = 0;
int result = -1; int result = -1;
while(!~(result = listen(fd, 10)) && fail_count++ < try_times) sleep(1); while(!~(result = listen(fd, 10)) && fail_count++ < try_times) sleep(1);
@@ -295,7 +299,6 @@ void handle_quit(int signo) {
#define touch_timer(x) timer_pointer_of(x)->touch = time(NULL) #define touch_timer(x) timer_pointer_of(x)->touch = time(NULL)
void accept_timer(void *p) { void accept_timer(void *p) {
pthread_detach(pthread_self());
THREADTIMER *timer = timer_pointer_of(p); THREADTIMER *timer = timer_pointer_of(p);
while(*(timer->thread) && !pthread_kill(*(timer->thread), 0)) { while(*(timer->thread) && !pthread_kill(*(timer->thread), 0)) {
sleep(MAXWAITSEC / 4); sleep(MAXWAITSEC / 4);
@@ -336,6 +339,7 @@ void kill_thread(THREADTIMER* timer) {
void handle_pipe(int signo) { void handle_pipe(int signo) {
printf("Pipe error: %d\n", signo); printf("Pipe error: %d\n", signo);
pthread_exit(NULL);
} }
#define chkbuf(p) if(!check_buffer(timer_pointer_of(p))) break #define chkbuf(p) if(!check_buffer(timer_pointer_of(p))) break
@@ -355,14 +359,13 @@ void handle_pipe(int signo) {
} }
void handle_accept(void *p) { void handle_accept(void *p) {
pthread_detach(pthread_self());
int accept_fd = timer_pointer_of(p)->accept_fd; int accept_fd = timer_pointer_of(p)->accept_fd;
if(accept_fd > 0) { if(accept_fd > 0) {
puts("Connected to the client."); puts("Connected to the client.");
signal(SIGQUIT, handle_quit); signal(SIGQUIT, handle_quit);
signal(SIGPIPE, handle_pipe); signal(SIGPIPE, handle_pipe);
pthread_t thread; pthread_t thread;
if (pthread_create(&thread, NULL, (void *)&accept_timer, p)) puts("Error creating timer thread"); if (pthread_create(&thread, &attr, (void *)&accept_timer, p)) puts("Error creating timer thread");
else puts("Creating timer thread succeeded"); else puts("Creating timer thread succeeded");
send_data(accept_fd, "Welcome to simple kanban server.", 33); send_data(accept_fd, "Welcome to simple kanban server.", 33);
timer_pointer_of(p)->status = -1; timer_pointer_of(p)->status = -1;
@@ -391,13 +394,18 @@ void handle_accept(void *p) {
} else puts("Error accepting client"); } else puts("Error accepting client");
} }
static pid_t pid;
void accept_client() { void accept_client() {
pid_t pid = fork(); pid = fork();
while (pid > 0) { //主进程监控子进程状态，如果子进程异常终止则重启之 while (pid > 0) { //主进程监控子进程状态，如果子进程异常终止则重启之
wait(NULL); wait(NULL);
puts("Server subprocess exited. Restart..."); puts("Server subprocess exited. Restart...");
pid = fork(); pid = fork();
} }
signal(SIGQUIT, handle_quit);
signal(SIGPIPE, handle_pipe);
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, 1);
if(pid < 0) puts("Error when forking a subprocess."); if(pid < 0) puts("Error when forking a subprocess.");
else while(1) { else while(1) {
puts("Ready for accept, waitting..."); puts("Ready for accept, waitting...");
@@ -407,17 +415,31 @@ void accept_client() {
printf("Run on thread No.%d\n", p); printf("Run on thread No.%d\n", p);
THREADTIMER *timer = malloc(sizeof(THREADTIMER)); THREADTIMER *timer = malloc(sizeof(THREADTIMER));
if(timer) { if(timer) {
struct sockaddr_in client_addr;
timer->accept_fd = accept(fd, (struct sockaddr *)&client_addr, &struct_len); timer->accept_fd = accept(fd, (struct sockaddr *)&client_addr, &struct_len);
timer->thread = &accept_threads[p]; if(timer->accept_fd <= 0) {
timer->touch = time(NULL); free(timer);
timer->data = NULL; puts("Accept client error.");
timer->is_open = 0; } else {
timer->fp = NULL; #ifdef LISTEN_ON_IPV6
signal(SIGQUIT, handle_quit); uint16_t port = ntohs(client_addr.sin6_port);
signal(SIGPIPE, handle_pipe); struct in6_addr in = client_addr.sin6_addr;
if (pthread_create(timer->thread, NULL, (void *)&handle_accept, timer)) puts("Error creating thread"); char str[INET6_ADDRSTRLEN]; // 46
else puts("Creating thread succeeded"); inet_ntop(AF_INET6, &in, str, sizeof(str));
#else
uint16_t port = ntohs(client_addr.sin_port);
struct in_addr in = client_addr.sin_addr;
char str[INET_ADDRSTRLEN]; // 16
inet_ntop(AF_INET, &in, str, sizeof(str));
#endif
printf("Accept client %s:%u\n", str, port);
timer->thread = &accept_threads[p];
timer->touch = time(NULL);
timer->data = NULL;
timer->is_open = 0;
timer->fp = NULL;
if (pthread_create(timer->thread, &attr, (void *)&handle_accept, timer)) puts("Error creating thread");
else puts("Creating thread succeeded");
}
} else puts("Allocate timer error"); } else puts("Allocate timer error");
} else { } else {
puts("Max thread cnt exceeded"); puts("Max thread cnt exceeded");