diff --git a/src/handle.c b/src/handle.c index 9180da34..0977a565 100644 --- a/src/handle.c +++ b/src/handle.c @@ -88,13 +88,19 @@ static int luv_is_closing(lua_State* L) { return 1; } +static void luv_handle_free(uv_handle_t* handle); + static void luv_close_cb(uv_handle_t* handle) { lua_State* L; luv_handle_t* data = (luv_handle_t*)handle->data; if (!data) return; L = data->ctx->L; - luv_call_callback(L, data, LUV_CLOSED, 0); - luv_unref_handle(L, data); + if(data->ref > 0) { + luv_call_callback(L, data, LUV_CLOSED, 0); + luv_unref_handle(L, data); + } else { + luv_handle_free(handle); + } } static int luv_close(lua_State* L) { @@ -127,12 +133,13 @@ static void luv_gc_cb(uv_handle_t* handle) { static int luv_handle_gc(lua_State* L) { uv_handle_t** udata = (uv_handle_t**)lua_touserdata(L, 1); uv_handle_t* handle = *udata; + luv_handle_t* data = (luv_handle_t*)handle->data; // Only cleanup if the handle hasn't been cleaned up yet. - if (handle) { + if (data->ref == LUA_NOREF) { if (!uv_is_closing(handle)) { // If the handle is not closed yet, close it first before freeing memory. - uv_close(handle, luv_gc_cb); + uv_close(handle, luv_handle_free); } else { // Otherwise, free the memory right away. @@ -140,6 +147,10 @@ static int luv_handle_gc(lua_State* L) { } // Mark as cleaned up by wiping the dangling pointer. *udata = NULL; + } else { + // os.exit maybe cause gc before close_cb + // use LUA_REFNIL to tell close_cb to free memory. + data->ref = LUA_REFNIL; } return 0; diff --git a/src/lhandle.c b/src/lhandle.c index 92b725a9..1c4cc800 100644 --- a/src/lhandle.c +++ b/src/lhandle.c @@ -104,6 +104,7 @@ static void luv_call_callback(lua_State* L, luv_handle_t* data, luv_callback_id static void luv_unref_handle(lua_State* L, luv_handle_t* data) { luaL_unref(L, LUA_REGISTRYINDEX, data->ref); + data->ref = LUA_NOREF; luaL_unref(L, LUA_REGISTRYINDEX, data->callbacks[0]); luaL_unref(L, LUA_REGISTRYINDEX, data->callbacks[1]); } diff --git a/tests/manual-test-exit.lua b/tests/manual-test-exit.lua index 39db7e6d..90ef23cc 100644 --- a/tests/manual-test-exit.lua +++ b/tests/manual-test-exit.lua @@ -6,17 +6,17 @@ local uv = require('luv') local function setTimeout(callback, ms) - local timer = uv.new_timer() - timer:start(ms, 0, function() - timer:stop() - timer:close() - callback() - end) - return timer + local timer = uv.new_timer() + timer:start(ms, 0, function() + timer:stop() + timer:close() + callback() + end) + return timer end setTimeout(function() - os.exit(5, true) + os.exit(5, true) end, 1000) uv.run()