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

use macro for replace malloc api (see skynet_malloc.h)

Browse Source
This commit is contained in:
Cloud Wu
2014-04-18 22:35:47 +08:00
parent 23cfb11954
commit 7d835d222b
23 changed files with 125 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service-src/service_harbor.c
View File

@@ -586,14 +586,14 @@ harbor_init(struct harbor *h, struct skynet_context *ctx, const char * args) {
char local_addr[sz];
int harbor_id = 0;
sscanf(args,"%s %s %d",master_addr, local_addr, &harbor_id);
h->master_addr = strdup(master_addr);
h->master_addr = skynet_strdup(master_addr);
h->id = harbor_id;
h->master_fd = _connect_to(h, master_addr, true);
if (h->master_fd == -1) {
fprintf(stderr, "Harbor: Connect to master failed\n");
exit(1);
}
h->local_addr = strdup(local_addr);
h->local_addr = skynet_strdup(local_addr);
_launch_gate(ctx, local_addr);
skynet_callback(ctx, h, _mainloop);

2
service-src/service_snlua.c
View File

@@ -267,7 +267,7 @@ struct snlua *
snlua_create(void) {
struct snlua * l = malloc(sizeof(*l));
memset(l,0,sizeof(*l));
l->L = luaL_newstate();
l->L = lua_newstate(skynet_lalloc, NULL);
l->init = _init;
return l;
}