bugfix: dead lock in drop queue

This commit is contained in:
云风
2012-08-31 23:12:44 +08:00
parent 243dc58c35
commit 4d1781fe39
4 changed files with 10 additions and 6 deletions

View File

@@ -72,10 +72,10 @@ skynet_handle_retire(uint32_t handle) {
uint32_t hash = handle & (s->slot_size-1);
struct skynet_context * ctx = s->slot[hash];
if (skynet_context_handle(ctx) == handle) {
skynet_context_release(ctx);
s->slot[hash] = NULL;
int i;
int j=0, n=s->name_count;
for (i=0; i<n; ++i) {

View File

@@ -211,12 +211,12 @@ skynet_mq_release(struct message_queue *q) {
LOCK(q)
if (q->release) {
UNLOCK(q)
ret = _drop_queue(q);
} else {
skynet_mq_force_push(q);
UNLOCK(q)
}
UNLOCK(q)
return ret;
}

View File

@@ -10,6 +10,7 @@
#include <pthread.h>
#include <unistd.h>
#include <assert.h>
#include <stdio.h>
static void *
_timer(void *p) {
@@ -25,7 +26,7 @@ _worker(void *p) {
for (;;) {
if (skynet_context_message_dispatch()) {
usleep(1000);
}
}
}
return NULL;
}
@@ -37,6 +38,7 @@ _start(int thread) {
pthread_create(&pid[0], NULL, _timer, NULL);
int i;
for (i=1;i<thread+1;i++) {
pthread_create(&pid[i], NULL, _worker, NULL);
}
@@ -70,6 +72,7 @@ skynet_start(struct skynet_config * config) {
}
// harbor must be init first
if (skynet_harbor_start(config->master , config->local)) {
fprintf(stderr, "Init fail : no master");
return;
}
@@ -78,6 +81,8 @@ skynet_start(struct skynet_config * config) {
if (ctx == NULL) {
return;
}
ctx = skynet_context_new("snlua", "launcher");
assert(ctx);
ctx = skynet_context_new("snlua", config->start);
_start(config->thread);