hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some tweaks to lib/std.c for win32

Browse Source
This commit is contained in:
hyunghwan.chung 2019-10-10 06:30:04 +00:00
parent 910a83096e
commit af9a1ddf1b
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
moo/lib/std.c
View File

@ -2228,11 +2228,13 @@ kqueue_syserr:
#endif #endif
} }
static int open_pipe (moo_t* moo, int p[2]) static int open_pipes (moo_t* moo, int p[2])
{ {
int flags; int flags;
#if defined(HAVE_PIPE2) && defined(O_CLOEXEC) && defined(O_NONBLOCK) #if defined(_WIN32)
if (_pipe(p, 256, _O_BINARY) == -1)
#elif defined(HAVE_PIPE2) && defined(O_CLOEXEC) && defined(O_NONBLOCK)
if (pipe2(p, O_CLOEXEC | O_NONBLOCK) == -1) if (pipe2(p, O_CLOEXEC | O_NONBLOCK) == -1)
#else #else
if (pipe(p) == -1) if (pipe(p) == -1)
@ -2261,6 +2263,18 @@ static int open_pipe (moo_t* moo, int p[2])
return 0; return 0;
} }
static int close_pipes (moo_t* moo, int p[2])
{
#if defined(_WIN32)
_close (p[0]);
_close (p[1]);
#else
close (p[0]);
close (p[1]);
#endif
p[0] = -1;
p[1] = -1;
}
static int vm_startup (moo_t* moo) static int vm_startup (moo_t* moo)
{ {
@ -2335,11 +2349,11 @@ static int vm_startup (moo_t* moo)
MUTEX_INIT (&xtn->ev.reg.smtx); MUTEX_INIT (&xtn->ev.reg.smtx);
#endif /* USE_DEVPOLL */ #endif /* USE_DEVPOLL */
if (open_pipe(moo, xtn->sigfd.p) <= -1) goto oops; if (open_pipes(moo, xtn->sigfd.p) <= -1) goto oops;
sigfd_pcount = 2; sigfd_pcount = 2;
#if defined(USE_THREAD) #if defined(USE_THREAD)
if (open_pipe(moo, xtn->iothr.p) <= -1) goto oops; if (open_pipes(moo, xtn->iothr.p) <= -1) goto oops;
iothr_pcount = 2; iothr_pcount = 2;
if (_add_poll_fd(moo, xtn->iothr.p[0], XPOLLIN) <= -1) goto oops; if (_add_poll_fd(moo, xtn->iothr.p[0], XPOLLIN) <= -1) goto oops;
@ -2412,12 +2426,10 @@ static void vm_cleanup (moo_t* moo)
pthread_mutex_destroy (&xtn->ev.mtx); pthread_mutex_destroy (&xtn->ev.mtx);
_del_poll_fd (moo, xtn->iothr.p[0]); _del_poll_fd (moo, xtn->iothr.p[0]);
close (xtn->iothr.p[1]); close_pipes (moo, xtn->iothr.p);
close (xtn->iothr.p[0]);
#endif /* USE_THREAD */ #endif /* USE_THREAD */
close (xtn->sigfd.p[1]); close_pipes (moo, xtn->sigfd.p);
close (xtn->sigfd.p[0]);
#if defined(USE_DEVPOLL) #if defined(USE_DEVPOLL)
if (xtn->ep >= 0) if (xtn->ep >= 0)