Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .vitepress/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"lib": ["es2022", "dom"],
"module": "es2022",
"module": "node16",
"target": "es2022",
"esModuleInterop": true,
"noImplicitAny": true,
Expand Down
21 changes: 18 additions & 3 deletions llama/addon/addon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
#include "globals/getMemoryInfo.h"

#include <atomic>
#include <cstdlib>
#include <mutex>

std::mutex backendMutex;
bool backendInitialized = false;
bool backendDisposed = false;

Expand Down Expand Up @@ -118,6 +121,8 @@ class AddonBackendLoadWorker : public Napi::AsyncWorker {

void Execute() {
try {
std::lock_guard<std::mutex> lock(backendMutex);

llama_backend_init();

try {
Expand Down Expand Up @@ -163,6 +168,8 @@ class AddonBackendUnloadWorker : public Napi::AsyncWorker {
Napi::Promise::Deferred deferred;

void Execute() {
std::lock_guard<std::mutex> lock(backendMutex);

try {
if (backendInitialized) {
backendInitialized = false;
Expand Down Expand Up @@ -234,6 +241,8 @@ Napi::Value markLoaded(const Napi::CallbackInfo& info) {
}

Napi::Value addonInit(const Napi::CallbackInfo& info) {
std::lock_guard<std::mutex> lock(backendMutex);

if (backendInitialized) {
Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(info.Env());
deferred.Resolve(info.Env().Undefined());
Expand All @@ -246,6 +255,8 @@ Napi::Value addonInit(const Napi::CallbackInfo& info) {
}

Napi::Value addonDispose(const Napi::CallbackInfo& info) {
std::lock_guard<std::mutex> lock(backendMutex);

if (backendDisposed) {
Napi::Promise::Deferred deferred = Napi::Promise::Deferred::New(info.Env());
deferred.Resolve(info.Env().Undefined());
Expand All @@ -259,7 +270,8 @@ Napi::Value addonDispose(const Napi::CallbackInfo& info) {
return worker->GetPromise();
}

static void addonFreeLlamaBackend(Napi::Env env, int* data) {
static void addonFreeLlamaBackend() {
std::lock_guard<std::mutex> lock(backendMutex);
if (backendDisposed) {
return;
}
Expand All @@ -270,6 +282,9 @@ static void addonFreeLlamaBackend(Napi::Env env, int* data) {
llama_backend_free();
}
}
static void addonFreeLlamaBackendFromFinalizer(Napi::Env env, int* data) {
addonFreeLlamaBackend();
}

Napi::Object registerCallback(Napi::Env env, Napi::Object exports) {
exports.DefineProperties({
Expand Down Expand Up @@ -306,8 +321,8 @@ Napi::Object registerCallback(Napi::Env env, Napi::Object exports) {

llama_log_set(addonLlamaCppLogCallback, nullptr);

exports.AddFinalizer(addonFreeLlamaBackend, static_cast<int*>(nullptr));

exports.AddFinalizer(addonFreeLlamaBackendFromFinalizer, static_cast<int*>(nullptr));
env.AddCleanupHook(addonFreeLlamaBackend);
return exports;
}

Expand Down
Loading
Loading