mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-10-06 19:42:29 +00:00
Code Issues 1 Releases Wiki Activity

Add per-thread finalizer calls in missing places.

Browse Source
This commit is contained in:
Calvin Rose
2025-09-01 12:38:11 -05:00
parent 82416e4e4e
commit 095a81286a
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/gc.c
View File

@@ -346,6 +346,9 @@ static void janet_deinit_block(JanetGCObject *mem) {
break;
case JANET_MEMORY_ABSTRACT: {
JanetAbstractHead *head = (JanetAbstractHead *)mem;
if (head->type->gcperthread) {
janet_assert(!head->type->gcperthread(head->data, head->size), "per-thread finalizer failed");
}
if (head->type->gc) {
janet_assert(!head->type->gc(head->data, head->size), "finalizer failed");
}
@@ -498,9 +501,8 @@ void janet_sweep() {
if (!janet_truthy(items[i].value)) {
void *abst = janet_unwrap_abstract(items[i].key);
JanetAbstractHead *head = janet_abstract_head(abst);
/* Optional per-thread finalizer */
if (head->type->gcperthread) {
janet_assert(!head->type->gcperthread(head->data, head->size), "finalizer failed");
janet_assert(!head->type->gcperthread(head->data, head->size), "per-thread finalizer failed");
}
if (0 == janet_abstract_decref(abst)) {
/* Run finalizer */
@@ -676,8 +678,11 @@ void janet_clear_memory(void) {
for (int32_t i = 0; i < janet_vm.threaded_abstracts.capacity; i++) {
if (janet_checktype(items[i].key, JANET_ABSTRACT)) {
void *abst = janet_unwrap_abstract(items[i].key);
JanetAbstractHead *head = janet_abstract_head(abst);
if (head->type->gcperthread) {
janet_assert(!head->type->gcperthread(head->data, head->size), "per-thread finalizer failed");
}
if (0 == janet_abstract_decref(abst)) {
JanetAbstractHead *head = janet_abstract_head(abst);
if (head->type->gc) {
janet_assert(!head->type->gc(head->data, head->size), "finalizer failed");
}

12
src/core/vm.c
View File

@@ -1677,6 +1677,12 @@ void janet_sandbox_assert(uint32_t forbidden_flags) {
/* Clear all memory associated with the VM */
void janet_deinit(void) {
#ifdef JANET_NET
janet_net_deinit();
#endif
#ifdef JANET_EV
janet_ev_deinit();
#endif
janet_clear_memory();
janet_symcache_deinit();
janet_free(janet_vm.roots);
@@ -1692,10 +1698,4 @@ void janet_deinit(void) {
janet_vm.root_fiber = NULL;
janet_free(janet_vm.registry);
janet_vm.registry = NULL;
#ifdef JANET_EV
janet_ev_deinit();
#endif
#ifdef JANET_NET
janet_net_deinit();
#endif
}

2
test/suite-ev2.janet
View File

@@ -49,7 +49,7 @@
(while true
(def item (ev/take thread-channel))
(when (= item :deadline)
(ev/deadline 0.1 nil (fiber/current) true))))
(ev/deadline 0.1))))
(ev/thread worker nil :n super)
(ev/give thread-channel :deadline)
(ev/sleep 0.2)