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

修复pthread带来的内存泄漏

Browse Source
This commit is contained in:
fumiama
2021-05-04 13:55:03 +08:00
parent 1ec3869037
commit 9a2fc8f670
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server.c
View File

@@ -27,7 +27,9 @@ socklen_t struct_len = sizeof(struct sockaddr_in);
struct sockaddr_in server_addr; struct sockaddr_in server_addr;
//char buff[BUFSIZ]; //char buff[BUFSIZ];
char *file_path; char *file_path;
pthread_t accept_threads[8];
#define THREADCNT 16
pthread_t accept_threads[THREADCNT];
#define MAXWAITSEC 10 #define MAXWAITSEC 10
struct THREADTIMER { struct THREADTIMER {
@@ -315,25 +317,39 @@ void handle_quit(int signo) {
#define touchTimer(x) timerPointerOf(x)->touch = time(NULL) #define touchTimer(x) timerPointerOf(x)->touch = time(NULL)
void accept_timer(void *p) { void accept_timer(void *p) {
pthread_detach(pthread_self());
THREADTIMER *timer = timerPointerOf(p); THREADTIMER *timer = timerPointerOf(p);
signal(SIGQUIT, handle_pipe); signal(SIGQUIT, handle_pipe);
signal(SIGPIPE, handle_pipe); signal(SIGPIPE, handle_pipe);
while(*timer->thread && !pthread_kill(*timer->thread, 0)) { while(!pthread_kill(*timer->thread, 0)) {
sleep(MAXWAITSEC); sleep(MAXWAITSEC);
puts("Check accept status"); puts("Check accept status");
if(*timer->thread && time(NULL) - timer->touch > MAXWAITSEC) { if(!*timer->thread) {
free(timer);
break;
} else if(time(NULL) - timer->touch > MAXWAITSEC) {
kill_thread(timer); kill_thread(timer);
free(timer);
break;
} }
} }
free(p);
} }
void kill_thread(THREADTIMER* timer) { void kill_thread(THREADTIMER* timer) {
pthread_kill(*timer->thread, SIGQUIT); pthread_kill(*timer->thread, SIGQUIT);
close(timer->accept_fd); close(timer->accept_fd);
if(timer->data) free(timer->data); if(timer->data) {
if(timer->is_open) close_dict(timer->fp); free(timer->data);
timer->data = NULL;
puts("Free data.");
}
if(timer->is_open) {
close_dict(timer->fp);
timer->is_open = 0;
puts("Close file.");
}
*timer->thread = 0; *timer->thread = 0;
puts("Kill thread.");
} }
void handle_pipe(int signo) { void handle_pipe(int signo) {
@@ -341,6 +357,7 @@ void handle_pipe(int signo) {
} }
void handle_accept(void *p) { void handle_accept(void *p) {
pthread_detach(pthread_self());
int accept_fd = timerPointerOf(p)->accept_fd; int accept_fd = timerPointerOf(p)->accept_fd;
if(accept_fd > 0) { if(accept_fd > 0) {
puts("Connected to the client."); puts("Connected to the client.");
@@ -379,8 +396,8 @@ void accept_client() {
else while(1) { else while(1) {
puts("Ready for accept, waitting..."); puts("Ready for accept, waitting...");
int p = 0; int p = 0;
while(p < 8 && accept_threads[p] && !pthread_kill(accept_threads[p], 0)) p++; while(p < THREADCNT && accept_threads[p] && !pthread_kill(accept_threads[p], 0)) p++;
if(p < 8) { if(p < THREADCNT) {
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) {