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

优化

Browse Source
This commit is contained in:
源文雨
2022-10-15 09:49:35 +08:00
parent 9184a9fbdd
commit e258bf67f5
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server.c
View File

@@ -627,7 +627,6 @@ static void cleanup_thread(thread_timer_t* timer) {
timer->isbusy = 0; timer->isbusy = 0;
pthread_cond_destroy(&timer->c); pthread_cond_destroy(&timer->c);
pthread_mutex_destroy(&timer->mc); pthread_mutex_destroy(&timer->mc);
pthread_rwlock_destroy(&timer->mb);
setdicts[timer->index].data[0] = 0; setdicts[timer->index].data[0] = 0;
puts("Finish cleaning"); puts("Finish cleaning");
} }
@@ -650,7 +649,9 @@ static void handle_pipe(int signo) {
static void handle_accept(void *p) { static void handle_accept(void *p) {
pthread_cond_init(&timer_pointer_of(p)->c, NULL); pthread_cond_init(&timer_pointer_of(p)->c, NULL);
pthread_mutex_init(&timer_pointer_of(p)->mc, NULL); pthread_mutex_init(&timer_pointer_of(p)->mc, NULL);
pthread_rwlock_init(&timer_pointer_of(p)->mb, NULL); pthread_cleanup_push((void*)&cleanup_thread, p);
puts("Handling accept...");
while(1) {
pthread_t thread = timer_pointer_of(p)->timerthread; pthread_t thread = timer_pointer_of(p)->timerthread;
if(!thread || pthread_kill(thread, 0)) { if(!thread || pthread_kill(thread, 0)) {
pthread_cond_init(&timer_pointer_of(p)->tc, NULL); pthread_cond_init(&timer_pointer_of(p)->tc, NULL);
@@ -668,9 +669,6 @@ static void handle_accept(void *p) {
pthread_mutex_unlock(&timer_pointer_of(p)->tmc); pthread_mutex_unlock(&timer_pointer_of(p)->tmc);
puts("Waking up timer thread succeeded"); puts("Waking up timer thread succeeded");
} }
pthread_cleanup_push((void*)&cleanup_thread, p);
puts("Handling accept...");
while(1) {
int accept_fd = timer_pointer_of(p)->accept_fd; int accept_fd = timer_pointer_of(p)->accept_fd;
uint32_t index = timer_pointer_of(p)->index; uint32_t index = timer_pointer_of(p)->index;
uint8_t *buff = timer_pointer_of(p)->buf; uint8_t *buff = timer_pointer_of(p)->buf;
@@ -762,7 +760,6 @@ static void handle_accept(void *p) {
#endif #endif
} }
CONV_END: puts("Conversation end"); CONV_END: puts("Conversation end");
puts("Thread job finished normally");
pthread_rwlock_wrlock(&timer_pointer_of(p)->mb); pthread_rwlock_wrlock(&timer_pointer_of(p)->mb);
timer_pointer_of(p)->isbusy = 0; timer_pointer_of(p)->isbusy = 0;
pthread_mutex_lock(&timer_pointer_of(p)->mc); pthread_mutex_lock(&timer_pointer_of(p)->mc);
@@ -771,11 +768,6 @@ static void handle_accept(void *p) {
pthread_cond_wait(&timer_pointer_of(p)->c, &timer_pointer_of(p)->mc); pthread_cond_wait(&timer_pointer_of(p)->c, &timer_pointer_of(p)->mc);
pthread_mutex_unlock(&timer_pointer_of(p)->mc); pthread_mutex_unlock(&timer_pointer_of(p)->mc);
puts("Thread wakeup"); puts("Thread wakeup");
if(!pthread_kill(thread, 0)) {
pthread_mutex_lock(&timer_pointer_of(p)->tmc);
pthread_cond_signal(&timer_pointer_of(p)->tc); // wakeup thread
pthread_mutex_unlock(&timer_pointer_of(p)->tmc);
}
} }
pthread_cleanup_pop(1); pthread_cleanup_pop(1);
} }
@@ -802,6 +794,7 @@ static void accept_client(int fd) {
init_crypto(); init_crypto();
init_dict_pool(open_dict(0, 1)); init_dict_pool(open_dict(0, 1));
close_dict(0); close_dict(0);
for(int i = 0; i < THREADCNT; i++) pthread_rwlock_init(&timers[i].mb, NULL);
while(1) { while(1) {
puts("Ready for accept, waitting..."); puts("Ready for accept, waitting...");
int p = 0; int p = 0;
@@ -836,7 +829,7 @@ static void accept_client(int fd) {
inet_ntop(AF_INET, &in, str, sizeof(str)); inet_ntop(AF_INET, &in, str, sizeof(str));
#endif #endif
time_t t = time(NULL); time_t t = time(NULL);
printf("\n> %sAccept client %s:%u at slot No.%d\n", ctime(&t), str, port, p); printf("\n> %sAccept client %s:%u at slot No.%d, ", ctime(&t), str, port, p);
thread_timer_t* timer = &timers[p]; thread_timer_t* timer = &timers[p];
timer->accept_fd = accept_fd; timer->accept_fd = accept_fd;
timer->index = p; timer->index = p;
@@ -846,7 +839,7 @@ static void accept_client(int fd) {
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);
puts("Set thread status to busy"); printf("Set thread status to busy, ");
if(timer->thread) { if(timer->thread) {
pthread_mutex_lock(&timer->mc); pthread_mutex_lock(&timer->mc);
pthread_cond_signal(&timer->c); // wakeup thread pthread_cond_signal(&timer->c); // wakeup thread
@@ -855,8 +848,8 @@ static void accept_client(int fd) {
} else if (pthread_create(&timer->thread, &attr, (void *)&handle_accept, timer)) { } else if (pthread_create(&timer->thread, &attr, (void *)&handle_accept, timer)) {
perror("Error creating thread"); perror("Error creating thread");
cleanup_thread(timer); cleanup_thread(timer);
continue; putchar('\n');
} else puts("Creating thread succeeded"); } else puts("Thread created");
} }
} }