From f1ed4820012e4dabeabe384bcc261ef3743e2019 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Thu, 1 Jun 2017 11:29:07 +0800
Subject: [PATCH] move to skynet module

---
 Makefile                                  | 45 ++++++++++++++---------
 examples/agent.lua                        |  2 +-
 examples/client.lua                       |  2 +-
 examples/cluster1.lua                     |  2 +-
 examples/cluster2.lua                     |  2 +-
 lualib/http/httpc.lua                     |  2 +-
 lualib/skynet.lua                         |  2 +-
 lualib/{ => skynet}/cluster.lua           |  0
 lualib/{ => skynet}/datacenter.lua        |  0
 lualib/skynet/db/mongo.lua                |  4 +-
 lualib/skynet/db/mysql.lua                |  4 +-
 lualib/{ => skynet}/mqueue.lua            |  0
 lualib/{ => skynet}/multicast.lua         |  2 +-
 lualib/skynet/reload.lua                  |  9 +++++
 lualib/skynet/remotedebug.lua             |  4 +-
 lualib/{ => skynet}/sharedata.lua         |  2 +-
 lualib/{ => skynet}/sharedata/corelib.lua |  2 +-
 lualib/{ => skynet}/sharemap.lua          |  2 +-
 lualib/skynet/socket.lua                  |  2 +-
 lualib/skynet/socketchannel.lua           |  2 +-
 service/bootstrap.lua                     |  2 +-
 service/clusterd.lua                      |  2 +-
 service/clusterproxy.lua                  |  2 +-
 service/cmemory.lua                       |  2 +-
 service/debug_agent.lua                   |  2 +-
 service/debug_console.lua                 |  2 +-
 service/gate.lua                          |  2 +-
 service/multicastd.lua                    |  4 +-
 service/sharedatad.lua                    |  2 +-
 service/snaxd.lua                         |  2 +-
 test/testcoroutine.lua                    |  2 +-
 test/testdatacenter.lua                   |  2 +-
 test/testmulticast.lua                    |  4 +-
 test/testmulticast2.lua                   |  4 +-
 test/testsha.lua                          |  2 +-
 test/testsm.lua                           |  2 +-
 test/teststm.lua                          |  2 +-
 37 files changed, 75 insertions(+), 55 deletions(-)
 rename lualib/{ => skynet}/cluster.lua (100%)
 rename lualib/{ => skynet}/datacenter.lua (100%)
 rename lualib/{ => skynet}/mqueue.lua (100%)
 rename lualib/{ => skynet}/multicast.lua (98%)
 create mode 100644 lualib/skynet/reload.lua
 rename lualib/{ => skynet}/sharedata.lua (96%)
 rename lualib/{ => skynet}/sharedata/corelib.lua (98%)
 rename lualib/{ => skynet}/sharemap.lua (97%)

diff --git a/Makefile b/Makefile
index 08259a63..de69e05a 100644
--- a/Makefile
+++ b/Makefile
@@ -45,10 +45,21 @@ update3rd :
 # skynet
 
 CSERVICE = snlua logger gate harbor
-LUA_CLIB = skynet socketdriver bson mongo md5 netpack \
-  clientsocket memory profile multicast \
-  cluster crypt sharedata stm sproto lpeg \
-  mysqlaux debugchannel
+LUA_CLIB = skynet \
+  skynet.socketdriver \
+  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
 
 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 \
@@ -79,43 +90,43 @@ $(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)
 	$(CC) $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iservice-src -Ilualib-src
 
-$(LUA_CLIB_PATH)/socketdriver.so : lualib-src/lua-socket.c | $(LUA_CLIB_PATH)
+$(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)
 	$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@ -Iskynet-src
 
-$(LUA_CLIB_PATH)/mongo.so : lualib-src/lua-mongo.c | $(LUA_CLIB_PATH)
+$(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)
 	$(CC) $(CFLAGS) $(SHARED) -I3rd/lua-md5 $^ -o $@ 
 
-$(LUA_CLIB_PATH)/netpack.so : lualib-src/lua-netpack.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.netpack.so : lualib-src/lua-netpack.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) $^ -Iskynet-src -o $@ 
 
-$(LUA_CLIB_PATH)/clientsocket.so : lualib-src/lua-clientsocket.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.clientsocket.so : lualib-src/lua-clientsocket.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) $^ -o $@ -lpthread
 
-$(LUA_CLIB_PATH)/memory.so : lualib-src/lua-memory.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.memory.so : lualib-src/lua-memory.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@ 
 
-$(LUA_CLIB_PATH)/profile.so : lualib-src/lua-profile.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.profile.so : lualib-src/lua-profile.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) $^ -o $@ 
 
-$(LUA_CLIB_PATH)/multicast.so : lualib-src/lua-multicast.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.multicast.so : lualib-src/lua-multicast.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@ 
 
-$(LUA_CLIB_PATH)/cluster.so : lualib-src/lua-cluster.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.cluster.so : lualib-src/lua-cluster.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@ 
 
-$(LUA_CLIB_PATH)/crypt.so : lualib-src/lua-crypt.c lualib-src/lsha1.c | $(LUA_CLIB_PATH)
+$(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)/sharedata.so : lualib-src/lua-sharedata.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.sharedata.so : lualib-src/lua-sharedata.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@ 
 
-$(LUA_CLIB_PATH)/stm.so : lualib-src/lua-stm.c | $(LUA_CLIB_PATH)
+$(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)
@@ -124,10 +135,10 @@ $(LUA_CLIB_PATH)/sproto.so : lualib-src/sproto/sproto.c lualib-src/sproto/lsprot
 $(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 $@ 
 
-$(LUA_CLIB_PATH)/mysqlaux.so : lualib-src/lua-mysqlaux.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.mysqlaux.so : lualib-src/lua-mysqlaux.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) $^ -o $@	
 
-$(LUA_CLIB_PATH)/debugchannel.so : lualib-src/lua-debugchannel.c | $(LUA_CLIB_PATH)
+$(LUA_CLIB_PATH)/skynet.debugchannel.so : lualib-src/lua-debugchannel.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) -Iskynet-src $^ -o $@	
 
 clean :
diff --git a/examples/agent.lua b/examples/agent.lua
index c4cfaf27..3e164bb8 100644
--- a/examples/agent.lua
+++ b/examples/agent.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local netpack = require "netpack"
+local netpack = require "skynet.netpack"
 local socket = require "skynet.socket"
 local sproto = require "sproto"
 local sprotoloader = require "sprotoloader"
diff --git a/examples/client.lua b/examples/client.lua
index 92aaa16e..52836c5f 100644
--- a/examples/client.lua
+++ b/examples/client.lua
@@ -5,7 +5,7 @@ if _VERSION ~= "Lua 5.3" then
 	error "Use lua 5.3"
 end
 
-local socket = require "clientsocket"
+local socket = require "skynet.clientsocket"
 local proto = require "proto"
 local sproto = require "sproto"
 
diff --git a/examples/cluster1.lua b/examples/cluster1.lua
index 70d20044..16e01b93 100644
--- a/examples/cluster1.lua
+++ b/examples/cluster1.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local cluster = require "cluster"
+local cluster = require "skynet.cluster"
 local snax = require "snax"
 
 skynet.start(function()
diff --git a/examples/cluster2.lua b/examples/cluster2.lua
index 22c9cf7f..f356357c 100644
--- a/examples/cluster2.lua
+++ b/examples/cluster2.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local cluster = require "cluster"
+local cluster = require "skynet.cluster"
 
 skynet.start(function()
 	-- query name "sdb" of cluster db.
diff --git a/lualib/http/httpc.lua b/lualib/http/httpc.lua
index 43a44e19..79e7db74 100644
--- a/lualib/http/httpc.lua
+++ b/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
 
diff --git a/lualib/skynet.lua b/lualib/skynet.lua
index d8212f18..caa07db6 100644
--- a/lualib/skynet.lua
+++ b/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
diff --git a/lualib/cluster.lua b/lualib/skynet/cluster.lua
similarity index 100%
rename from lualib/cluster.lua
rename to lualib/skynet/cluster.lua
diff --git a/lualib/datacenter.lua b/lualib/skynet/datacenter.lua
similarity index 100%
rename from lualib/datacenter.lua
rename to lualib/skynet/datacenter.lua
diff --git a/lualib/skynet/db/mongo.lua b/lualib/skynet/db/mongo.lua
index d25dc8fb..e77f7499 100644
--- a/lualib/skynet/db/mongo.lua
+++ b/lualib/skynet/db/mongo.lua
@@ -2,9 +2,9 @@ local bson = require "bson"
 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
diff --git a/lualib/skynet/db/mysql.lua b/lualib/skynet/db/mysql.lua
index e6f8a347..b5d97e2c 100644
--- a/lualib/skynet/db/mysql.lua
+++ b/lualib/skynet/db/mysql.lua
@@ -5,8 +5,8 @@
 -- Modified by Cloud Wu (remove bit32 for lua 5.3)
 
 local socketchannel = require "skynet.socketchannel"
-local mysqlaux = require "mysqlaux.c"
-local crypt = require "crypt"
+local mysqlaux = require "skynet.mysqlaux.c"
+local crypt = require "skynet.crypt"
 
 
 local sub = string.sub
diff --git a/lualib/mqueue.lua b/lualib/skynet/mqueue.lua
similarity index 100%
rename from lualib/mqueue.lua
rename to lualib/skynet/mqueue.lua
diff --git a/lualib/multicast.lua b/lualib/skynet/multicast.lua
similarity index 98%
rename from lualib/multicast.lua
rename to lualib/skynet/multicast.lua
index 181979cb..4b09044f 100644
--- a/lualib/multicast.lua
+++ b/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 = {}
diff --git a/lualib/skynet/reload.lua b/lualib/skynet/reload.lua
new file mode 100644
index 00000000..33e234b0
--- /dev/null
+++ b/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
diff --git a/lualib/skynet/remotedebug.lua b/lualib/skynet/remotedebug.lua
index 72a06809..d0c99e27 100644
--- a/lualib/skynet/remotedebug.lua
+++ b/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
diff --git a/lualib/sharedata.lua b/lualib/skynet/sharedata.lua
similarity index 96%
rename from lualib/sharedata.lua
rename to lualib/skynet/sharedata.lua
index a17a20ba..b955bd90 100644
--- a/lualib/sharedata.lua
+++ b/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
 
diff --git a/lualib/sharedata/corelib.lua b/lualib/skynet/sharedata/corelib.lua
similarity index 98%
rename from lualib/sharedata/corelib.lua
rename to lualib/skynet/sharedata/corelib.lua
index 20bd5506..cc49c2d1 100644
--- a/lualib/sharedata/corelib.lua
+++ b/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
 
diff --git a/lualib/sharemap.lua b/lualib/skynet/sharemap.lua
similarity index 97%
rename from lualib/sharemap.lua
rename to lualib/skynet/sharemap.lua
index 6f9b1bdf..6d6d16b3 100644
--- a/lualib/sharemap.lua
+++ b/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
diff --git a/lualib/skynet/socket.lua b/lualib/skynet/socket.lua
index f9644313..26524d90 100644
--- a/lualib/skynet/socket.lua
+++ b/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
diff --git a/lualib/skynet/socketchannel.lua b/lualib/skynet/socketchannel.lua
index 751a29a6..a6474a81 100644
--- a/lualib/skynet/socketchannel.lua
+++ b/lualib/skynet/socketchannel.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 local socket = require "skynet.socket"
-local socketdriver = require "socketdriver"
+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 }
diff --git a/service/bootstrap.lua b/service/bootstrap.lua
index 90a542cb..3dabfd8a 100644
--- a/service/bootstrap.lua
+++ b/service/bootstrap.lua
@@ -1,7 +1,7 @@
 local skynet = require "skynet"
 local harbor = require "skynet.harbor"
 require "skynet.manager"	-- import skynet.launch, ...
-local memory = require "memory"
+local memory = require "skynet.memory"
 
 skynet.start(function()
 	local sharestring = tonumber(skynet.getenv "sharestring" or 4096)
diff --git a/service/clusterd.lua b/service/clusterd.lua
index 1a34c45f..595b7973 100644
--- a/service/clusterd.lua
+++ b/service/clusterd.lua
@@ -1,7 +1,7 @@
 local skynet = require "skynet"
 local sc = require "skynet.socketchannel"
 local socket = require "skynet.socket"
-local cluster = require "cluster.core"
+local cluster = require "skynet.cluster.core"
 
 local config_name = skynet.getenv "cluster"
 local node_address = {}
diff --git a/service/clusterproxy.lua b/service/clusterproxy.lua
index 1e55cff6..e0cc5daa 100644
--- a/service/clusterproxy.lua
+++ b/service/clusterproxy.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local cluster = require "cluster"
+local cluster = require "skynet.cluster"
 require "skynet.manager"	-- inject skynet.forward_type
 
 local node, address = ...
diff --git a/service/cmemory.lua b/service/cmemory.lua
index e33eb42f..2d429b3c 100644
--- a/service/cmemory.lua
+++ b/service/cmemory.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local memory = require "memory"
+local memory = require "skynet.memory"
 
 memory.dumpinfo()
 --memory.dump()
diff --git a/service/debug_agent.lua b/service/debug_agent.lua
index 451e2215..500a34ee 100644
--- a/service/debug_agent.lua
+++ b/service/debug_agent.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local debugchannel = require "debugchannel"
+local debugchannel = require "skynet.debugchannel"
 
 local CMD = {}
 
diff --git a/service/debug_console.lua b/service/debug_console.lua
index 81042286..986efae5 100644
--- a/service/debug_console.lua
+++ b/service/debug_console.lua
@@ -3,7 +3,7 @@ local codecache = require "skynet.codecache"
 local core = require "skynet.core"
 local socket = require "skynet.socket"
 local snax = require "snax"
-local memory = require "memory"
+local memory = require "skynet.memory"
 local httpd = require "http.httpd"
 local sockethelper = require "http.sockethelper"
 
diff --git a/service/gate.lua b/service/gate.lua
index f61eed6e..e3a210cc 100644
--- a/service/gate.lua
+++ b/service/gate.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 local gateserver = require "snax.gateserver"
-local netpack = require "netpack"
+local netpack = require "skynet.netpack"
 
 local watchdog
 local connection = {}	-- fd -> connection : { fd , client, agent , ip, mode }
diff --git a/service/multicastd.lua b/service/multicastd.lua
index 7f8506af..bcc5ea97 100644
--- a/service/multicastd.lua
+++ b/service/multicastd.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local mc = require "multicast.core"
-local datacenter = require "datacenter"
+local mc = require "skynet.multicast.core"
+local datacenter = require "skynet.datacenter"
 
 local harbor_id = skynet.harbor(skynet.self())
 
diff --git a/service/sharedatad.lua b/service/sharedatad.lua
index 9888216b..3877ec39 100644
--- a/service/sharedatad.lua
+++ b/service/sharedatad.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local sharedata = require "sharedata.corelib"
+local sharedata = require "skynet.sharedata.corelib"
 local table = table
 local cache = require "skynet.codecache"
 cache.mode "OFF"	-- turn off codecache, because CMD.new may load data file
diff --git a/service/snaxd.lua b/service/snaxd.lua
index 429d6876..4c9e98f9 100644
--- a/service/snaxd.lua
+++ b/service/snaxd.lua
@@ -1,7 +1,7 @@
 local skynet = require "skynet"
 local c = require "skynet.core"
 local snax_interface = require "snax.interface"
-local profile = require "profile"
+local profile = require "skynet.profile"
 local snax = require "snax"
 
 local snax_name = tostring(...)
diff --git a/test/testcoroutine.lua b/test/testcoroutine.lua
index 5a698575..910bcc0f 100644
--- a/test/testcoroutine.lua
+++ b/test/testcoroutine.lua
@@ -1,7 +1,7 @@
 local skynet = require "skynet"
 -- You should use skynet.coroutine instead of origin coroutine in skynet
 local coroutine = require "skynet.coroutine"
-local profile = require "profile"
+local profile = require "skynet.profile"
 
 local function status(co)
 	repeat
diff --git a/test/testdatacenter.lua b/test/testdatacenter.lua
index 194d2219..44eb3875 100644
--- a/test/testdatacenter.lua
+++ b/test/testdatacenter.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local datacenter = require "datacenter"
+local datacenter = require "skynet.datacenter"
 
 local function f1()
 	print("====1==== wait hello")
diff --git a/test/testmulticast.lua b/test/testmulticast.lua
index 8f084abf..21303457 100644
--- a/test/testmulticast.lua
+++ b/test/testmulticast.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local mc = require "multicast"
-local dc = require "datacenter"
+local mc = require "skynet.multicast"
+local dc = require "skynet.datacenter"
 
 local mode = ...
 
diff --git a/test/testmulticast2.lua b/test/testmulticast2.lua
index ff1342c2..545b83f5 100644
--- a/test/testmulticast2.lua
+++ b/test/testmulticast2.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local dc = require "datacenter"
-local mc = require "multicast"
+local dc = require "skynet.datacenter"
+local mc = require "skynet.multicast"
 
 skynet.start(function()
 	print("remote start")
diff --git a/test/testsha.lua b/test/testsha.lua
index d0ed1997..3be749ae 100644
--- a/test/testsha.lua
+++ b/test/testsha.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local crypt = require "crypt"
+local crypt = require "skynet.crypt"
 
 local function sha1(text)
 	local c = crypt.sha1(text)
diff --git a/test/testsm.lua b/test/testsm.lua
index 626952f8..bcc369d1 100644
--- a/test/testsm.lua
+++ b/test/testsm.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local sharemap = require "sharemap"
+local sharemap = require "skynet.sharemap"
 
 local mode = ...
 
diff --git a/test/teststm.lua b/test/teststm.lua
index 7416a9f2..1d834b35 100644
--- a/test/teststm.lua
+++ b/test/teststm.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local stm = require "stm"
+local stm = require "skynet.stm"
 
 local mode = ...