Merge pull request #647 from cloudwu/module

Module namespace

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)

service/clusterd.lua

@@ -1,7 +1,7 @@
 local skynet = require "skynet"
-local sc = require "socketchannel"
-local socket = require "socket"
-local cluster = require "cluster.core"
+local sc = require "skynet.socketchannel"
+local socket = require "skynet.socket"
+local cluster = require "skynet.cluster.core"
 
 local config_name = skynet.getenv "cluster"
 local node_address = {}

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 = ...

service/cmaster.lua

@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local socket = require "socket"
+local socket = require "skynet.socket"
 
 --[[
 	master manage data :

service/cmemory.lua

@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local memory = require "memory"
+local memory = require "skynet.memory"
 
 memory.dumpinfo()
 --memory.dump()

service/console.lua

@@ -1,6 +1,6 @@
 local skynet = require "skynet"
-local snax   = require "snax"
-local socket = require "socket"
+local snax   = require "skynet.snax"
+local socket = require "skynet.socket"
 
 local function split_cmdline(cmdline)
 	local split = {}

service/cslave.lua

@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local socket = require "socket"
+local socket = require "skynet.socket"
 require "skynet.manager"	-- import skynet.launch, ...
 local table = table
 

service/debug_agent.lua

@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local debugchannel = require "debugchannel"
+local debugchannel = require "skynet.debugchannel"
 
 local CMD = {}
 

service/debug_console.lua

@@ -1,9 +1,9 @@
 local skynet = require "skynet"
 local codecache = require "skynet.codecache"
 local core = require "skynet.core"
-local socket = require "socket"
-local snax = require "snax"
-local memory = require "memory"
+local socket = require "skynet.socket"
+local snax = require "skynet.snax"
+local memory = require "skynet.memory"
 local httpd = require "http.httpd"
 local sockethelper = require "http.sockethelper"
 

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 }

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())
 

service/service_mgr.lua

@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 require "skynet.manager"	-- import skynet.register
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 local cmd = {}
 local service = {}

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

service/snaxd.lua

@@ -1,8 +1,8 @@
 local skynet = require "skynet"
 local c = require "skynet.core"
 local snax_interface = require "snax.interface"
-local profile = require "profile"
-local snax = require "snax"
+local profile = require "skynet.profile"
+local snax = require "skynet.snax"
 
 local snax_name = tostring(...)
 local loaderpath = skynet.getenv"snax_loader"