fumiama/simple-dict
1
0
Fork 0
mirror of https://github.com/fumiama/simple-dict.git synced 2026-06-23 20:50:27 +08:00
Code Activity

优化退出

Browse Source
This commit is contained in:
源文雨
2022-10-15 11:47:01 +08:00
parent 525c08ff9e
commit e518a9552c
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server.c
View File

@@ -76,6 +76,7 @@ static void init_dict_pool(FILE *fp);
static int insert_item(FILE *fp, const dict_t* dict, int keysize, int datasize); static int insert_item(FILE *fp, const dict_t* dict, int keysize, int datasize);
static inline uint32_t last_nonnull(const char* p, uint32_t max_size); static inline uint32_t last_nonnull(const char* p, uint32_t max_size);
static int listen_socket(int fd); static int listen_socket(int fd);
static void process_defer();
static int send_all(thread_timer_t *timer); static int send_all(thread_timer_t *timer);
static int send_data(int accept_fd, int index, server_ack_t cmd, const char *data, size_t length); static int send_data(int accept_fd, int index, server_ack_t cmd, const char *data, size_t length);
static int s1_get(thread_timer_t *timer); static int s1_get(thread_timer_t *timer);
@@ -574,14 +575,7 @@ static void handle_segv(int signo) {
static void handle_kill(int signo) { static void handle_kill(int signo) {
puts("Handle sigkill/sigterm"); puts("Handle sigkill/sigterm");
for(int i = 0; i < THREADCNT; i++) { process_defer();
if(timers[i].thread) pthread_kill(timers[i].thread, SIGQUIT);
pthread_cond_destroy(&timers[i].tc);
pthread_mutex_destroy(&timers[i].tmc);
if(timers[i].timerthread) pthread_kill(timers[i].timerthread, SIGQUIT);
}
fflush(stdout);
pthread_exit(NULL);
} }
static void accept_timer(void *p) { static void accept_timer(void *p) {
@@ -634,16 +628,18 @@ static void cleanup_thread(thread_timer_t* timer) {
close_dict(timer->index); close_dict(timer->index);
timer->thread = 0; timer->thread = 0;
pthread_cond_destroy(&timer->c); pthread_cond_destroy(&timer->c);
puts("Destroy accept cond");
pthread_mutex_destroy(&timer->mc); pthread_mutex_destroy(&timer->mc);
puts("Destroy accept mutex");
setdicts[timer->index].data[0] = 0; setdicts[timer->index].data[0] = 0;
pthread_rwlock_wrlock(&timer->mb); pthread_rwlock_wrlock(&timer->mb);
timer->isbusy = 0; timer->isbusy = 0;
puts("Clear busy");
pthread_rwlock_unlock(&timer->mb); pthread_rwlock_unlock(&timer->mb);
puts("Finish cleaning"); puts("Finish cleaning");
} }
static void handle_int(int signo) { static void process_defer() {
puts("Keyboard interrupted");
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);
pthread_cond_destroy(&timers[i].tc); pthread_cond_destroy(&timers[i].tc);
@@ -654,6 +650,11 @@ static void handle_int(int signo) {
pthread_exit(NULL); pthread_exit(NULL);
} }
static void handle_int(int signo) {
puts("Keyboard interrupted");
process_defer();
}
static void handle_pipe(int signo) { static void handle_pipe(int signo) {
puts("Pipe error, exit thread..."); puts("Pipe error, exit thread...");
fflush(stdout); fflush(stdout);
@@ -834,6 +835,7 @@ static void accept_client(int fd) {
sleep(1); sleep(1);
continue; continue;
} }
pthread_rwlock_unlock(&timers[p].mb);
#ifdef LISTEN_ON_IPV6 #ifdef LISTEN_ON_IPV6
struct sockaddr_in6 client_addr; struct sockaddr_in6 client_addr;
#else #else
@@ -860,7 +862,6 @@ static void accept_client(int fd) {
timer->index = p; timer->index = p;
timer->touch = time(NULL); timer->touch = time(NULL);
reset_seq(p); reset_seq(p);
pthread_rwlock_unlock(&timer->mb);
pthread_rwlock_wrlock(&timer->mb); pthread_rwlock_wrlock(&timer->mb);
timer->isbusy = 1; timer->isbusy = 1;
pthread_rwlock_unlock(&timer->mb); pthread_rwlock_unlock(&timer->mb);