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

simplified vm_startup() and vm_cleanup() in main.c

Browse Source 
used qse_seterrwithsyserr() in mod/stdio.c
This commit is contained in:
hyunghwan.chung 2018-11-01 14:04:48 +00:00
parent ae06fb7b8b
commit 5580b1abc2
3 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
moo/lib/main.c
View File

@ -1447,15 +1447,13 @@ static int _mod_poll_fd (moo_t* moo, int fd, int event_mask)
static int vm_startup (moo_t* moo) static int vm_startup (moo_t* moo)
{ {
#if defined(_WIN32)
xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
xtn->waitable_timer = CreateWaitableTimer(MOO_NULL, TRUE, MOO_NULL);
#else
xtn_t* xtn = (xtn_t*)moo_getxtn(moo); xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
int pcount = 0, flag; int pcount = 0, flag;
#if defined(_WIN32)
xtn->waitable_timer = CreateWaitableTimer(MOO_NULL, TRUE, MOO_NULL);
#endif
#if defined(USE_DEVPOLL) #if defined(USE_DEVPOLL)
xtn->ep = open ("/dev/poll", O_RDWR); xtn->ep = open ("/dev/poll", O_RDWR);
if (xtn->ep == -1) if (xtn->ep == -1)
@ -1557,22 +1555,21 @@ oops:
#endif #endif
return -1; return -1;
#endif
} }
static void vm_cleanup (moo_t* moo) static void vm_cleanup (moo_t* moo)
{ {
#if defined(_WIN32)
xtn_t* xtn = (xtn_t*)moo_getxtn(moo); xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
xtn->vm_running = 0;
#if defined(_WIN32)
if (xtn->waitable_timer) if (xtn->waitable_timer)
{ {
CloseHandle (xtn->waitable_timer); CloseHandle (xtn->waitable_timer);
xtn->waitable_timer = MOO_NULL; xtn->waitable_timer = MOO_NULL;
} }
#else #endif
xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
xtn->vm_running = 0;
#if defined(USE_THREAD) #if defined(USE_THREAD)
if (xtn->iothr_up) if (xtn->iothr_up)
@ -1626,8 +1623,6 @@ static void vm_cleanup (moo_t* moo)
xtn->ev.reg.maxfd = -1; xtn->ev.reg.maxfd = -1;
MUTEX_DESTROY (&xtn->ev.reg.smtx); MUTEX_DESTROY (&xtn->ev.reg.smtx);
#endif #endif
#endif
} }
static void vm_gettime (moo_t* moo, moo_ntime_t* now) static void vm_gettime (moo_t* moo, moo_ntime_t* now)
@ -1646,7 +1641,7 @@ static void vm_gettime (moo_t* moo, moo_ntime_t* now)
if (msec < xtn->tc_last) if (msec < xtn->tc_last)
{ {
/* i assume the difference is never bigger than 49.7 days */ /* i assume the difference is never bigger than 49.7 days */
//diff = (MOO_TYPE_MAX(DWORD) - xtn->tc_last) + 1 + msec; /*diff = (MOO_TYPE_MAX(DWORD) - xtn->tc_last) + 1 + msec;*/
xtn->tc_overflow++; xtn->tc_overflow++;
bigmsec = ((moo_uint64_t)MOO_TYPE_MAX(DWORD) * xtn->tc_overflow) + msec; bigmsec = ((moo_uint64_t)MOO_TYPE_MAX(DWORD) * xtn->tc_overflow) + msec;
} }

21
moo/lib/poll-msw.c
View File

@ -278,11 +278,8 @@ restart:
{ {
int sought = pfd[i].events; int sought = pfd[i].events;
pfd[i].revents = 0; pfd[i].revents = 0;
if (pfd[i].fd < 0) if (pfd[i].fd < 0) continue;
continue; if (!(sought & (POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM | POLLWRBAND | POLLPRI | POLLRDBAND))) continue;
if (!(sought & (POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM | POLLWRBAND
| POLLPRI | POLLRDBAND)))
continue;
h = (HANDLE)_get_osfhandle (pfd[i].fd); h = (HANDLE)_get_osfhandle (pfd[i].fd);
if (IsSocketHandle (h)) if (IsSocketHandle (h))
@ -316,14 +313,12 @@ restart:
a character is available. windows_compute_revents eliminates a character is available. windows_compute_revents eliminates
bits for the "wrong" direction. */ bits for the "wrong" direction. */
pfd[i].revents = windows_compute_revents (h, &sought); pfd[i].revents = windows_compute_revents (h, &sought);
if (sought) if (sought) handle_array[nhandles++] = h;
handle_array[nhandles++] = h; if (pfd[i].revents) timeout = 0;
if (pfd[i].revents)
timeout = 0;
} }
} }
if (select (0, &rfds, &wfds, &xfds, &tv0) > 0) if (select(0, &rfds, &wfds, &xfds, &tv0) > 0)
{ {
/* Do MsgWaitForMultipleObjects anyway to dispatch messages, but /* Do MsgWaitForMultipleObjects anyway to dispatch messages, but
no need to call select again. */ no need to call select again. */
@ -341,8 +336,7 @@ restart:
for (;;) for (;;)
{ {
ret = MsgWaitForMultipleObjects (nhandles, handle_array, FALSE, ret = MsgWaitForMultipleObjects(nhandles, handle_array, FALSE, wait_timeout, QS_ALLINPUT);
wait_timeout, QS_ALLINPUT);
if (ret == WAIT_OBJECT_0 + nhandles) if (ret == WAIT_OBJECT_0 + nhandles)
{ {
@ -370,8 +364,7 @@ restart:
if (pfd[i].fd < 0) if (pfd[i].fd < 0)
continue; continue;
if (!(pfd[i].events & (POLLIN | POLLRDNORM | if (!(pfd[i].events & (POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM | POLLWRBAND)))
POLLOUT | POLLWRNORM | POLLWRBAND)))
continue; continue;
h = (HANDLE) _get_osfhandle (pfd[i].fd); h = (HANDLE) _get_osfhandle (pfd[i].fd);

6
moo/mod/stdio.c
View File

@ -75,7 +75,7 @@ static moo_pfrc_t pf_open (moo_t* moo, moo_mod_t* mod, moo_ooi_t nargs)
#endif #endif
if (!stdio->fp) if (!stdio->fp)
{ {
moo_seterrnum (moo, moo_syserr_to_errnum(errno)); moo_seterrwithsyserr (moo, errno);
goto softfail; goto softfail;
} }
@ -157,7 +157,7 @@ static moo_pfrc_t __pf_puts (moo_t* moo, moo_ooi_t nargs, moo_oow_t limit)
if (fwrite (bcs, 1, bcslen, stdio->fp) < bcslen) if (fwrite (bcs, 1, bcslen, stdio->fp) < bcslen)
{ {
moo_seterrnum (moo, moo_syserr_to_errnum(errno)); moo_seterrwithsyserr (moo, errno);
goto softfail; goto softfail;
} }
@ -169,7 +169,7 @@ static moo_pfrc_t __pf_puts (moo_t* moo, moo_ooi_t nargs, moo_oow_t limit)
puts_string: puts_string:
if (fwrite (x->slot, 1, MOO_OBJ_GET_SIZE(x), stdio->fp) < MOO_OBJ_GET_SIZE(x)) if (fwrite (x->slot, 1, MOO_OBJ_GET_SIZE(x), stdio->fp) < MOO_OBJ_GET_SIZE(x))
{ {
moo_seterrnum (moo, moo_syserr_to_errnum(errno)); moo_seterrwithsyserr (moo, errno);
goto softfail; goto softfail;
} }
#endif #endif