lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

add some check for pthread api

Browse Source
This commit is contained in:
云风
2013-09-01 22:20:48 +08:00
parent dba3e1562b
commit 56f6e0e62d
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
skynet-src/skynet_start.c
View File

@@ -32,14 +32,23 @@ struct worker_parm {
#define CHECK_ABORT if (skynet_context_total()==0) break; #define CHECK_ABORT if (skynet_context_total()==0) break;
static void
create_thread(pthread_t *thread, void *(*start_routine) (void *), void *arg) {
if (pthread_create(thread,NULL, start_routine, arg)) {
fprintf(stderr, "Create thread failed");
exit(1);
}
}
static void static void
wakeup(struct monitor *m, int busy) { wakeup(struct monitor *m, int busy) {
if (m->sleep >= m->count - busy) { if (m->sleep >= m->count - busy) {
pthread_mutex_lock(&m->mutex); if (pthread_mutex_lock(&m->mutex) == 0) {
pthread_cond_signal(&m->cond); pthread_cond_signal(&m->cond);
pthread_mutex_unlock(&m->mutex); pthread_mutex_unlock(&m->mutex);
} }
} }
}
static void * static void *
_socket(void *p) { _socket(void *p) {
@@ -98,13 +107,14 @@ _worker(void *p) {
for (;;) { for (;;) {
if (skynet_context_message_dispatch(sm)) { if (skynet_context_message_dispatch(sm)) {
CHECK_ABORT CHECK_ABORT
pthread_mutex_lock(&m->mutex); if (pthread_mutex_lock(&m->mutex) == 0) {
++ m->sleep; ++ m->sleep;
pthread_cond_wait(&m->cond, &m->mutex); pthread_cond_wait(&m->cond, &m->mutex);
-- m->sleep; -- m->sleep;
pthread_mutex_unlock(&m->mutex); pthread_mutex_unlock(&m->mutex);
} }
} }
}
return NULL; return NULL;
} }
@@ -122,23 +132,31 @@ _start(int thread) {
for (i=0;i<thread;i++) { for (i=0;i<thread;i++) {
m->m[i] = skynet_monitor_new(i); m->m[i] = skynet_monitor_new(i);
} }
pthread_mutex_init(&m->mutex, NULL); if (pthread_mutex_init(&m->mutex, NULL)) {
pthread_cond_init(&m->cond, NULL); fprintf(stderr, "Init mutex error");
exit(1);
}
if (pthread_cond_init(&m->cond, NULL)) {
fprintf(stderr, "Init cond error");
exit(1);
}
pthread_create(&pid[0], NULL, _monitor, m); create_thread(&pid[0], _monitor, m);
pthread_create(&pid[1], NULL, _timer, m); create_thread(&pid[1], _timer, m);
pthread_create(&pid[2], NULL, _socket, m); create_thread(&pid[2], _socket, m);
struct worker_parm wp[thread]; struct worker_parm wp[thread];
for (i=0;i<thread;i++) { for (i=0;i<thread;i++) {
wp[i].m = m; wp[i].m = m;
wp[i].id = i; wp[i].id = i;
pthread_create(&pid[i+3], NULL, _worker, &wp[i]); create_thread(&pid[i+3], _worker, &wp[i]);
} }
for (i=1;i<thread+3;i++) { for (i=1;i<thread+3;i++) {
pthread_join(pid[i], NULL); pthread_join(pid[i], NULL);
} }
pthread_mutex_destroy(&m->mutex);
pthread_cond_destroy(&m->cond);
} }
static int static int