refactor module layout

Makefile

@@ -87,7 +87,7 @@ LIB_SRC = lualib-core.c \
 
 all: \
 	$(TARGET) \
-	$(LUACLIB_PATH)/sys.so \
+	$(LUACLIB_PATH)/core.so \
 	$(LUACLIB_PATH)/zproto.so \
 	$(LUACLIB_PATH)/http2.so \
 	$(LUACLIB_PATH)/test.so \
@@ -98,7 +98,7 @@ $(TARGET):$(OBJS) $(LUA_STATICLIB) $(MALLOC_STATICLIB)
 $(LUACLIB_PATH):
 	mkdir $(LUACLIB_PATH)
 
-$(LUACLIB_PATH)/sys.so: $(addprefix $(LIB_PATH)/, $(LIB_SRC)) | $(LUACLIB_PATH)
+$(LUACLIB_PATH)/core.so: $(addprefix $(LIB_PATH)/, $(LIB_SRC)) | $(LUACLIB_PATH)
 	$(CC) $(CCFLAG) $(INCLUDE) -o $@ $^ $(SHARED) $(TLSFLAG)
 $(LUACLIB_PATH)/zproto.so: $(LIB_PATH)/zproto/lzproto.c $(LIB_PATH)/zproto/zproto.c | $(LUACLIB_PATH)
 	$(CC) $(CCFLAG) $(INCLUDE) -o $@ $^ $(SHARED)

examples/http.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local json = require "sys.json"
-local http = require "http"
+local core = require "core"
+local json = require "core.json"
+local http = require "core.http"
 
 http.listen {
 	port = "127.0.0.1:8080",

examples/patch.lua

@@ -1,4 +1,4 @@
-local console = require "sys.console"
+local console = require "core.console"
 local run = require "examples.patch.run"
 
 console {

examples/patch/hotfix.lua

@@ -1,4 +1,4 @@
-local patch = require "sys.patch"
+local patch = require "core.patch"
 local run = require "patch.run"
 local ENV = setmetatable({}, {__index = _ENV})
 local fix = loadfile("examples/patch/fix.lua", "bt", ENV)()

examples/rpc.lua

@@ -1,5 +1,5 @@
-local core = require "sys.core"
-local crypto = require "sys.crypto"
+local core = require "core"
+local crypto = require "core.crypto"
 local rpc = require "cluster.rpc"
 local zproto = require "zproto"
 

examples/socket.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local crypto = require "sys.crypto"
-local socket = require "sys.net.tcp"
+local core = require "core"
+local crypto = require "core.crypto"
+local socket = require "core.net.tcp"
 
 socket.listen("127.0.0.1:9999", function(fd, addr)
 	print("accept", fd, addr)

examples/timer.lua

@@ -1,4 +1,4 @@
-local core = require "sys.core"
+local core = require "core"
 
 local function timer(session)
 	print("timer even expired", session)

examples/websocket.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local crypto = require "sys.crypto"
-local websocket = require "http.websocket"
+local core = require "core"
+local crypto = require "core.crypto"
+local websocket = require "core.websocket"
 
 local handler = function(sock)
 	local dat, typ = sock:read()

lualib-src/lualib-core.c

@@ -498,7 +498,7 @@ ltraceget(lua_State *L)
 }
 
 int
-luaopen_sys_core_c(lua_State *L)
+luaopen_core_c(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		//core

lualib-src/lualib-crypto.c

@@ -541,7 +541,7 @@ setfuncs_withbuffer(lua_State *L, luaL_Reg tbl[])
 }
 
 int
-luaopen_sys_crypto(lua_State *L)
+luaopen_core_crypto(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		{"xor", lxor},

lualib-src/lualib-debugger.c

@@ -92,7 +92,7 @@ lhook(lua_State *L)
 }
 
 int
-luaopen_sys_debugger_helper(lua_State *L)
+luaopen_core_debugger_helper(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		{"hook", lhook},

lualib-src/lualib-env.c

@@ -124,7 +124,7 @@ load_args(lua_State *L)
 }
 
 int
-luaopen_sys_env(lua_State *L)
+luaopen_core_env(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		{"load", lload},

lualib-src/lualib-logger.c

@@ -205,7 +205,7 @@ lerror(lua_State *L)
 }
 
 int
-luaopen_sys_logger_c(lua_State *L)
+luaopen_core_logger_c(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		{"getlevel", lgetlevel},

lualib-src/lualib-metrics.c

@@ -198,7 +198,7 @@ ltimerresolution(lua_State *L)
 }
 
 int
-luaopen_sys_metrics_c(lua_State *L)
+luaopen_core_metrics_c(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		//build

lualib-src/lualib-netpacket.c

@@ -475,7 +475,7 @@ packet_gc(lua_State *L)
 	return 0;
 }
 
-int luaopen_sys_netpacket(lua_State *L)
+int luaopen_core_netpacket(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		{"create", lcreate},

lualib-src/lualib-netstream.c

@@ -501,7 +501,7 @@ tpush(lua_State *L)
 	return 0;
 }
 
-int luaopen_sys_netstream(lua_State *L)
+int luaopen_core_netstream(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		{"new", lnew},

lualib-src/lualib-profiler.c

@@ -272,7 +272,7 @@ newmetatable(lua_State *L)
 	return ;
 }
 
-int luaopen_sys_profiler(lua_State *L)
+int luaopen_core_profiler(lua_State *L)
 {
 	int mi;
 	luaL_Reg tbl[] = {

lualib-src/lualib-time.c

@@ -52,7 +52,7 @@ ltimemonotonicsec(lua_State *L)
 }
 
 int
-luaopen_sys_time(lua_State *L)
+luaopen_core_time(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 		{"now", ltimenow},

lualib-src/lualib-tls.c

@@ -77,7 +77,7 @@ new_tls_ctx(lua_State *L, int mode, int ctx_count, int nupval)
 {
 	int size;
 	struct ctx *ctx;
-	size = offsetof(struct ctx, entries) + ctx_count * sizeof(struct ctx_entry); 
+	size = offsetof(struct ctx, entries) + ctx_count * sizeof(struct ctx_entry);
 	ctx = (struct ctx*)lua_newuserdatauv(L, size, nupval);
 	if (luaL_newmetatable(L, "TLS_CTX")) {
 		lua_pushcfunction(L, lctx_free);
@@ -306,7 +306,7 @@ ltls_open(lua_State *L)
 	tls->ssl = SSL_new(ctx->entries[0].ptr);
 	if (tls->ssl == NULL)
 		luaL_error(L, "SSL_new fail");
-	if (alpn_protos != NULL) 
+	if (alpn_protos != NULL)
 		SSL_set_alpn_protos(tls->ssl, alpn_protos, alpn_size);
 	tls->in_bio = BIO_new(BIO_s_mem());
 	if (tls->in_bio == NULL)
@@ -463,7 +463,7 @@ ltls_message(lua_State *L)
 #endif
 
 int
-luaopen_sys_tls_ctx(lua_State *L)
+luaopen_core_tls_ctx(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 #ifdef USE_OPENSSL
@@ -500,7 +500,7 @@ luaopen_sys_tls_ctx(lua_State *L)
 
 
 int
-luaopen_sys_tls_tls(lua_State *L)
+luaopen_core_tls_tls(lua_State *L)
 {
 	luaL_Reg tbl[] = {
 #ifdef USE_OPENSSL

lualib/sys/core.lua → lualib/core.lua

@@ -1,9 +1,8 @@
-local c = require "sys.core.c"
-local logger = require "sys.logger"
+local c = require "core.c"
+local logger = require "core.logger"
 
 local core = {}
 local type = type
-local error = error
 local pairs = pairs
 local assert = assert
 local xpcall = xpcall

lualib/cluster/msg.lua → lualib/core/cluster/msg.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local logger = require "sys.logger"
-local np = require "sys.netpacket"
+local core = require "core"
+local logger = require "core.logger"
+local np = require "core.netpacket"
 local pairs = pairs
 local assert = assert
 local type = type

lualib/cluster/rpc.lua → lualib/core/cluster/rpc.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local logger = require "sys.logger"
-local np = require "sys.netpacket"
+local core = require "core"
+local logger = require "core.logger"
+local np = require "core.netpacket"
 local zproto = require "zproto"
 local type = type
 local pairs = pairs

lualib/sys/console.lua → lualib/core/console.lua

@@ -1,11 +1,11 @@
-local core = require "sys.core"
-local time = require "sys.time"
-local metrics = require "sys.metrics.c"
-local prometheus = require "sys.metrics.prometheus"
-local logger = require "sys.logger"
-local patch = require "sys.patch"
-local tcp = require "sys.net.tcp"
-local debugger = require "sys.debugger"
+local core = require "core"
+local time = require "core.time"
+local metrics = require "core.metrics.c"
+local prometheus = require "core.metrics.prometheus"
+local logger = require "core.logger"
+local patch = require "core.patch"
+local tcp = require "core.net.tcp"
+local debugger = require "core.debugger"
 local type = type
 local pairs = pairs
 local pcall = pcall

lualib/sys/db/mysql.lua → lualib/core/db/mysql.lua

@@ -6,8 +6,8 @@
 
 -- protocol detail: https://mariadb.com/kb/en/clientserver-protocol/
 
-local crypto = require "sys.crypto"
-local dispatch = require "sys.socketq"
+local crypto = require "core.crypto"
+local dispatch = require "core.socketq"
 
 local sub = string.sub
 local strgsub = string.gsub

lualib/sys/db/redis.lua → lualib/core/db/redis.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local logger = require "sys.logger"
-local dispatch = require "sys.socketq"
+local core = require "core"
+local logger = require "core.logger"
+local dispatch = require "core.socketq"
 local type = type
 local assert = assert
 local tostring = tostring

lualib/sys/debugger.lua → lualib/core/debugger.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local logger = require "sys.logger"
-local helper = require "sys.debugger.helper"
+local core = require "core"
+local logger = require "core.logger"
+local helper = require "core.debugger.helper"
 local sethook = helper.hook
 local getinfo = debug.getinfo
 local getlocal = debug.getlocal

lualib/sys/dns.lua → lualib/core/dns.lua

@@ -1,8 +1,8 @@
-local core = require "sys.core"
-local time = require "sys.time"
-local env = require "sys.env"
-local logger = require "sys.logger"
-local udp = require "sys.net.udp"
+local core = require "core"
+local time = require "core.time"
+local env = require "core.env"
+local logger = require "core.logger"
+local udp = require "core.net.udp"
 local assert = assert
 local pairs = pairs
 local sub = string.sub

lualib/http.lua → lualib/core/http.lua

@@ -1,7 +1,7 @@
-local helper = require "http.helper"
-local stream = require "http.stream"
-local tcp = require "sys.net.tcp"
-local tls = require "sys.tls"
+local helper = require "core.http.helper"
+local stream = require "core.http.stream"
+local tcp = require "core.net.tcp"
+local tls = require "core.net.tls"
 local parseurl = helper.parseurl
 
 local M = {}

lualib/http/dom.lua → lualib/core/http/dom.lua

@@ -1,5 +1,5 @@
 local M = {}
-local helper = require "http.helper"
+local helper = require "core.http.helper"
 local tconcat = table.concat
 local tremove = table.remove
 local type, pairs = type, pairs

lualib/http/h1stream.lua → lualib/core/http/h1stream.lua

@@ -1,9 +1,8 @@
-local core = require "sys.core"
-local socket = require "sys.net.tcp"
-local helper = require "http.helper"
-local time = require "sys.time"
-local logger = require "sys.logger"
-local statusname = require "http.statusname"
+local core = require "core"
+local helper = require "core.http.helper"
+local time = require "core.time"
+local logger = require "core.logger"
+local statusname = require "core.http.statusname"
 local tonumber = tonumber
 local format = string.format
 local gmatch = string.gmatch

lualib/http/h2stream.lua → lualib/core/http/h2stream.lua

@@ -1,5 +1,5 @@
-local core = require "sys.core"
-local helper = require "http.helper"
+local core = require "core"
+local helper = require "core.http.helper"
 local hpack = require "http2.hpack"
 local builder = require "http2.framebuilder"
 

lualib/http/stream.lua → lualib/core/http/stream.lua

@@ -1,9 +1,9 @@
-local tcp = require "sys.net.tcp"
-local tls = require "sys.tls"
-local dns = require "sys.dns"
-local mutex = require "sys.sync.mutex"
-local h1 = require "http.h1stream"
-local h2 = require "http.h2stream"
+local tcp = require "core.net.tcp"
+local tls = require "core.net.tls"
+local dns = require "core.dns"
+local mutex = require "core.sync.mutex"
+local h1 = require "core.http.h1stream"
+local h2 = require "core.http.h2stream"
 local format = string.format
 
 local function wrap_one(func)

lualib/sys/logger.lua → lualib/core/logger.lua

@@ -1,4 +1,4 @@
-local c = require "sys.logger.c"
+local c = require "core.logger.c"
 local logger = {
 	--const from silly_log.h
 	DEBUG = 0,

lualib/sys/metrics/core_collector.lua → lualib/core/metrics/core_collector.lua

@@ -1,6 +1,6 @@
-local core = require "sys.core"
-local c = require "sys.metrics.c"
-local gauge = require "sys.metrics.gauge"
+local core = require "core"
+local c = require "core.metrics.c"
+local gauge = require "core.metrics.gauge"
 local setmetatable = setmetatable
 
 local M = {}

lualib/sys/metrics/counter.lua → lualib/core/metrics/counter.lua

@@ -1,5 +1,5 @@
-local labels = require "sys.metrics.labels"
-local helper = require "sys.metrics.helper"
+local labels = require "core.metrics.labels"
+local helper = require "core.metrics.helper"
 
 local mt
 local label_mt

lualib/sys/metrics/gauge.lua → lualib/core/metrics/gauge.lua

@@ -1,5 +1,5 @@
-local labels = require "sys.metrics.labels"
-local helper = require "sys.metrics.helper"
+local labels = require "core.metrics.labels"
+local helper = require "core.metrics.helper"
 
 local mt
 local label_mt

lualib/sys/metrics/jemalloc_collector.lua → lualib/core/metrics/jemalloc_collector.lua

@@ -1,5 +1,5 @@
-local c = require "sys.metrics.c"
-local gauge = require "sys.metrics.gauge"
+local c = require "core.metrics.c"
+local gauge = require "core.metrics.gauge"
 local setmetatable = setmetatable
 
 local M = {}