Skip to content

Run graal_attach_thread ahead of all calls #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KushalP merged 2 commits into from
Jul 21, 2025
Merged

Run graal_attach_thread ahead of all calls #1131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56bd06b
Rename `isolatethread` to `graal_isolatethread`
KushalP Jul 21, 2025
6857c2a
Run `graal_attach_thread` ahead of all calls
KushalP Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 41 additions & 11 deletions libpkl/src/main/c/pkl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,26 @@
#endif

pthread_mutex_t graal_mutex;
graal_isolatethread_t *isolatethread = NULL;
graal_isolatethread_t *graal_isolatethread = NULL;

int pkl_attach_thread() {
graal_isolate_t *graal_isolate = graal_get_isolate(graal_isolatethread);
if (graal_isolate == NULL) {
perror("pkl_attach_thread: couldn't get isolate");
return -1;
}

if (graal_attach_thread(graal_isolate, &graal_isolatethread) != 0) {
perror("pkl_attach_thread: couldn't attach thread");
return -1;
}

return 0;
}

int pkl_init(PklMessageResponseHandler handler, void *userData) {
if (isolatethread != NULL) {
perror("pkl_init: isolatethread is already initialised");
if (graal_isolatethread != NULL) {
perror("pkl_init: graal_isolatethread is already initialised");
return -1;
}

Expand All @@ -46,9 +61,9 @@ int pkl_init(PklMessageResponseHandler handler, void *userData) {
return -1;
}

isolatethread = pkl_internal_init();
pkl_internal_register_response_handler(isolatethread, handler, userData);
pkl_internal_server_start(isolatethread);
graal_isolatethread = pkl_internal_init();
pkl_internal_register_response_handler(graal_isolatethread, handler, userData);
pkl_internal_server_start(graal_isolatethread);
pthread_mutex_unlock(&graal_mutex);

return 0;
Expand All @@ -59,7 +74,12 @@ int pkl_send_message(int length, char *message) {
return -1;
}

pkl_internal_send_message(isolatethread, length, message);
if (pkl_attach_thread() != 0) {
perror("pkl_send_message: couldn't attach thread");
return -1;
}

pkl_internal_send_message(graal_isolatethread, length, message);
pthread_mutex_unlock(&graal_mutex);

return 0;
Expand All @@ -70,9 +90,14 @@ int pkl_close() {
return -1;
}

pkl_internal_server_stop(isolatethread);
pkl_internal_close(isolatethread);
isolatethread = NULL;
if (pkl_attach_thread() != 0) {
perror("pkl_send_message: couldn't attach thread");
return -1;
}

pkl_internal_server_stop(graal_isolatethread);
pkl_internal_close(graal_isolatethread);
graal_isolatethread = NULL;

if (pthread_mutex_unlock(&graal_mutex) != 0) {
return -1;
Expand All @@ -86,5 +111,10 @@ int pkl_close() {
};

char* pkl_version() {
return pkl_internal_version(isolatethread);
if (pkl_attach_thread() != 0) {
perror("pkl_version: couldn't attach thread");
return NULL;
}

return pkl_internal_version(graal_isolatethread);
}