diff options
| author | ruki <[email protected]> | 2020-02-01 22:27:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-01 22:27:36 +0800 |
| commit | 6da5429082cede5f1ad656e7619c79bd7d16406e (patch) | |
| tree | 49f3714725a5995b34408dd0d6b7657ff4c01888 | |
| parent | 0c98171f212cf5943222d271f81fc7dc87058326 (diff) | |
fix wait for connecting pipe
| m--------- | core/src/tbox/tbox | 0 | ||||
| -rw-r--r-- | xmake/core/base/pipe.lua | 2 | ||||
| -rw-r--r-- | xmake/core/base/scheduler.lua | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox -Subproject 6ae5d2fbc5b1a96f08b459e849034b2a6c4d38c +Subproject 017a3a47719c89cd88d94bd6c22cf8e52307971 diff --git a/xmake/core/base/pipe.lua b/xmake/core/base/pipe.lua index 7a09a6d15..5f3418965 100644 --- a/xmake/core/base/pipe.lua +++ b/xmake/core/base/pipe.lua @@ -32,7 +32,7 @@ local scheduler = require("base/scheduler") -- the pipe events, @see tbox/platform/pipe.h pipe.EV_READ = 1 pipe.EV_WRITE = 2 -pipe.EV_CONN = 4 +pipe.EV_CONN = 2 -- new a pipe file function _instance.new(cdata, name) diff --git a/xmake/core/base/scheduler.lua b/xmake/core/base/scheduler.lua index e7870dbe6..6d966c4bb 100644 --- a/xmake/core/base/scheduler.lua +++ b/xmake/core/base/scheduler.lua @@ -156,6 +156,7 @@ function scheduler:_poller_events_cb(obj, events) local pollerdata = self:_poller_data(obj) assert(pollerdata, string.format("%s: cannot get poller data!", obj)) + -- get poller object events local events_prev_wait = pollerdata.poller_events_wait local events_prev_save = pollerdata.poller_events_save |