Merge pull request #647 from cloudwu/module

Module namespace

lualib/compat10/cluster.lua

@@ -0,0 +1 @@
+return require "skynet.cluster"

lualib/compat10/crypt.lua

@@ -0,0 +1 @@
+return require "skynet.crypt"

lualib/compat10/datacenter.lua

@@ -0,0 +1 @@
+return require "skynet.datacenter"

lualib/compat10/dns.lua

@@ -0,0 +1 @@
+return require "skynet.dns"

lualib/compat10/memory.lua

@@ -0,0 +1 @@
+return require "skynet.memory"

lualib/compat10/mongo.lua

@@ -0,0 +1 @@
+return require "skynet.db.mongo"

lualib/compat10/mqueue.lua

@@ -0,0 +1 @@
+return require "skynet.mqueue"

lualib/compat10/multicast.lua

@@ -0,0 +1 @@
+return require "skynet.multicast"

lualib/compat10/mysql.lua

@@ -0,0 +1 @@
+return require "skynet.db.mysql"

lualib/compat10/netpack.lua

@@ -0,0 +1 @@
+return require "skynet.netpack"

lualib/compat10/profile.lua

@@ -0,0 +1 @@
+return require "skynet.profile"

lualib/compat10/redis.lua

@@ -0,0 +1 @@
+return require "skynet.db.redis"

lualib/compat10/sharedata.lua

@@ -0,0 +1 @@
+return require "skynet.sharedata"

lualib/compat10/sharemap.lua

@@ -0,0 +1 @@
+return require "skynet.sharemap"

lualib/compat10/snax.lua

@@ -0,0 +1 @@
+return require "skynet.snax"

lualib/compat10/socket.lua

@@ -0,0 +1 @@
+return require "skynet.socket"

lualib/compat10/socketchannel.lua

@@ -0,0 +1 @@
+return require "skynet.socketchannel"

lualib/compat10/socketdriver.lua

@@ -0,0 +1 @@
+return require "skynet.socketdriver"

lualib/compat10/stm.lua

@@ -0,0 +1 @@
+return require "skynet.stm"

lualib/http/httpc.lua

@@ -2,7 +2,7 @@ local skynet = require "skynet"
 local socket = require "http.sockethelper"
 local url = require "http.url"
 local internal = require "http.internal"
-local dns = require "dns"
+local dns = require "skynet.dns"
 local string = string
 local table = table
 

lualib/http/sockethelper.lua

@@ -1,4 +1,4 @@
-local socket = require "socket"
+local socket = require "skynet.socket"
 local skynet = require "skynet"
 
 local readbytes = socket.read

lualib/skynet.lua

@@ -8,7 +8,7 @@ local pairs = pairs
 local pcall = pcall
 local table = table
 
-local profile = require "profile"
+local profile = require "skynet.profile"
 
 local coroutine_resume = profile.resume
 local coroutine_yield = profile.yield

lualib/skynet/cluster.lua

@@ -30,7 +30,7 @@ function cluster.proxy(node, name)
 end
 
 function cluster.snax(node, name, address)
-	local snax = require "snax"
+	local snax = require "skynet.snax"
 	if not address then
 		address = cluster.call(node, ".service", "QUERY", "snaxd" , name)
 	end

lualib/skynet/db/mongo.lua

@@ -1,10 +1,10 @@
 local bson = require "bson"
-local socket = require "socket"
-local socketchannel	= require "socketchannel"
+local socket = require "skynet.socket"
+local socketchannel	= require "skynet.socketchannel"
 local skynet = require "skynet"
-local driver = require "mongo.driver"
+local driver = require "skynet.mongo.driver"
 local md5 =	require	"md5"
-local crypt = require "crypt"
+local crypt = require "skynet.crypt"
 local rawget = rawget
 local assert = assert
 local table = table

lualib/skynet/db/mysql.lua

@@ -4,9 +4,9 @@
 -- The license is under the BSD license.
 -- Modified by Cloud Wu (remove bit32 for lua 5.3)
 
-local socketchannel = require "socketchannel"
-local mysqlaux = require "mysqlaux.c"
-local crypt = require "crypt"
+local socketchannel = require "skynet.socketchannel"
+local mysqlaux = require "skynet.mysqlaux.c"
+local crypt = require "skynet.crypt"
 
 
 local sub = string.sub

lualib/skynet/db/redis.lua

@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local socket = require "socket"
-local socketchannel = require "socketchannel"
+local socket = require "skynet.socket"
+local socketchannel = require "skynet.socketchannel"
 
 local table = table
 local string = string

lualib/skynet/dns.lua

@@ -65,7 +65,7 @@
 --]]
 
 local skynet = require "skynet"
-local socket = require "socket"
+local socket = require "skynet.socket"
 
 local MAX_DOMAIN_LEN = 1024
 local MAX_LABEL_LEN = 63

lualib/skynet/multicast.lua

@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local mc = require "multicast.core"
+local mc = require "skynet.multicast.core"
 
 local multicastd
 local multicast = {}

lualib/skynet/reload.lua

@@ -0,0 +1,9 @@
+local core = require "skynet.reload.core"
+local skynet = require "skynet"
+
+local function reload(...)
+	local args = SERVICE_NAME .. " " .. table.concat({...}, " ")
+	print(args)
+end
+
+return reload

lualib/skynet/remotedebug.lua

@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local debugchannel = require "debugchannel"
-local socketdriver = require "socketdriver"
+local debugchannel = require "skynet.debugchannel"
+local socketdriver = require "skynet.socketdriver"
 local injectrun = require "skynet.injectcode"
 local table = table
 local debug = debug

lualib/skynet/sharedata.lua

@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local sd = require "sharedata.corelib"
+local sd = require "skynet.sharedata.corelib"
 
 local service
 

lualib/skynet/sharedata/corelib.lua

@@ -1,4 +1,4 @@
-local core = require "sharedata.core"
+local core = require "skynet.sharedata.core"
 local type = type
 local rawset = rawset
 

lualib/skynet/sharemap.lua

@@ -1,4 +1,4 @@
-local stm = require "stm"
+local stm = require "skynet.stm"
 local sprotoloader = require "sprotoloader"
 local sproto = require "sproto"
 local setmetatable = setmetatable

lualib/skynet/socket.lua

@@ -1,4 +1,4 @@
-local driver = require "socketdriver"
+local driver = require "skynet.socketdriver"
 local skynet = require "skynet"
 local skynet_core = require "skynet.core"
 local assert = assert

lualib/skynet/socketchannel.lua

@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local socket = require "socket"
-local socketdriver = require "socketdriver"
+local socket = require "skynet.socket"
+local socketdriver = require "skynet.socketdriver"
 
 -- channel support auto reconnect , and capture socket error in request/response transaction
 -- { host = "", port = , auth = function(so) , response = function(so) session, data }

lualib/snax/gateserver.lua

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

lualib/snax/loginserver.lua

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

lualib/snax/msgserver.lua

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