diff --git a/3rd/jemalloc b/3rd/jemalloc index 3541a904..896ed3a8 160000 --- a/3rd/jemalloc +++ b/3rd/jemalloc @@ -1 +1 @@ -Subproject commit 3541a904d6fb949f3f0aea05418ccce7cbd4b705 +Subproject commit 896ed3a8b3f41998d4fb4d625d30ac63ef2d51fb diff --git a/service/cslave.lua b/service/cslave.lua index 452dbaf2..e80439f3 100644 --- a/service/cslave.lua +++ b/service/cslave.lua @@ -260,8 +260,11 @@ skynet.start(function() end end) skynet.wait() + socket.close(slave_fd) + else + -- slave_fd does not start, so use close_fd. + socket.close_fd(slave_fd) end - socket.close(slave_fd) skynet.error("Shakehand ready") skynet.fork(ready) end)