lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

push message back to queue before harbor connect to master

Browse Source
This commit is contained in:
云风
2013-09-10 18:09:04 +08:00
parent fc1710826d
commit fd67d2f968
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
service-src/service_harbor.c
View File

@@ -8,6 +8,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <stdint.h> #include <stdint.h>
#include <unistd.h>
#define HASH_SIZE 4096 #define HASH_SIZE 4096
#define DEFAULT_QUEUE_SIZE 1024 #define DEFAULT_QUEUE_SIZE 1024
@@ -48,6 +49,7 @@ struct remote_message_header {
struct harbor { struct harbor {
struct skynet_context *ctx; struct skynet_context *ctx;
const void * starting_msg;
char * local_addr; char * local_addr;
int id; int id;
struct hashmap * map; struct hashmap * map;
@@ -551,7 +553,19 @@ _mainloop(struct skynet_context * context, void * ud, int type, int session, uin
static int static int
_connect_master(struct skynet_context * ctx, void * ud, int type, int session, uint32_t source, const void * msg, size_t sz) { _connect_master(struct skynet_context * ctx, void * ud, int type, int session, uint32_t source, const void * msg, size_t sz) {
struct harbor *h = ud; struct harbor *h = ud;
assert(type == PTYPE_SOCKET); if (type != PTYPE_SOCKET) {
// when message before connected, forward to self.
// If recv the same message, sleep a while.
if (h->starting_msg == msg) {
usleep(1000);
} else {
if (h->starting_msg == NULL) {
h->starting_msg = msg;
}
}
skynet_forward(ctx, 0);
return 0;
}
const struct skynet_socket_message * message = msg; const struct skynet_socket_message * message = msg;
if (message->id != h->master_fd) { if (message->id != h->master_fd) {
if (message->type == SKYNET_SOCKET_TYPE_DATA) { if (message->type == SKYNET_SOCKET_TYPE_DATA) {
@@ -602,6 +616,7 @@ harbor_init(struct harbor *h, struct skynet_context *ctx, const char * args) {
h->master_fd = _connect_to(h, master_addr); h->master_fd = _connect_to(h, master_addr);
h->local_addr = strdup(local_addr); h->local_addr = strdup(local_addr);
h->id = harbor_id; h->id = harbor_id;
h->starting_msg = NULL;
skynet_callback(ctx, h, _connect_master); skynet_callback(ctx, h, _connect_master);

4
skynet-src/skynet_server.c
View File

@@ -552,7 +552,11 @@ skynet_command(struct skynet_context * context, const char * cmd , const char *
void void
skynet_forward(struct skynet_context * context, uint32_t destination) { skynet_forward(struct skynet_context * context, uint32_t destination) {
assert(context->forward == 0); assert(context->forward == 0);
if (destination == 0) {
context->forward = context->handle;
} else {
context->forward = destination; context->forward = destination;
}
} }
static void static void