mirrors
/
janet
mirror of https://github.com/janet-lang/janet
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Fix some merge issues. 

Make everything compile, and test-install pass.
This commit is contained in:
Calvin Rose 2019-12-12 17:14:36 -06:00
parent 36b2f27873
commit 7c2ae45809
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auxbin/jpm
View File

@ -114,7 +114,7 @@
# Detect threads
(def env (fiber/getenv (fiber/current)))
(def threads? (not (not (env 'thread/from-image))))
(def threads? (not (not (env 'thread/new))))
(print "threads " threads?)

12
src/core/thread.c
View File

@ -335,10 +335,6 @@ int janet_thread_receive(Janet *msg_out, double timeout) {
/* Check for messages waiting for us */
if (mailbox->messageCount > 0) {
/* If we were over capacity, receiving a message should
* bring us under capacity. We can therefor wake up pending writers. */
int wasAtCapacity = mailbox_at_capacity(mailbox);
/* 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;
@ -386,7 +382,7 @@ int janet_thread_receive(Janet *msg_out, double timeout) {
}
static Janet janet_thread_getter(void *p, Janet key);
static int janet_thread_getter(void *p, Janet key, Janet *out);
static JanetAbstractType Thread_AT = {
"core/thread",
@ -604,10 +600,10 @@ static const JanetMethod janet_thread_methods[] = {
{NULL, NULL}
};
static Janet janet_thread_getter(void *p, Janet key) {
static int janet_thread_getter(void *p, Janet key, Janet *out) {
(void) p;
if (!janet_checktype(key, JANET_KEYWORD)) janet_panicf("expected keyword method");
return janet_getmethod(janet_unwrap_keyword(key), janet_thread_methods);
if (!janet_checktype(key, JANET_KEYWORD)) return 0;
return janet_getmethod(janet_unwrap_keyword(key), janet_thread_methods, out);
}
static const JanetReg threadlib_cfuns[] = {