mirror of
https://github.com/janet-lang/janet
synced 2024-11-28 19:19:53 +00:00
Work on moving to mailbox abstraction.
Should be more efficient in the common case.
This commit is contained in:
Calvin Rose
parent
0e690b4fa0
commit
73f5314141
@ -31,19 +31,114 @@
|
||||
|
||||
#include <setjmp.h>
|
||||
#include <time.h>
|
||||
#include <pthread.h>
|
||||
|
||||
static JANET_THREAD_LOCAL JanetThreadSelector janet_vm_thread_selector;
|
||||
/* Global data */
|
||||
static pthread_rwlock_t janet_g_lock = PTHREAD_RWLOCK_INITIALIZER;
|
||||
static JanetMailbox **janet_g_mailboxes = NULL;
|
||||
static size_t janet_g_mailboxes_cap = 0;
|
||||
static size_t janet_g_mailboxes_count = 0;
|
||||
static uint64_t janet_g_next_mailbox_id = 0;
|
||||
|
||||
/* typedefed in janet.h */
|
||||
struct JanetMailbox {
|
||||
pthread_mutex_t lock;
|
||||
pthread_cond_t cond;
|
||||
uint64_t id;
|
||||
JanetBuffer buf;
|
||||
int refCount;
|
||||
int closed;
|
||||
};
|
||||
|
||||
static JANET_THREAD_LOCAL JanetMailbox *janet_vm_mailbox;
|
||||
|
||||
void janet_threads_init(void) {
|
||||
pthread_mutex_init(&janet_vm_thread_selector.mutex, NULL);
|
||||
pthread_cond_init(&janet_vm_thread_selector.cond, NULL);
|
||||
janet_vm_thread_selector.channel = NULL;
|
||||
janet_vm_mailbox = malloc(sizeof(JanetMailbox));
|
||||
if (NULL == janet_vm_mailbox) {
|
||||
JANET_OUT_OF_MEMORY;
|
||||
}
|
||||
pthread_mutex_init(&janet_vm_mailbox->lock, NULL);
|
||||
pthread_cond_init(&janet_vm_mailbox->cond, NULL);
|
||||
janet_buffer_init(&janet_vm_mailbox->buf, 1024);
|
||||
janet_vm_mailbox->refcount = 1;
|
||||
janet_vm_mailbox->closed = 0;
|
||||
|
||||
/* Add mailbox to global table */
|
||||
pthread_rwlock_wrlock(&janet_janet_lock);
|
||||
janet_vm_mailbox->id = janet_g_next_mailbox_id++;
|
||||
size_t newcount = janet_g_mailboxes_count + 1;
|
||||
if (janet_g_mailboxes_cap < newcount) {
|
||||
size_t newcap = newcount * 2;
|
||||
JanetMailbox **mailboxes = realloc(janet_g_mailboxes, newcap * sizeof(JanetMailbox *));
|
||||
if (NULL == mailboxes) {
|
||||
pthread_rwlock_unlock(&janet_janet_lock);
|
||||
/* this maybe should be a different error, as this basically means
|
||||
* we cannot create a new thread. So janet_init should probably fail. */
|
||||
JANET_OUT_OF_MEMORY;
|
||||
return;
|
||||
}
|
||||
janet_g_mailboxes = mailboxes;
|
||||
janet_g_mailboxes_cap = newcap;
|
||||
}
|
||||
janet_g_mailboxes[janet_g_mailboxes_count] = janet_vm_mailbox;
|
||||
janet_g_mailboxes_count = newcount;
|
||||
pthread_rwlock_unlock(&janet_janet_lock);
|
||||
}
|
||||
|
||||
static void janet_mailbox_ref(JanetMailbox *mailbox) {
|
||||
pthread_mutex_lock(&mailbox->lock);
|
||||
mailbox->refCount++;
|
||||
pthread_mutex_unlock(&mailbox->lock);
|
||||
}
|
||||
|
||||
static JanetMailbox *janet_find_mailbox(uint64_t id, int remove) {
|
||||
JanetMailbox *ret = NULL;
|
||||
if (remove) {
|
||||
pthread_rwlock_wrlock(&janet_janet_lock);
|
||||
} else {
|
||||
pthread_rwlock_rdlock(&janet_janet_lock);
|
||||
}
|
||||
size_t i = 0;
|
||||
while (i < janet_g_mailboxes_count && janet_g_mailboxes[i]->id != mailbox->id)
|
||||
i++;
|
||||
if (i < janet_g_mailboxes_count) {
|
||||
ret = janet_g_mailboxes[i];
|
||||
if (remove) {
|
||||
janet_g_mailboxes[i] = janet_g_mailboxes[--janet_g_mailboxes_count];
|
||||
}
|
||||
}
|
||||
pthread_rwlock_unlock(&janet_janet_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Assumes you have the mailbox lock already */
|
||||
static void janet_mailbox_deref_with_lock(JanetMailbox *mailbox) {
|
||||
if (mailbox->refCount <= 1) {
|
||||
/* We are the last reference */
|
||||
pthread_mutex_destroy(&mailbox->lock);
|
||||
pthread_mutex_destroy(&mailbox->cond);
|
||||
janet_buffer_deinit(&mailbox->buf);
|
||||
janet_find_mailbox(mailbox->id, 1);
|
||||
free(mailbox);
|
||||
} else {
|
||||
/* There are other references */
|
||||
if (mailbox == janet_vm_mailbox) {
|
||||
/* We own this mailbox, so mark it as closed for other references. */
|
||||
mailbox->closed = 1;
|
||||
}
|
||||
janet_vm_mailbox->refCount--;
|
||||
pthread_mutex_unlock(&mailbox->lock);
|
||||
}
|
||||
}
|
||||
|
||||
static void janet_mailbox_deref(JanetMailbox *mailbox) {
|
||||
pthread_mutex_lock(&mailbox->lock);
|
||||
janet_mailbox_deref_with_lock(mailbox);
|
||||
}
|
||||
|
||||
void janet_threads_deinit(void) {
|
||||
pthread_mutex_destroy(&janet_vm_thread_selector.mutex);
|
||||
pthread_cond_destroy(&janet_vm_thread_selector.cond);
|
||||
janet_vm_thread_selector.channel = NULL;
|
||||
janet_mailbox_deref(janet_vm_mailbox);
|
||||
janet_vm_mailbox = NULL;
|
||||
}
|
||||
|
||||
static JanetTable *janet_get_core_table(const char *name) {
|
||||
@ -55,41 +150,10 @@ static JanetTable *janet_get_core_table(const char *name) {
|
||||
return janet_unwrap_table(out);
|
||||
}
|
||||
|
||||
static void janet_channel_init(JanetChannel *channel) {
|
||||
janet_buffer_init(&channel->buf, 0);
|
||||
pthread_mutex_init(&channel->lock, NULL);
|
||||
channel->selector = NULL;
|
||||
channel->refCount = 2;
|
||||
channel->encode = NULL;
|
||||
channel->decode = NULL;
|
||||
}
|
||||
|
||||
/* Return 1 if channel memory should be freed, otherwise 0 */
|
||||
static int janet_channel_deref(JanetChannel *channel) {
|
||||
pthread_mutex_lock(&channel->lock);
|
||||
if (1 == channel->refCount) {
|
||||
janet_buffer_deinit(&channel->buf);
|
||||
pthread_mutex_destroy(&channel->lock);
|
||||
return 1;
|
||||
} else {
|
||||
channel->refCount--;
|
||||
pthread_mutex_unlock(&channel->lock);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void janet_close_thread(JanetThread *thread) {
|
||||
if (NULL != thread->rx) {
|
||||
JanetChannel *rx = thread->rx;
|
||||
JanetChannel *tx = thread->tx;
|
||||
/* Deref both. The reference counts should be in sync. */
|
||||
janet_channel_deref(rx);
|
||||
if (janet_channel_deref(tx)) {
|
||||
/* tx and rx were allocated together. free the one with the lower address. */
|
||||
free(rx < tx ? rx : tx);
|
||||
}
|
||||
thread->rx = NULL;
|
||||
thread->tx = NULL;
|
||||
if (thread->mailbox) {
|
||||
janet_mailbox_deref(thread->mailbox);
|
||||
thread->mailbox = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@ -102,45 +166,41 @@ static int thread_gc(void *p, size_t size) {
|
||||
|
||||
static int thread_mark(void *p, size_t size) {
|
||||
JanetThread *thread = (JanetThread *)p;
|
||||
(void) size;
|
||||
JanetChannel *rx = thread->rx;
|
||||
JanetChannel *tx = thread->tx;
|
||||
if (tx && tx->encode) {
|
||||
janet_mark(janet_wrap_table(tx->encode));
|
||||
}
|
||||
if (rx && rx->encode) {
|
||||
janet_mark(janet_wrap_table(rx->decode));
|
||||
if (thread->encode) {
|
||||
janet_mark(janet_wrap_table(thread->encode));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Returns 1 if could not send, but do not panic or block (for long). */
|
||||
static int janet_channel_send(JanetChannel *tx, Janet msg) {
|
||||
JanetThreadSelector *selector = tx->selector;
|
||||
/* Returns 1 if could not send (encode error), 2 for mailbox closed, and
|
||||
* 0 otherwise. Will not panic. */
|
||||
int janet_thread_send(JanetThread *thread, Janet msg) {
|
||||
|
||||
/* Check for closed channel */
|
||||
if (tx->refCount <= 1) return 1;
|
||||
/* Ensure mailbox is not closed. */
|
||||
JanetMailbox *mailbox = thread->mailbox;
|
||||
if (NULL == mailbox) return 2;
|
||||
pthread_mutex_lock(mailbox->lock);
|
||||
if (mailbox->closed) {
|
||||
janet_mailbox_deref_with_lock(mailbox);
|
||||
thread->mailbox == NULL;
|
||||
return 2;
|
||||
}
|
||||
|
||||
/* Hack to capture all panics from marshalling. This works because
|
||||
* we know janet_marshal won't mess with other essential global state. */
|
||||
jmp_buf buf;
|
||||
jmp_buf *old_buf = janet_vm_jmp_buf;
|
||||
janet_vm_jmp_buf = &buf;
|
||||
int32_t oldcount = tx->buf.count;
|
||||
int32_t oldcount = mailbox->buf.count;
|
||||
|
||||
int ret = 0;
|
||||
if (setjmp(buf)) {
|
||||
ret = 1;
|
||||
tx->buf.count = oldcount;
|
||||
mailbox->buf.count = oldcount;
|
||||
} else {
|
||||
janet_marshal(&tx->buf, msg, tx->encode, 0);
|
||||
if (selector) {
|
||||
pthread_mutex_lock(&selector->mutex);
|
||||
if (!selector->channel) {
|
||||
selector->channel = tx;
|
||||
pthread_cond_signal(&selector->cond);
|
||||
}
|
||||
pthread_mutex_unlock(&selector->mutex);
|
||||
janet_marshal(&mailbox->buf, msg, thread->encode, 0);
|
||||
if (oldcount == 0) {
|
||||
pthread_cond_signal(&mailbox->cond);
|
||||
}
|
||||
}
|
||||
|
||||
@ -150,55 +210,6 @@ static int janet_channel_send(JanetChannel *tx, Janet msg) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Returns 0 on successful message.
|
||||
* Returns 1 if nothing in queue or failed to get item. In this case,
|
||||
* also sets the channel's selector value.
|
||||
* Returns 2 if channel closed.
|
||||
* Does not block (for long) or panic, and sets the channel's selector
|
||||
* . */
|
||||
static int janet_channel_receive(JanetChannel *rx, Janet *msg_out) {
|
||||
|
||||
/* Check for no messages */
|
||||
while (rx->buf.count == 0) {
|
||||
int is_dead = rx->refCount <= 1;
|
||||
rx->selector = &janet_vm_thread_selector;
|
||||
return is_dead ? 2 : 1;
|
||||
}
|
||||
|
||||
/* Hack to capture all panics from marshalling. This works because
|
||||
* we know janet_marshal won't mess with other essential global state. */
|
||||
jmp_buf buf;
|
||||
jmp_buf *old_buf = janet_vm_jmp_buf;
|
||||
janet_vm_jmp_buf = &buf;
|
||||
|
||||
/* Handle errors */
|
||||
int ret = 0;
|
||||
if (setjmp(buf)) {
|
||||
rx->buf.count = 0;
|
||||
rx->selector = &janet_vm_thread_selector;
|
||||
ret = 1;
|
||||
} else {
|
||||
/* Read from beginning of channel */
|
||||
const uint8_t *nextItem = NULL;
|
||||
Janet item = janet_unmarshal(rx->buf.data, rx->buf.count,
|
||||
0, rx->decode, &nextItem);
|
||||
|
||||
/* Update memory and put result into *msg_out */
|
||||
int32_t chunkCount = nextItem - rx->buf.data;
|
||||
memmove(rx->buf.data, nextItem, rx->buf.count - chunkCount);
|
||||
rx->buf.count -= chunkCount;
|
||||
*msg_out = item;
|
||||
|
||||
/* Got message, unset selector */
|
||||
rx->selector = NULL;
|
||||
}
|
||||
|
||||
/* Cleanup */
|
||||
janet_vm_jmp_buf = old_buf;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Convert an interval from now in an absolute timespec */
|
||||
static void janet_sec2ts(double sec, struct timespec *ts) {
|
||||
struct timespec now;
|
||||
@ -215,87 +226,73 @@ static void janet_sec2ts(double sec, struct timespec *ts) {
|
||||
ts->tv_nsec = tvnsec;
|
||||
}
|
||||
|
||||
/* Get a message from one of the channels given. */
|
||||
static int janet_channel_select(int32_t n, JanetChannel **rxs, Janet *msg_out, double wait) {
|
||||
int32_t maxChannel = -1;
|
||||
int result = -1;
|
||||
while (result < 0) {
|
||||
janet_vm_thread_selector.channel = NULL;
|
||||
/* Returns 0 on successful message.
|
||||
* Returns 1 if nothing in queue or failed to get item. In this case,
|
||||
* also sets the channel's selector value.
|
||||
* Returns 2 if channel closed.
|
||||
* . */
|
||||
int janet_thread_receive(Janet *msg_out, double timeout, JanetTable *decode) {
|
||||
pthread_mutex_lock(&janet_vm_mailbox->lock);
|
||||
|
||||
/* Try each channel, first without acquiring locks and looking
|
||||
* only for existing messages, then with acquiring
|
||||
* locks, which will not miss messages. If both fail, we also
|
||||
* set the selector for each thread. */
|
||||
for (int trylock = 1; trylock >= 0 && result < 0; trylock--) {
|
||||
for (int32_t i = 0; i < n && result < 0; i++) {
|
||||
JanetChannel *rx = rxs[i];
|
||||
if (trylock) {
|
||||
if (rx->buf.count == 0 || pthread_mutex_trylock(&rx->lock)) continue;
|
||||
} else {
|
||||
pthread_mutex_lock(&rxs[i]->lock);
|
||||
}
|
||||
int status = janet_channel_receive(rxs[i], msg_out);
|
||||
pthread_mutex_unlock(&rxs[i]->lock);
|
||||
if (status == 0) {
|
||||
result = 0;
|
||||
continue;
|
||||
}
|
||||
maxChannel = maxChannel > i ? maxChannel : i;
|
||||
if (status == 2) {
|
||||
/* channel closed and will receive no more messages, drop it */
|
||||
rxs[i] = rxs[--n];
|
||||
--i;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* For timeouts */
|
||||
struct timespec timeout_ts;
|
||||
int timedwait = timeout > 0.0;
|
||||
int nowait = timeout == 0.0;
|
||||
if (timedwait) janet_sec2ts(timeout, &timeout_ts);
|
||||
|
||||
/* All channels closed */
|
||||
if (n == 0) result = 1;
|
||||
for (;;) {
|
||||
|
||||
/* Don't wait for selector if we have a result */
|
||||
if (result >= 0) break;
|
||||
/* Check for messages waiting for use */
|
||||
if (janet_vm_mailbox->buf.count) {
|
||||
/* Hack to capture all panics from marshalling. This works because
|
||||
* we know janet_marshal won't mess with other essential global state. */
|
||||
jmp_buf buf;
|
||||
jmp_buf *old_buf = janet_vm_jmp_buf;
|
||||
janet_vm_jmp_buf = &buf;
|
||||
|
||||
pthread_mutex_lock(&janet_vm_thread_selector.mutex);
|
||||
{
|
||||
int status = 0;
|
||||
/* Wait until we have a channel */
|
||||
if (NULL == janet_vm_thread_selector.channel) {
|
||||
if (wait <= 0.0) {
|
||||
pthread_cond_wait(
|
||||
&janet_vm_thread_selector.cond,
|
||||
&janet_vm_thread_selector.mutex);
|
||||
} else {
|
||||
struct timespec ts;
|
||||
janet_sec2ts(wait, &ts);
|
||||
status = pthread_cond_timedwait(
|
||||
&janet_vm_thread_selector.cond,
|
||||
&janet_vm_thread_selector.mutex,
|
||||
&ts);
|
||||
}
|
||||
}
|
||||
|
||||
/* Timeout? */
|
||||
if (status) {
|
||||
result = 1;
|
||||
/* Handle errors */
|
||||
if (setjmp(buf)) {
|
||||
/* Bad message, so clear buffer and wait for the next */
|
||||
janet_vm_mailbox->buf.count = 0;
|
||||
janet_vm_jmp_buf = old_buf;
|
||||
} else {
|
||||
JanetChannel *rx = janet_vm_thread_selector.channel;
|
||||
int32_t index = 0;
|
||||
while (rxs[index] != rx) index++;
|
||||
rxs[index] = rxs[0];
|
||||
rxs[0] = rx;
|
||||
/* Read from beginning of channel */
|
||||
const uint8_t *nextItem = NULL;
|
||||
Janet item = janet_unmarshal(
|
||||
janet_vm_mailbox->buf.data, janet_vm_mailbox->buf.count,
|
||||
0, rx->decode, &nextItem);
|
||||
|
||||
/* Update memory and put result into *msg_out */
|
||||
int32_t chunkCount = nextItem - janet_vm_mailbox->buf.data;
|
||||
memmove(janet_vm_mailbox->buf.data, nextItem, janet_vm_mailbox->buf.count - chunkCount);
|
||||
janet_vm_mailbox->buf.count -= chunkCount;
|
||||
*msg_out = item;
|
||||
janet_vm_jmp_buf = old_buf;
|
||||
pthread_mutex_unlock(&janet_vm_mailbox->lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
pthread_mutex_unlock(&janet_vm_thread_selector.mutex);
|
||||
|
||||
if (nowait) {
|
||||
pthread_mutex_unlock(&janet_vm_mailbox->lock);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Wait for next message */
|
||||
if (timedwait) {
|
||||
if (pthread_cond_timedwait(
|
||||
&janet_vm_mailbox->cond,
|
||||
&janet_vm_mailbox->mutex,
|
||||
&timeout_ts)) {
|
||||
return 1; /* Timeout */
|
||||
}
|
||||
} else {
|
||||
pthread_cond_wait(
|
||||
&janet_vm_mailbox->cond,
|
||||
&janet_vm_mailbox->mutex);
|
||||
}
|
||||
}
|
||||
|
||||
/* got message, unset selectors and return */
|
||||
for (int32_t j = 0; j <= maxChannel; j++) {
|
||||
pthread_mutex_lock(&rxs[j]->lock);
|
||||
rxs[j]->selector = NULL;
|
||||
pthread_mutex_unlock(&rxs[j]->lock);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static Janet janet_thread_getter(void *p, Janet key);
|
||||
@ -311,12 +308,11 @@ static JanetAbstractType Thread_AT = {
|
||||
NULL
|
||||
};
|
||||
|
||||
static JanetThread *janet_make_thread(JanetChannel *rx, JanetChannel *tx, JanetTable *encode, JanetTable *decode) {
|
||||
static JanetThread *janet_make_thread(JanetMailbox *mailbox, Janet *encode) {
|
||||
JanetThread *thread = janet_abstract(&Thread_AT, sizeof(JanetThread));
|
||||
thread->rx = rx;
|
||||
thread->tx = tx;
|
||||
rx->decode = decode;
|
||||
tx->encode = encode;
|
||||
janet_mailbox_ref(mailbox)
|
||||
thread->mailbox = mailbox;
|
||||
thread->encode = encode;
|
||||
return thread;
|
||||
}
|
||||
|
||||
@ -325,22 +321,23 @@ JanetThread *janet_getthread(const Janet *argv, int32_t n) {
|
||||
}
|
||||
|
||||
/* Runs in new thread */
|
||||
static int thread_worker(JanetChannel *tx) {
|
||||
static int thread_worker(JanetMailbox *mailbox) {
|
||||
/* Init VM */
|
||||
janet_init();
|
||||
|
||||
/* Get dictionaries */
|
||||
JanetTable *decode = janet_get_core_table("load-image-dict");
|
||||
JanetTable *encode = janet_get_core_table("make-image-dict");
|
||||
JanetTable *decode = janet_get_core_table("load-image-dict");
|
||||
|
||||
/* Create self thread */
|
||||
JanetChannel *rx = tx + 1;
|
||||
JanetThread *thread = janet_make_thread(rx, tx, encode, decode);
|
||||
JanetThread *thread = janet_make_thread(mailbox, encode);
|
||||
Janet threadv = janet_wrap_abstract(thread);
|
||||
|
||||
/* Send pointer to current mailbox to parent */
|
||||
|
||||
/* Unmarshal the function */
|
||||
Janet funcv;
|
||||
int status = janet_channel_select(1, &rx, &funcv, -1.0);
|
||||
int status = janet_thread_receive(&funcv, -1.0, decode);
|
||||
if (status) goto error;
|
||||
if (!janet_checktype(funcv, JANET_FUNCTION)) goto error;
|
||||
JanetFunction *func = janet_unwrap_function(funcv);
|
||||
|
||||
@ -944,26 +944,11 @@ struct JanetRNG {
|
||||
|
||||
/* Thread types */
|
||||
#ifdef JANET_THREADS
|
||||
#include <pthread.h>
|
||||
typedef struct JanetThread JanetThread;
|
||||
typedef struct JanetChannel JanetChannel;
|
||||
typedef struct JanetThreadSelector JanetThreadSelector;
|
||||
struct JanetThreadSelector {
|
||||
pthread_mutex_t mutex;
|
||||
pthread_cond_t cond;
|
||||
JanetChannel *channel;
|
||||
};
|
||||
struct JanetChannel {
|
||||
pthread_mutex_t lock;
|
||||
JanetBuffer buf;
|
||||
int refCount;
|
||||
JanetThreadSelector *selector;
|
||||
JanetTable *encode; /* only touched by writers */
|
||||
JanetTable *decode; /* only touched by readers */
|
||||
};
|
||||
typedef struct JanetMailbox JanetMailbox;
|
||||
struct JanetThread {
|
||||
JanetChannel *rx;
|
||||
JanetChannel *tx;
|
||||
JanetMailbox *mailbox;
|
||||
JanetTable *encode;
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user