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

remove skynet.watch, move simplemonitor to examples

Browse Source
This commit is contained in:
Cloud Wu
2014-05-06 14:57:01 +08:00
parent 0c4e2450a7
commit a700abcdb3
9 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
skynet-src/skynet.h
View File

@@ -8,13 +8,13 @@
#define PTYPE_TEXT 0
#define PTYPE_RESPONSE 1
#define PTYPE_MULTICAST_DEPRECATED 2
#define PTYPE_MULTICAST 2
#define PTYPE_CLIENT 3
#define PTYPE_SYSTEM 4
#define PTYPE_HARBOR 5
#define PTYPE_SOCKET 6
// read lualib/skynet.lua lualib/simplemonitor.lua
#define PTYPE_RESERVED_ERROR 7
#define PTYPE_ERROR 7
// read lualib/skynet.lua lualib/mqueue.lua
#define PTYPE_RESERVED_QUEUE 8
#define PTYPE_RESERVED_DEBUG 9

14
skynet-src/skynet_mq.c
View File

@@ -162,7 +162,7 @@ void
skynet_mq_push(struct message_queue *q, struct skynet_message *message) {
assert(message);
LOCK(q)
q->queue[q->tail] = *message;
if (++ q->tail >= q->cap) {
q->tail = 0;
@@ -216,30 +216,24 @@ skynet_mq_mark_release(struct message_queue *q) {
UNLOCK(q)
}
static int
static void
_drop_queue(struct message_queue *q, message_drop drop_func, void *ud) {
struct skynet_message msg;
int s = 0;
while(!skynet_mq_pop(q, &msg)) {
++s;
drop_func(&msg, ud);
}
_release(q);
return s;
}
int
void
skynet_mq_release(struct message_queue *q, message_drop drop_func, void *ud) {
int ret = 0;
LOCK(q)
if (q->release) {
UNLOCK(q)
ret = _drop_queue(q, drop_func, ud);
_drop_queue(q, drop_func, ud);
} else {
skynet_mq_force_push(q);
UNLOCK(q)
}
return ret;
}

2
skynet-src/skynet_mq.h
View File

@@ -20,7 +20,7 @@ void skynet_mq_mark_release(struct message_queue *q);
typedef void (*message_drop)(struct skynet_message *, void *);
int skynet_mq_release(struct message_queue *q, message_drop drop_func, void *ud);
void skynet_mq_release(struct message_queue *q, message_drop drop_func, void *ud);
uint32_t skynet_mq_handle(struct message_queue *);
// 0 for success

26
skynet-src/skynet_server.c
View File

@@ -90,9 +90,18 @@ _id_to_hex(char * str, uint32_t id) {
str[9] = '\0';
}
struct drop_t {
uint32_t handle;
};
static void
drop_message(struct skynet_message *msg, void *ud) {
struct drop_t *d = ud;
skynet_free(msg->data);
uint32_t source = d->handle;
assert(source);
// report error to the message source
skynet_send(NULL, source, msg->source, PTYPE_ERROR, 0, NULL, 0);
}
struct skynet_context *
@@ -137,9 +146,11 @@ skynet_context_new(const char * name, const char *param) {
return ret;
} else {
skynet_error(ctx, "FAILED launch %s", name);
uint32_t handle = ctx->handle;
skynet_context_release(ctx);
skynet_handle_retire(ctx->handle);
skynet_mq_release(queue, drop_message, NULL);
skynet_handle_retire(handle);
struct drop_t d = { handle };
skynet_mq_release(queue, drop_message, &d);
return NULL;
}
}
@@ -227,10 +238,8 @@ skynet_context_message_dispatch(struct skynet_monitor *sm) {
struct skynet_context * ctx = skynet_handle_grab(handle);
if (ctx == NULL) {
int s = skynet_mq_release(q, drop_message, NULL);
if (s>0) {
skynet_error(NULL, "Drop message queue %x (%d messages)", handle,s);
}
struct drop_t d = { handle };
skynet_mq_release(q, drop_message, &d);
return 0;
}
@@ -518,7 +527,10 @@ skynet_send(struct skynet_context * context, uint32_t source, uint32_t destinati
if (skynet_context_push(destination, &smsg)) {
skynet_free(data);
skynet_error(NULL, "Drop message from %x to %x (type=%d)(size=%d)", source, destination, type&0xff, (int)(sz & HANDLE_MASK));
if (destination) {
// don't report the message to 0 (system service)
skynet_error(NULL, "Drop message from %x to %x (type=%d)(size=%d)", source, destination, type&0xff, (int)(sz & HANDLE_MASK));
}
return -1;
}
}