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

修复mips设备无法退出线程

Browse Source
This commit is contained in:
fumiama
2021-02-17 19:44:53 +08:00
parent 13f7f1592f
commit 41b86427e2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server.c
View File

@@ -264,12 +264,13 @@ void handle_quit(int signo) {
void acceptTimer(void *p) { void acceptTimer(void *p) {
THREADTIMER *timer = (THREADTIMER*)p; THREADTIMER *timer = (THREADTIMER*)p;
while(!pthread_kill(*(timer->thread), 0)) { while(*timer->thread && !pthread_kill(*timer->thread, 0)) {
sleep(MAXWAITSEC); sleep(MAXWAITSEC);
puts("Check accept status"); puts("Check accept status");
if(time(NULL) - timer->touch > MAXWAITSEC) { if(time(NULL) - timer->touch > MAXWAITSEC) {
pthread_kill(*(timer->thread), SIGQUIT); pthread_kill(*timer->thread, SIGQUIT);
close(timer->accept_fd); close(timer->accept_fd);
*timer->thread = 0;
} }
} }
free(p); free(p);
@@ -287,14 +288,14 @@ void handleAccept(void *p) {
else puts("Creating timer thread succeeded"); else puts("Creating timer thread succeeded");
sendData(accept_fd, "Welcome to simple dict server.", 31); sendData(accept_fd, "Welcome to simple dict server.", 31);
int s = -1; int s = -1;
while((numbytes = recv(accept_fd, buff, BUFSIZ, 0)) > 0) { while(*((THREADTIMER*)p)->thread && (numbytes = recv(accept_fd, buff, BUFSIZ, 0)) > 0) {
touchTimer(p); touchTimer(p);
buff[numbytes] = 0; buff[numbytes] = 0;
printf("Get %zd bytes: %s\n", numbytes, buff); printf("Get %zd bytes: %s\n", numbytes, buff);
puts("Check buffer"); puts("Check buffer");
if(!checkBuffer(accept_fd, &s)) break; if(!checkBuffer(accept_fd, &s)) break;
} }
fprintf(stderr, "Recv %zd bytes\n", numbytes); printf("Recv %zd bytes\n", numbytes);
close(accept_fd); close(accept_fd);
} else perror("Error accepting client"); } else perror("Error accepting client");
} }
@@ -305,6 +306,7 @@ void acceptClient() {
int p = 0; int p = 0;
while(p < 8 && accept_threads[p] && !pthread_kill(accept_threads[p], 0)) p++; while(p < 8 && accept_threads[p] && !pthread_kill(accept_threads[p], 0)) p++;
if(p < 8) { if(p < 8) {
printf("Run on thread No.%d\n", p);
THREADTIMER *timer = malloc(sizeof(THREADTIMER)); THREADTIMER *timer = malloc(sizeof(THREADTIMER));
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]; timer->thread = &accept_threads[p];