fumiama/simple-dict
1
0
Fork 0
mirror of https://github.com/fumiama/simple-dict.git synced 2026-06-30 00:40:25 +08:00
Code Activity

优化信号处理

Browse Source
This commit is contained in:
源文雨
2022-10-15 01:01:02 +08:00
parent 136133c2ee
commit 8c955bcbc0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server.c
View File

@@ -68,6 +68,7 @@ static void cleanup_thread(thread_timer_t* timer);
static server_ack_t del(FILE *fp, const char* key, int len, char ret[4]); static server_ack_t del(FILE *fp, const char* key, int len, char ret[4]);
static void handle_accept(void *accept_fd_p); static void handle_accept(void *accept_fd_p);
static void handle_int(int signo); static void handle_int(int signo);
static void handle_kill(int signo);
static void handle_pipe(int signo); static void handle_pipe(int signo);
static void handle_quit(int signo); static void handle_quit(int signo);
static void handle_segv(int signo); static void handle_segv(int signo);
@@ -560,7 +561,12 @@ static void handle_quit(int signo) {
} }
static void handle_segv(int signo) { static void handle_segv(int signo) {
puts("Handle kill/segv/term"); puts("Handle segv");
pthread_exit(NULL);
}
static void handle_kill(int signo) {
puts("Handle kill/term");
for(int i = 0; i < THREADCNT; i++) { for(int i = 0; i < THREADCNT; i++) {
if(timers[i].thread) pthread_kill(timers[i].thread, SIGQUIT); if(timers[i].thread) pthread_kill(timers[i].thread, SIGQUIT);
if(timers[i].timerthread) pthread_kill(timers[i].timerthread, SIGQUIT); if(timers[i].timerthread) pthread_kill(timers[i].timerthread, SIGQUIT);
@@ -652,7 +658,6 @@ static void handle_accept(void *p) {
if (pthread_create(&thread, &attr, (void *)&accept_timer, p)) { if (pthread_create(&thread, &attr, (void *)&accept_timer, p)) {
perror("Error creating timer thread"); perror("Error creating timer thread");
cleanup_thread(timer_pointer_of(p)); cleanup_thread(timer_pointer_of(p));
pthread_rwlock_unlock(&timer_pointer_of(p)->mb);
return; return;
} }
timer_pointer_of(p)->timerthread = thread; timer_pointer_of(p)->timerthread = thread;
@@ -787,10 +792,10 @@ static void accept_client(int fd) {
}*/ }*/
signal(SIGINT, handle_int); signal(SIGINT, handle_int);
signal(SIGQUIT, handle_quit); signal(SIGQUIT, handle_quit);
signal(SIGKILL, handle_segv); signal(SIGKILL, handle_kill);
signal(SIGSEGV, handle_segv); signal(SIGSEGV, handle_segv);
signal(SIGPIPE, handle_pipe); signal(SIGPIPE, handle_pipe);
signal(SIGTERM, handle_segv); signal(SIGTERM, handle_kill);
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
init_crypto(); init_crypto();