fumiama/simple-dict
1
0
Fork 0
mirror of https://github.com/fumiama/simple-dict.git synced 2026-06-26 15:07:02 +08:00
Code Activity

fix

Browse Source
This commit is contained in:
源文雨
2022-10-27 18:36:10 +08:00
parent 6c75623dbd
commit e1287d0c9a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server.c
View File

@@ -626,12 +626,11 @@ static void accept_timer(void *p) {
sigaddset(&mask, SIGPIPE); // 防止处理嵌套 sigaddset(&mask, SIGPIPE); // 防止处理嵌套
pthread_sigmask(SIG_BLOCK, &mask, NULL); pthread_sigmask(SIG_BLOCK, &mask, NULL);
pthread_rwlock_unlock(&timer->mt);
sleep(MAXWAITSEC / 4); sleep(MAXWAITSEC / 4);
pthread_rwlock_rdlock(&timer->mt);
thread = timer->thread; thread = timer->thread;
pthread_rwlock_unlock(&timer->mt); pthread_rwlock_unlock(&timer->mt);
while(thread && !pthread_kill(thread, 0)) { while(thread && !pthread_kill(thread, 0)) {
pthread_rwlock_rdlock(&timer->mb); pthread_rwlock_rdlock(&timer->mb);
uint8_t isbusy = timer->isbusy; uint8_t isbusy = timer->isbusy;
@@ -918,6 +917,7 @@ static void accept_client(int fd) {
} else { } else {
pthread_cond_init(&timer->c, NULL); pthread_cond_init(&timer->c, NULL);
pthread_mutex_init(&timer->mc, NULL); pthread_mutex_init(&timer->mc, NULL);
pthread_rwlock_wrlock(&timers[p].mt);
if (pthread_create(&timer->thread, &attr, (void *)&handle_accept, timer)) { if (pthread_create(&timer->thread, &attr, (void *)&handle_accept, timer)) {
perror("Error creating thread"); perror("Error creating thread");
cleanup_thread(timer); cleanup_thread(timer);