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

added /dev/poll interfacing code for solaris

Browse Source 
change rbt.c to align the value pointer on a word boundary to avoid bus error on sparc64
This commit is contained in:
hyunghwan.chung 2017-04-28 14:45:13 +00:00
parent bce77eda6c
commit f69c54c339
6 changed files with 265 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

257
moo/lib/main.c
View File

@ -78,9 +78,25 @@
# endif # endif
# include <unistd.h> # include <unistd.h>
# include <sys/epoll.h>
# include <fcntl.h> # include <fcntl.h>
#if defined(__sun) && defined(__SVR4)
/* solaris */
# include <sys/devpoll.h>
# define USE_DEVPOLL
# define XPOLLIN POLLIN
# define XPOLLOUT POLLOUT
# define XPOLLERR POLLERR
# define XPOLLHUP POLLHUP
#else
# include <sys/epoll.h>
# define USE_EPOLL
# define XPOLLIN EPOLLIN
# define XPOLLOUT EPOLLOUT
# define XPOLLERR EPOLLERR
# define XPOLLHUP EPOLLHUP
#endif
# if defined(USE_THREAD) # if defined(USE_THREAD)
# include <pthread.h> # include <pthread.h>
# include <sched.h> # include <sched.h>
@ -129,7 +145,15 @@ struct xtn_t
#if defined(_WIN32) #if defined(_WIN32)
HANDLE waitable_timer; HANDLE waitable_timer;
#else #else
int ep; /* epoll */
int ep; /* /dev/poll or epoll */
#if defined(USE_DEVPOLL)
struct
{
moo_oow_t capa;
moo_ooi_t* ptr;
} epd;
#endif
#if defined(USE_THREAD) #if defined(USE_THREAD)
int p[2]; /* pipe for signaling */ int p[2]; /* pipe for signaling */
@ -138,7 +162,11 @@ struct xtn_t
int iothr_abort; int iothr_abort;
struct struct
{ {
#if defined(USE_DEVPOLL)
struct pollfd buf[32];
#else
struct epoll_event buf[32]; /*TODO: make it a dynamically allocated memory block depending on the file descriptor added. */ struct epoll_event buf[32]; /*TODO: make it a dynamically allocated memory block depending on the file descriptor added. */
#endif
moo_oow_t len; moo_oow_t len;
pthread_mutex_t mtx; pthread_mutex_t mtx;
pthread_cond_t cnd; pthread_cond_t cnd;
@ -147,7 +175,11 @@ struct xtn_t
#else #else
struct struct
{ {
#if defined(USE_DEVPOLL)
struct pollfd buf[32];
#else
struct epoll_event buf[32]; /*TODO: make it a dynamically allocated memory block depending on the file descriptor added. */ struct epoll_event buf[32]; /*TODO: make it a dynamically allocated memory block depending on the file descriptor added. */
#endif
moo_oow_t len; moo_oow_t len;
} ev; } ev;
#endif #endif
@ -463,8 +495,6 @@ static void* dl_open (moo_t* moo, const moo_ooch_t* name, int flags)
#else #else
/* TODO: support various platforms */ /* TODO: support various platforms */
/* TODO: implemenent this */ /* TODO: implemenent this */
MOO_DEBUG1 (moo, "Dynamic loading not implemented - cannot open %js\n", name); MOO_DEBUG1 (moo, "Dynamic loading not implemented - cannot open %js\n", name);
@ -695,9 +725,20 @@ static void* iothr_main (void* arg)
if (xtn->ev.len <= 0) /* TODO: no mutex needed for this check? */ if (xtn->ev.len <= 0) /* TODO: no mutex needed for this check? */
{ {
int n; int n;
#if defined(USE_DEVPOLL)
struct dvpoll dvp;
#endif
poll_for_event: poll_for_event:
#if defined(USE_DEVPOLL)
dvp.dp_timeout = 10000; /* milliseconds */
dvp.dp_fds = xtn->ev.buf;
dvp.dp_nfds = MOO_COUNTOF(xtn->ev.buf);
n = ioctl (xtn->ep, DP_POLL, &dvp);
#else
n = epoll_wait (xtn->ep, xtn->ev.buf, MOO_COUNTOF(xtn->ev.buf), 10000); n = epoll_wait (xtn->ep, xtn->ev.buf, MOO_COUNTOF(xtn->ev.buf), 10000);
#endif
pthread_mutex_lock (&xtn->ev.mtx); pthread_mutex_lock (&xtn->ev.mtx);
if (n <= -1) if (n <= -1)
@ -746,20 +787,36 @@ static int vm_startup (moo_t* moo)
#else #else
xtn_t* xtn = (xtn_t*)moo_getxtn(moo); xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
#if defined(USE_DEVPOLL)
struct pollfd ev;
#else
struct epoll_event ev; struct epoll_event ev;
#endif /* USE_DEVPOLL */
int pcount = 0, flag; int pcount = 0, flag;
#if defined(EPOLL_CLOEXEC)
xtn->ep = epoll_create1 (EPOLL_CLOEXEC); #if defined(USE_DEVPOLL)
xtn->ep = open ("/dev/poll", O_RDWR);
if (xtn->ep == -1)
{
moo_syserrtoerrnum (errno);
MOO_DEBUG1 (moo, "Cannot create devpoll - %hs\n", strerror(errno));
goto oops;
}
#else #else
#if defined(EPOLL_CLOEXEC)
xtn->ep = epoll_create1 (EPOLL_CLOEXEC);
#else
xtn->ep = epoll_create (1024); xtn->ep = epoll_create (1024);
#endif #endif
if (xtn->ep == -1) if (xtn->ep == -1)
{ {
moo_syserrtoerrnum (errno); moo_syserrtoerrnum (errno);
MOO_DEBUG1 (moo, "Cannot create epoll - %hs\n", strerror(errno)); MOO_DEBUG1 (moo, "Cannot create epoll - %hs\n", strerror(errno));
goto oops; goto oops;
} }
#endif /* USE_DEVPOLL */
#if defined(EPOLL_CLOEXEC) #if defined(EPOLL_CLOEXEC)
/* do nothing */ /* do nothing */
@ -790,7 +847,18 @@ static int vm_startup (moo_t* moo)
if (flag >= 0) fcntl (xtn->p[1], F_SETFL, flag | O_NONBLOCK); if (flag >= 0) fcntl (xtn->p[1], F_SETFL, flag | O_NONBLOCK);
#endif #endif
ev.events = EPOLLIN; #if defined(USE_DEVPOLL)
ev.fd = xtn->p[0];
ev.events = XPOLLIN;
ev.revents = 0;
if (write (xtn->ep, &ev, MOO_SIZEOF(ev)) != MOO_SIZEOF(ev))
{
moo_syserrtoerrnum (errno);
MOO_DEBUG1 (moo, "Cannot add a pipe to devpoll - %hs\n", strerror(errno));
goto oops;
}
#else
ev.events = XPOLLIN;
ev.data.ptr = (void*)MOO_TYPE_MAX(moo_oow_t); ev.data.ptr = (void*)MOO_TYPE_MAX(moo_oow_t);
if (epoll_ctl (xtn->ep, EPOLL_CTL_ADD, xtn->p[0], &ev) == -1) if (epoll_ctl (xtn->ep, EPOLL_CTL_ADD, xtn->p[0], &ev) == -1)
{ {
@ -798,6 +866,7 @@ static int vm_startup (moo_t* moo)
MOO_DEBUG1 (moo, "Cannot add a pipe to epoll - %hs\n", strerror(errno)); MOO_DEBUG1 (moo, "Cannot add a pipe to epoll - %hs\n", strerror(errno));
goto oops; goto oops;
} }
#endif
pthread_mutex_init (&xtn->ev.mtx, MOO_NULL); pthread_mutex_init (&xtn->ev.mtx, MOO_NULL);
pthread_cond_init (&xtn->ev.cnd, MOO_NULL); pthread_cond_init (&xtn->ev.cnd, MOO_NULL);
@ -858,17 +927,35 @@ static void vm_cleanup (moo_t* moo)
if (xtn->ep) if (xtn->ep)
{ {
#if defined(USE_THREAD) #if defined(USE_THREAD)
#if defined(USE_DEVPOLL)
struct pollfd ev;
ev.fd = xtn->p[1];
ev.events = POLLREMOVE;
ev.revents = 0;
write (xtn->ep, &ev, MOO_SIZEOF(ev));
#else
struct epoll_event ev; struct epoll_event ev;
epoll_ctl (xtn->ep, EPOLL_CTL_DEL, xtn->p[1], &ev); epoll_ctl (xtn->ep, EPOLL_CTL_DEL, xtn->p[1], &ev);
#endif
close (xtn->p[1]); close (xtn->p[1]);
close (xtn->p[0]); close (xtn->p[0]);
#endif #endif /* USE_THREAD */
close (xtn->ep); close (xtn->ep);
xtn->ep = -1; xtn->ep = -1;
} }
#if defined(USE_DEVPOLL)
if (xtn->epd.ptr)
{
moo_freemem (moo, xtn->epd.ptr);
xtn->epd.ptr = MOO_NULL;
xtn->epd.capa = 0;
}
#endif
#endif #endif
} }
@ -931,10 +1018,35 @@ static void vm_gettime (moo_t* moo, moo_ntime_t* now)
# endif # endif
#endif #endif
#if defined(USE_DEVPOLL)
static int secure_devpoll_data_space (moo_t* moo, int fd)
{
xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
if (fd >= xtn->epd.capa)
{
moo_oow_t newcapa;
moo_ooi_t* tmp;
newcapa = MOO_ALIGN_POW2 (fd + 1, 256);
tmp = moo_reallocmem (moo, xtn->epd.ptr, newcapa * MOO_SIZEOF(*tmp));
if (!tmp) return -1;
xtn->epd.capa = newcapa;
xtn->epd.ptr = tmp;
}
return 0;
}
#endif
static int _mux_add_or_mod (moo_t* moo, moo_oop_semaphore_t sem, int cmd) static int _mux_add_or_mod (moo_t* moo, moo_oop_semaphore_t sem, int cmd)
{ {
xtn_t* xtn = (xtn_t*)moo_getxtn(moo); xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
#if defined(USE_DEVPOLL)
struct pollfd ev;
#else
struct epoll_event ev; struct epoll_event ev;
#endif
moo_ooi_t mask; moo_ooi_t mask;
MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_index)); MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_index));
@ -942,11 +1054,9 @@ static int _mux_add_or_mod (moo_t* moo, moo_oop_semaphore_t sem, int cmd)
MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_mask)); MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_mask));
mask = MOO_OOP_TO_SMOOI(sem->io_mask); mask = MOO_OOP_TO_SMOOI(sem->io_mask);
ev.events = 0; /*EPOLLET; *//* edge trigger */ ev.events = 0; /*EPOLLET; */ /* TODO: use edge trigger(EPOLLLET)? */
if (mask & MOO_SEMAPHORE_IO_MASK_INPUT) ev.events |= EPOLLIN; /*TODO: define io mask constants... */ if (mask & MOO_SEMAPHORE_IO_MASK_INPUT) ev.events |= XPOLLIN; /* TODO: define io mask constants... */
if (mask & MOO_SEMAPHORE_IO_MASK_OUTPUT) ev.events |= EPOLLOUT; if (mask & MOO_SEMAPHORE_IO_MASK_OUTPUT) ev.events |= XPOLLOUT;
/* don't check MOO_SEMAPHORE_IO_MASK_ERROR and MOO_SEMAPHORE_IO_MASK_HANGUP as it's implicitly enabled by epoll() */
ev.data.ptr = (void*)MOO_OOP_TO_SMOOI(sem->io_index);
if (ev.events == 0) if (ev.events == 0)
{ {
@ -955,41 +1065,107 @@ static int _mux_add_or_mod (moo_t* moo, moo_oop_semaphore_t sem, int cmd)
return -1; return -1;
} }
#if defined(USE_DEVPOLL)
ev.fd = MOO_OOP_TO_SMOOI(sem->io_handle);
ev.revents = 0;
if (secure_devpoll_data_space (moo, ev.fd) <= -1)
{
MOO_DEBUG2 (moo, "<vm_muxadd> devpoll data set failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno));
return -1;
}
if (cmd)
{
int saved_events;
saved_events = ev.events;
ev.events = POLLREMOVE;
if (write (xtn->ep, &ev, MOO_SIZEOF(ev)) != MOO_SIZEOF(ev))
{
moo_seterrnum (moo, moo_syserrtoerrnum (errno));
MOO_DEBUG2 (moo, "<vm_muxadd> devpoll failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno));
return -1;
}
ev.events = saved_events;
}
if (write (xtn->ep, &ev, MOO_SIZEOF(ev)) != MOO_SIZEOF(ev))
{
moo_seterrnum (moo, moo_syserrtoerrnum (errno));
MOO_DEBUG2 (moo, "<vm_muxadd> devpoll failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno));
return -1;
}
MOO_ASSERT (moo, ev.fd == MOO_OOP_TO_SMOOI(sem->io_handle));
MOO_ASSERT (moo, xtn->epd.capa > ev.fd);
xtn->epd.ptr[ev.fd] = MOO_OOP_TO_SMOOI(sem->io_index);
#else
/* don't check MOO_SEMAPHORE_IO_MASK_ERROR and MOO_SEMAPHORE_IO_MASK_HANGUP as it's implicitly enabled by epoll() */
ev.data.ptr = (void*)MOO_OOP_TO_SMOOI(sem->io_index);
if (epoll_ctl (xtn->ep, cmd, MOO_OOP_TO_SMOOI(sem->io_handle), &ev) == -1) if (epoll_ctl (xtn->ep, cmd, MOO_OOP_TO_SMOOI(sem->io_handle), &ev) == -1)
{ {
moo_seterrnum (moo, moo_syserrtoerrnum (errno)); moo_seterrnum (moo, moo_syserrtoerrnum (errno));
MOO_DEBUG2 (moo, "<vm_muxadd> epoll_ctl failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno)); MOO_DEBUG2 (moo, "<vm_muxadd> epoll_ctl failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno));
return -1; return -1;
} }
#endif
return 0; return 0;
} }
static int vm_muxadd (moo_t* moo, moo_oop_semaphore_t sem) static int vm_muxadd (moo_t* moo, moo_oop_semaphore_t sem)
{ {
#if defined(USE_DEVPOLL)
return _mux_add_or_mod (moo, sem, 0);
#else
return _mux_add_or_mod (moo, sem, EPOLL_CTL_ADD); return _mux_add_or_mod (moo, sem, EPOLL_CTL_ADD);
#endif
} }
static int vm_muxmod (moo_t* moo, moo_oop_semaphore_t sem) static int vm_muxmod (moo_t* moo, moo_oop_semaphore_t sem)
{ {
#if defined(USE_DEVPOLL)
return _mux_add_or_mod (moo, sem, 1);
#else
return _mux_add_or_mod (moo, sem, EPOLL_CTL_MOD); return _mux_add_or_mod (moo, sem, EPOLL_CTL_MOD);
#endif
} }
static int vm_muxdel (moo_t* moo, moo_oop_semaphore_t sem) static int vm_muxdel (moo_t* moo, moo_oop_semaphore_t sem)
{ {
xtn_t* xtn = (xtn_t*)moo_getxtn(moo); xtn_t* xtn = (xtn_t*)moo_getxtn(moo);
#if defined(USE_DEVPOLL)
struct pollfd ev;
#else
struct epoll_event ev; struct epoll_event ev;
#endif
MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_index)); MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_index));
MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_handle)); MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_handle));
MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_mask)); MOO_ASSERT (moo, MOO_OOP_IS_SMOOI(sem->io_mask));
#if defined(USE_DEVPOLL)
ev.fd = MOO_OOP_TO_SMOOI(sem->io_handle);
ev.events = POLLREMOVE;
ev.revents = 0;
if (write (xtn->ep, &ev, MOO_SIZEOF(ev)) != MOO_SIZEOF(ev))
{
moo_seterrnum (moo, moo_syserrtoerrnum (errno));
MOO_DEBUG2 (moo, "<vm_muxdel> devpoll failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno));
return -1;
}
#else
if (epoll_ctl (xtn->ep, EPOLL_CTL_DEL, MOO_OOP_TO_SMOOI(sem->io_handle), &ev) == -1) if (epoll_ctl (xtn->ep, EPOLL_CTL_DEL, MOO_OOP_TO_SMOOI(sem->io_handle), &ev) == -1)
{ {
moo_seterrnum (moo, moo_syserrtoerrnum (errno)); moo_seterrnum (moo, moo_syserrtoerrnum (errno));
MOO_DEBUG2 (moo, "<vm_muxdel> epoll_ctl failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno)); MOO_DEBUG2 (moo, "<vm_muxdel> epoll_ctl failure on handle %zd - %hs\n", MOO_OOP_TO_SMOOI(sem->io_handle), strerror(errno));
return -1; return -1;
} }
#endif
return 0; return 0;
} }
@ -1044,7 +1220,11 @@ static void vm_muxwait (moo_t* moo, const moo_ntime_t* dur, moo_vmprim_muxwait_c
{ {
--n; --n;
#if defined(USE_DEVPOLL)
if (xtn->ev.buf[n].fd == xtn->p[0])
#else
if (xtn->ev.buf[n].data.ptr == (void*)MOO_TYPE_MAX(moo_oow_t)) if (xtn->ev.buf[n].data.ptr == (void*)MOO_TYPE_MAX(moo_oow_t))
#endif
{ {
moo_uint8_t u8; moo_uint8_t u8;
while (read (xtn->p[0], &u8, MOO_SIZEOF(u8)) > 0) while (read (xtn->p[0], &u8, MOO_SIZEOF(u8)) > 0)
@ -1055,19 +1235,31 @@ static void vm_muxwait (moo_t* moo, const moo_ntime_t* dur, moo_vmprim_muxwait_c
} }
else if (muxwcb) else if (muxwcb)
{ {
moo_ooi_t mask = 0; int revents;
moo_ooi_t mask;
if (xtn->ev.buf[n].events & EPOLLIN) mask |= MOO_SEMAPHORE_IO_MASK_INPUT; #if defined(USE_DEVPOLL)
if (xtn->ev.buf[n].events & EPOLLOUT) mask |= MOO_SEMAPHORE_IO_MASK_OUTPUT; revents = xtn->ev.buf[n].revents;
if (xtn->ev.buf[n].events & EPOLLERR) mask |= MOO_SEMAPHORE_IO_MASK_ERROR; #else
if (xtn->ev.buf[n].events & EPOLLHUP) mask |= MOO_SEMAPHORE_IO_MASK_HANGUP; revents = xtn->ev.buf[n].events;
#endif
mask = 0;
if (revents & XPOLLIN) mask |= MOO_SEMAPHORE_IO_MASK_INPUT;
if (revents & XPOLLOUT) mask |= MOO_SEMAPHORE_IO_MASK_OUTPUT;
if (revents & XPOLLERR) mask |= MOO_SEMAPHORE_IO_MASK_ERROR;
if (revents & XPOLLHUP) mask |= MOO_SEMAPHORE_IO_MASK_HANGUP;
#if defined(USE_DEVPOLL)
MOO_ASSERT (moo, xtn->epd.capa > xtn->ev.buf[n].fd);
muxwcb (moo, mask, (void*)xtn->epd.ptr[xtn->ev.buf[n].fd]);
#else
muxwcb (moo, mask, xtn->ev.buf[n].data.ptr); muxwcb (moo, mask, xtn->ev.buf[n].data.ptr);
#endif
} }
} }
while (n > 0); while (n > 0);
pthread_mutex_lock (&xtn->ev.mtx); pthread_mutex_lock (&xtn->ev.mtx);
xtn->ev.len = 0; xtn->ev.len = 0;
pthread_cond_signal (&xtn->ev.cnd); pthread_cond_signal (&xtn->ev.cnd);
@ -1095,16 +1287,29 @@ static void vm_muxwait (moo_t* moo, const moo_ntime_t* dur, moo_vmprim_muxwait_c
while (n > 0) while (n > 0)
{ {
int mask; int revents;
moo_ooi_t mask;
--n; --n;
#if defined(USE_DEVPOLL)
revents = xtn->ev.buf[n].revents;
#else
revetns = xtn->ev.buf[n].events;
#endif
mask = 0; mask = 0;
if (xtn->ev.buf[n].events & EPOLLIN) mask |= MOO_SEMAPHORE_IO_MASK_INPUT; /* TODO define constants for IO Mask */ if (revents & XPOLLIN) mask |= MOO_SEMAPHORE_IO_MASK_INPUT; /* TODO define constants for IO Mask */
if (xtn->ev.buf[n].events & EPOLLOUT) mask |= MOO_SEMAPHORE_IO_MASK_OUTPUT; if (revents & XPOLLOUT) mask |= MOO_SEMAPHORE_IO_MASK_OUTPUT;
if (xtn->ev.buf[n].events & EPOLLERR) mask |= MOO_SEMAPHORE_IO_MASK_ERROR; if (revents & XPOLLERR) mask |= MOO_SEMAPHORE_IO_MASK_ERROR;
if (xtn->ev.buf[n].events & EPOLLHUP) mask |= MOO_SEMAPHORE_IO_MASK_HANGUP; if (revents & XPOLLHUP) mask |= MOO_SEMAPHORE_IO_MASK_HANGUP;
#if defined(USE_DEVPOLL)
MOO_ASSERT (moo, xtn->epd.capa > xtn->ev.buf[n].fd);
muxwcb (moo, mask, (void*)xtn->epd.ptr[xtn->ev.buf[n].fd]);
#else
muxwcb (moo, mask, xtn->ev.buf[n].data.ptr); muxwcb (moo, mask, xtn->ev.buf[n].data.ptr);
#endif
} }
xtn->ev.len = 0; xtn->ev.len = 0;

1
moo/lib/moo-cmn.h
View File

@ -57,7 +57,6 @@
# endif # endif
#endif #endif
/* ========================================================================= /* =========================================================================
* PRIMITIVE TYPE DEFINTIONS * PRIMITIVE TYPE DEFINTIONS
* ========================================================================= */ * ========================================================================= */

5
moo/lib/moo.c
View File

@ -447,7 +447,8 @@ moo_mod_data_t* moo_openmod (moo_t* moo, const moo_ooch_t* name, moo_oow_t namel
mdp = (moo_mod_data_t*)MOO_RBT_VPTR(pair); mdp = (moo_mod_data_t*)MOO_RBT_VPTR(pair);
MOO_ASSERT (moo, MOO_SIZEOF(mdp->mod.hints) == MOO_SIZEOF(int)); MOO_ASSERT (moo, MOO_SIZEOF(mdp->mod.hints) == MOO_SIZEOF(int));
*(int*)&mdp->mod.hints = hints; MOO_DEBUG2 (moo, "xxxxxxxxxxxxxxxxxxxxxxxxx %p %d\n", mdp, (int)MOO_IS_ALIGNED_POW2((moo_oow_t)mdp, 8));
mdp->mod.hints = hints;
if (load (moo, &mdp->mod) <= -1) if (load (moo, &mdp->mod) <= -1)
{ {
moo_rbt_delete (&moo->modtab, (moo_ooch_t*)name, namelen); moo_rbt_delete (&moo->modtab, (moo_ooch_t*)name, namelen);
@ -513,7 +514,7 @@ moo_mod_data_t* moo_openmod (moo_t* moo, const moo_ooch_t* name, moo_oow_t namel
mdp = (moo_mod_data_t*)MOO_RBT_VPTR(pair); mdp = (moo_mod_data_t*)MOO_RBT_VPTR(pair);
MOO_ASSERT (moo, MOO_SIZEOF(mdp->mod.hints) == MOO_SIZEOF(int)); MOO_ASSERT (moo, MOO_SIZEOF(mdp->mod.hints) == MOO_SIZEOF(int));
*(int*)&mdp->mod.hints = hints; mdp->mod.hints = hints;
if (load (moo, &mdp->mod) <= -1) if (load (moo, &mdp->mod) <= -1)
{ {
MOO_DEBUG3 (moo, "Module function [%js] returned failure in [%.*js]\n", buf, namelen, name); MOO_DEBUG3 (moo, "Module function [%js] returned failure in [%.*js]\n", buf, namelen, name);

2
moo/lib/moo.h
View File

@ -934,7 +934,7 @@ struct moo_mod_t
{ {
/* input */ /* input */
const moo_ooch_t name[MOO_MOD_NAME_LEN_MAX + 1]; const moo_ooch_t name[MOO_MOD_NAME_LEN_MAX + 1];
const int hints; /* bitwised-ORed of moo_mod_hint_t enumerators */ /*const*/ int hints; /* bitwised-ORed of moo_mod_hint_t enumerators */
/* user-defined data */ /* user-defined data */
moo_mod_import_t import; moo_mod_import_t import;

50
moo/lib/rbt.c
View File

@ -58,68 +58,68 @@
MOO_INLINE moo_rbt_pair_t* moo_rbt_allocpair ( MOO_INLINE moo_rbt_pair_t* moo_rbt_allocpair (
moo_rbt_t* rbt, void* kptr, moo_oow_t klen, void* vptr, moo_oow_t vlen) moo_rbt_t* rbt, void* kptr, moo_oow_t klen, void* vptr, moo_oow_t vlen)
{ {
moo_rbt_pair_t* n; moo_rbt_pair_t* pair;
copier_t kcop = rbt->style->copier[MOO_RBT_KEY]; copier_t kcop = rbt->style->copier[MOO_RBT_KEY];
copier_t vcop = rbt->style->copier[MOO_RBT_VAL]; copier_t vcop = rbt->style->copier[MOO_RBT_VAL];
moo_oow_t as = MOO_SIZEOF(moo_rbt_pair_t); moo_oow_t as = MOO_SIZEOF(moo_rbt_pair_t);
if (kcop == MOO_RBT_COPIER_INLINE) as += KTOB(rbt,klen); if (kcop == MOO_RBT_COPIER_INLINE) as += MOO_ALIGN_POW2(KTOB(rbt,klen), MOO_SIZEOF_VOID_P);
if (vcop == MOO_RBT_COPIER_INLINE) as += VTOB(rbt,vlen); if (vcop == MOO_RBT_COPIER_INLINE) as += VTOB(rbt,vlen);
n = (moo_rbt_pair_t*) MOO_MMGR_ALLOC (rbt->moo->mmgr, as); pair = (moo_rbt_pair_t*) MOO_MMGR_ALLOC (rbt->moo->mmgr, as);
if (n == MOO_NULL) return MOO_NULL; if (pair == MOO_NULL) return MOO_NULL;
n->color = MOO_RBT_RED; pair->color = MOO_RBT_RED;
n->parent = MOO_NULL; pair->parent = MOO_NULL;
n->child[LEFT] = &rbt->xnil; pair->child[LEFT] = &rbt->xnil;
n->child[RIGHT] = &rbt->xnil; pair->child[RIGHT] = &rbt->xnil;
KLEN(n) = klen; KLEN(pair) = klen;
if (kcop == MOO_RBT_COPIER_SIMPLE) if (kcop == MOO_RBT_COPIER_SIMPLE)
{ {
KPTR(n) = kptr; KPTR(pair) = kptr;
} }
else if (kcop == MOO_RBT_COPIER_INLINE) else if (kcop == MOO_RBT_COPIER_INLINE)
{ {
KPTR(n) = n + 1; KPTR(pair) = pair + 1;
if (kptr) MOO_MEMCPY (KPTR(n), kptr, KTOB(rbt,klen)); if (kptr) MOO_MEMCPY (KPTR(pair), kptr, KTOB(rbt,klen));
} }
else else
{ {
KPTR(n) = kcop (rbt, kptr, klen); KPTR(pair) = kcop (rbt, kptr, klen);
if (KPTR(n) == MOO_NULL) if (KPTR(pair) == MOO_NULL)
{ {
MOO_MMGR_FREE (rbt->moo->mmgr, n); MOO_MMGR_FREE (rbt->moo->mmgr, pair);
return MOO_NULL; return MOO_NULL;
} }
} }
VLEN(n) = vlen; VLEN(pair) = vlen;
if (vcop == MOO_RBT_COPIER_SIMPLE) if (vcop == MOO_RBT_COPIER_SIMPLE)
{ {
VPTR(n) = vptr; VPTR(pair) = vptr;
} }
else if (vcop == MOO_RBT_COPIER_INLINE) else if (vcop == MOO_RBT_COPIER_INLINE)
{ {
VPTR(n) = n + 1; VPTR(pair) = pair + 1;
if (kcop == MOO_RBT_COPIER_INLINE) if (kcop == MOO_RBT_COPIER_INLINE)
VPTR(n) = (moo_oob_t*)VPTR(n) + KTOB(rbt,klen); VPTR(pair) = (moo_oob_t*)VPTR(pair) + MOO_ALIGN_POW2(KTOB(rbt,klen), MOO_SIZEOF_VOID_P);
if (vptr) MOO_MEMCPY (VPTR(n), vptr, VTOB(rbt,vlen)); if (vptr) MOO_MEMCPY (VPTR(pair), vptr, VTOB(rbt,vlen));
} }
else else
{ {
VPTR(n) = vcop (rbt, vptr, vlen); VPTR(pair) = vcop (rbt, vptr, vlen);
if (VPTR(n) != MOO_NULL) if (VPTR(pair) != MOO_NULL)
{ {
if (rbt->style->freeer[MOO_RBT_KEY] != MOO_NULL) if (rbt->style->freeer[MOO_RBT_KEY] != MOO_NULL)
rbt->style->freeer[MOO_RBT_KEY] (rbt, KPTR(n), KLEN(n)); rbt->style->freeer[MOO_RBT_KEY] (rbt, KPTR(pair), KLEN(pair));
MOO_MMGR_FREE (rbt->moo->mmgr, n); MOO_MMGR_FREE (rbt->moo->mmgr, pair);
return MOO_NULL; return MOO_NULL;
} }
} }
return n; return pair;
} }
MOO_INLINE void moo_rbt_freepair (moo_rbt_t* rbt, moo_rbt_pair_t* pair) MOO_INLINE void moo_rbt_freepair (moo_rbt_t* rbt, moo_rbt_pair_t* pair)

6
moo/mod/console.c
View File

@ -117,7 +117,8 @@ static moo_pfrc_t pf_open (moo_t* moo, moo_ooi_t nargs)
write (fd, clear, strlen(clear)); write (fd, clear, strlen(clear));
/*write (fd, tparm (cup, wsz.ws_row - 1, 0), strlen(tparm (cup, wsz.ws_row - 1, 0)));*/ /*write (fd, tparm (cup, wsz.ws_row - 1, 0), strlen(tparm (cup, wsz.ws_row - 1, 0)));*/
write (fd, tiparm (cup, 0, 0), strlen(tiparm (cup, 0, 0))); /*write (fd, tiparm (cup, 0, 0), strlen(tiparm (cup, 0, 0)));*/
write (fd, tparm (cup, 0, 0, 0, 0, 0, 0, 0, 0, 0), strlen(tparm (cup, 0, 0, 0, 0, 0, 0, 0, 0, 0)));
} }
#endif #endif
@ -229,7 +230,8 @@ static moo_pfrc_t pf_setcursor (moo_t* moo, moo_ooi_t nargs)
if (!MOO_OOP_IS_SMOOI(x) || !MOO_OOP_IS_SMOOI(y)) goto einval; if (!MOO_OOP_IS_SMOOI(x) || !MOO_OOP_IS_SMOOI(y)) goto einval;
cup = tiparm (con->cup, MOO_OOP_TO_SMOOI(y), MOO_OOP_TO_SMOOI(x)); /*cup = tiparm (con->cup, MOO_OOP_TO_SMOOI(y), MOO_OOP_TO_SMOOI(x));*/
cup = tparm (con->cup, MOO_OOP_TO_SMOOI(y), MOO_OOP_TO_SMOOI(x), 0, 0, 0, 0, 0, 0, 0);
write (con->fd, cup, strlen(cup)); /* TODO: error check */ write (con->fd, cup, strlen(cup)); /* TODO: error check */
MOO_STACK_SETRETTORCV (moo, nargs); MOO_STACK_SETRETTORCV (moo, nargs);