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

add prefix skynet to c module

Browse Source
This commit is contained in:
Cloud Wu
2017-06-01 11:56:16 +08:00
parent f1ed482001
commit f9f009a4c1
16 changed files with 37 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Makefile
View File

@@ -46,21 +46,25 @@ update3rd :
CSERVICE = snlua logger gate harbor CSERVICE = snlua logger gate harbor
LUA_CLIB = skynet \ LUA_CLIB = skynet \
skynet.socketdriver \ clientsocket \
skynet.mongo \
skynet.netpack \
skynet.mysqlaux \
skynet.debugchannel \
skynet.profile \
skynet.cluster \
skynet.sharedata \
skynet.multicast \
skynet.memory \
skynet.crypt \
skynet.stm \
skynet.clientsocket \
bson md5 sproto lpeg bson md5 sproto lpeg
LUA_CLIB_SKYNET = \
lua-skynet.c lua-seri.c \
lua-socket.c \
lua-mongo.c \
lua-netpack.c \
lua-memory.c \
lua-profile.c \
lua-multicast.c \
lua-cluster.c \
lua-crypt.c lsha1.c \
lua-sharedata.c \
lua-stm.c \
lua-mysqlaux.c \
lua-debugchannel.c \
\
SKYNET_SRC = skynet_main.c skynet_handle.c skynet_module.c skynet_mq.c \ SKYNET_SRC = skynet_main.c skynet_handle.c skynet_module.c skynet_mq.c \
skynet_server.c skynet_start.c skynet_timer.c skynet_error.c \ skynet_server.c skynet_start.c skynet_timer.c skynet_error.c \
skynet_harbor.c skynet_env.c skynet_monitor.c skynet_socket.c socket_server.c \ skynet_harbor.c skynet_env.c skynet_monitor.c skynet_socket.c socket_server.c \
@@ -87,60 +91,24 @@ endef
$(foreach v, $(CSERVICE), $(eval $(call CSERVICE_TEMP,$(v)))) $(foreach v, $(CSERVICE), $(eval $(call CSERVICE_TEMP,$(v))))
$(LUA_CLIB_PATH)/skynet.so : lualib-src/lua-skynet.c lualib-src/lua-seri.c | $(LUA_CLIB_PATH) $(LUA_CLIB_PATH)/skynet.so : $(addprefix lualib-src/,$(LUA_CLIB_SKYNET)) | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iservice-src -Ilualib-src $(CC) $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iservice-src -Ilualib-src
$(LUA_CLIB_PATH)/skynet.socketdriver.so : lualib-src/lua-socket.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iservice-src
$(LUA_CLIB_PATH)/bson.so : lualib-src/lua-bson.c | $(LUA_CLIB_PATH) $(LUA_CLIB_PATH)/bson.so : lualib-src/lua-bson.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@ -Iskynet-src $(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@ -Iskynet-src
$(LUA_CLIB_PATH)/skynet.mongo.so : lualib-src/lua-mongo.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
$(LUA_CLIB_PATH)/md5.so : 3rd/lua-md5/md5.c 3rd/lua-md5/md5lib.c 3rd/lua-md5/compat-5.2.c | $(LUA_CLIB_PATH) $(LUA_CLIB_PATH)/md5.so : 3rd/lua-md5/md5.c 3rd/lua-md5/md5lib.c 3rd/lua-md5/compat-5.2.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -I3rd/lua-md5 $^ -o $@ $(CC) $(CFLAGS) $(SHARED) -I3rd/lua-md5 $^ -o $@
$(LUA_CLIB_PATH)/skynet.netpack.so : lualib-src/lua-netpack.c | $(LUA_CLIB_PATH) $(LUA_CLIB_PATH)/clientsocket.so : lualib-src/lua-clientsocket.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -Iskynet-src -o $@
$(LUA_CLIB_PATH)/skynet.clientsocket.so : lualib-src/lua-clientsocket.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -o $@ -lpthread $(CC) $(CFLAGS) $(SHARED) $^ -o $@ -lpthread
$(LUA_CLIB_PATH)/skynet.memory.so : lualib-src/lua-memory.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@
$(LUA_CLIB_PATH)/skynet.profile.so : lualib-src/lua-profile.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -o $@
$(LUA_CLIB_PATH)/skynet.multicast.so : lualib-src/lua-multicast.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@
$(LUA_CLIB_PATH)/skynet.cluster.so : lualib-src/lua-cluster.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@
$(LUA_CLIB_PATH)/skynet.crypt.so : lualib-src/lua-crypt.c lualib-src/lsha1.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -o $@
$(LUA_CLIB_PATH)/skynet.sharedata.so : lualib-src/lua-sharedata.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@
$(LUA_CLIB_PATH)/skynet.stm.so : lualib-src/lua-stm.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@
$(LUA_CLIB_PATH)/sproto.so : lualib-src/sproto/sproto.c lualib-src/sproto/lsproto.c | $(LUA_CLIB_PATH) $(LUA_CLIB_PATH)/sproto.so : lualib-src/sproto/sproto.c lualib-src/sproto/lsproto.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Ilualib-src/sproto $^ -o $@ $(CC) $(CFLAGS) $(SHARED) -Ilualib-src/sproto $^ -o $@
$(LUA_CLIB_PATH)/lpeg.so : 3rd/lpeg/lpcap.c 3rd/lpeg/lpcode.c 3rd/lpeg/lpprint.c 3rd/lpeg/lptree.c 3rd/lpeg/lpvm.c | $(LUA_CLIB_PATH) $(LUA_CLIB_PATH)/lpeg.so : 3rd/lpeg/lpcap.c 3rd/lpeg/lpcode.c 3rd/lpeg/lpprint.c 3rd/lpeg/lptree.c 3rd/lpeg/lpvm.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -I3rd/lpeg $^ -o $@ $(CC) $(CFLAGS) $(SHARED) -I3rd/lpeg $^ -o $@
$(LUA_CLIB_PATH)/skynet.mysqlaux.so : lualib-src/lua-mysqlaux.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) $^ -o $@
$(LUA_CLIB_PATH)/skynet.debugchannel.so : lualib-src/lua-debugchannel.c | $(LUA_CLIB_PATH)
$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@
clean : clean :
rm -f $(SKYNET_BUILD_PATH)/skynet $(CSERVICE_PATH)/*.so $(LUA_CLIB_PATH)/*.so rm -f $(SKYNET_BUILD_PATH)/skynet $(CSERVICE_PATH)/*.so $(LUA_CLIB_PATH)/*.so

2
lualib-src/lua-cluster.c
View File

@@ -508,7 +508,7 @@ lconcat(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_cluster_core(lua_State *L) { luaopen_skynet_cluster_core(lua_State *L) {
luaL_Reg l[] = { luaL_Reg l[] = {
{ "packrequest", lpackrequest }, { "packrequest", lpackrequest },
{ "packpush", lpackpush }, { "packpush", lpackpush },

2
lualib-src/lua-crypt.c
View File

@@ -904,7 +904,7 @@ int lsha1(lua_State *L);
int lhmac_sha1(lua_State *L); int lhmac_sha1(lua_State *L);
LUAMOD_API int LUAMOD_API int
luaopen_crypt(lua_State *L) { luaopen_skynet_crypt(lua_State *L) {
luaL_checkversion(L); luaL_checkversion(L);
static int init = 0; static int init = 0;
if (!init) { if (!init) {

2
lualib-src/lua-debugchannel.c
View File

@@ -271,7 +271,7 @@ static int db_sethook (lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_debugchannel(lua_State *L) { luaopen_skynet_debugchannel(lua_State *L) {
luaL_Reg l[] = { luaL_Reg l[] = {
{ "create", lcreate }, // for write { "create", lcreate }, // for write
{ "connect", lconnect }, // for read { "connect", lconnect }, // for read

2
lualib-src/lua-memory.c
View File

@@ -50,7 +50,7 @@ lcurrent(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_memory(lua_State *L) { luaopen_skynet_memory(lua_State *L) {
luaL_checkversion(L); luaL_checkversion(L);
luaL_Reg l[] = { luaL_Reg l[] = {

2
lualib-src/lua-mongo.c
View File

@@ -532,7 +532,7 @@ reply_length(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_mongo_driver(lua_State *L) { luaopen_skynet_mongo_driver(lua_State *L) {
luaL_checkversion(L); luaL_checkversion(L);
luaL_Reg l[] ={ luaL_Reg l[] ={
{ "query", op_query }, { "query", op_query },

2
lualib-src/lua-multicast.c
View File

@@ -146,7 +146,7 @@ mc_nextid(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_multicast_core(lua_State *L) { luaopen_skynet_multicast_core(lua_State *L) {
luaL_Reg l[] = { luaL_Reg l[] = {
{ "pack", mc_packlocal }, { "pack", mc_packlocal },
{ "unpack", mc_unpacklocal }, { "unpack", mc_unpacklocal },

2
lualib-src/lua-mysqlaux.c
View File

@@ -158,7 +158,7 @@ static struct luaL_Reg mysqlauxlib[] = {
}; };
LUAMOD_API int luaopen_mysqlaux_c (lua_State *L) { LUAMOD_API int luaopen_skynet_mysqlaux_c (lua_State *L) {
lua_newtable(L); lua_newtable(L);
luaL_setfuncs(L, mysqlauxlib, 0); luaL_setfuncs(L, mysqlauxlib, 0);
return 1; return 1;

2
lualib-src/lua-netpack.c
View File

@@ -465,7 +465,7 @@ ltostring(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_netpack(lua_State *L) { luaopen_skynet_netpack(lua_State *L) {
luaL_checkversion(L); luaL_checkversion(L);
luaL_Reg l[] = { luaL_Reg l[] = {
{ "pop", lpop }, { "pop", lpop },

2
lualib-src/lua-profile.c
View File

@@ -200,7 +200,7 @@ lyield_co(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_profile(lua_State *L) { luaopen_skynet_profile(lua_State *L) {
luaL_checkversion(L); luaL_checkversion(L);
luaL_Reg l[] = { luaL_Reg l[] = {
{ "start", lstart }, { "start", lstart },

2
lualib-src/lua-sharedata.c
View File

@@ -765,7 +765,7 @@ lupdate(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_sharedata_core(lua_State *L) { luaopen_skynet_sharedata_core(lua_State *L) {
luaL_Reg l[] = { luaL_Reg l[] = {
// used by host // used by host
{ "new", lnewconf }, { "new", lnewconf },

2
lualib-src/lua-socket.c
View File

@@ -678,7 +678,7 @@ ludp_address(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_socketdriver(lua_State *L) { luaopen_skynet_socketdriver(lua_State *L) {
luaL_checkversion(L); luaL_checkversion(L);
luaL_Reg l[] = { luaL_Reg l[] = {
{ "buffer", lnewbuffer }, { "buffer", lnewbuffer },

2
lualib-src/lua-stm.c
View File

@@ -235,7 +235,7 @@ lread(lua_State *L) {
} }
LUAMOD_API int LUAMOD_API int
luaopen_stm(lua_State *L) { luaopen_skynet_stm(lua_State *L) {
luaL_checkversion(L); luaL_checkversion(L);
lua_createtable(L, 0, 3); lua_createtable(L, 0, 3);

4
lualib/snax/gateserver.lua
View File

@@ -1,6 +1,6 @@
local skynet = require "skynet" local skynet = require "skynet"
local netpack = require "netpack" local netpack = require "skynet.netpack"
local socketdriver = require "socketdriver" local socketdriver = require "skynet.socketdriver"
local gateserver = {} local gateserver = {}

2
lualib/snax/loginserver.lua
View File

@@ -1,7 +1,7 @@
local skynet = require "skynet" local skynet = require "skynet"
require "skynet.manager" require "skynet.manager"
local socket = require "skynet.socket" local socket = require "skynet.socket"
local crypt = require "crypt" local crypt = require "skynet.crypt"
local table = table local table = table
local string = string local string = string
local assert = assert local assert = assert

6
lualib/snax/msgserver.lua
View File

@@ -1,8 +1,8 @@
local skynet = require "skynet" local skynet = require "skynet"
local gateserver = require "snax.gateserver" local gateserver = require "snax.gateserver"
local netpack = require "netpack" local netpack = require "skynet.netpack"
local crypt = require "crypt" local crypt = require "skynet.crypt"
local socketdriver = require "socketdriver" local socketdriver = require "skynet.socketdriver"
local assert = assert local assert = assert
local b64encode = crypt.base64encode local b64encode = crypt.base64encode
local b64decode = crypt.base64decode local b64decode = crypt.base64decode