patrick/Vosklet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Still trying to fix only working at -O0

Browse Source
This commit is contained in:
msqr1
2024-03-10 00:56:41 -08:00
parent 05f14c3671
commit 9a40cdaa7f
9 changed files with 10659 additions and 4696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/genericModel.cc
+45 -21
View File
@@ -40,98 +40,118 @@ bool genericModel::checkFiles() {
fs::exists("ivector/splice.conf", tank);
}
return fs::exists("mfcc.conf", tank) &&
fs::exists("final.ext.raw", tank) &&
fs::exists("mean.vec", tank) &&
fs::exists("transform.mat", tank);
fs::exists("final.ext.raw", tank) &&
fs::exists("mean.vec", tank) &&
fs::exists("transform.mat", tank);
}
genericModel::~genericModel() {
if(normalMdl) {
vosk_model_free(std::get<0>(mdl));
return;
}
vosk_spk_model_free(std::get<1>(mdl));
if(normalMdl) vosk_model_free(std::get<0>(mdl));
else vosk_spk_model_free(std::get<1>(mdl));
}
void genericModel::check() {
thrd.addTask([this](){
if(OPFSTried && !OPFSOk) {
emscripten_console_log("OPFS isn't available");
fireEv("_checkMdl", "OPFS isn't available", index);
return;
}
if(!OPFSTried){
emscripten_console_log("Trying to acquire OPFS");
OPFSTried = true;
OPFSOk = wasmfs_create_directory("/opfs", 0777, wasmfs_create_opfs_backend()) == 0;
};
emscripten_console_log("Initializing OPFS");
if(!OPFSOk) {
emscripten_console_log("OPFS initialization failed");
fireEv("_checkMdl", "OPFS initialization failed", index);
return;
}
fs::current_path("/opfs", tank);
if(tank.value() != 0) {
emscripten_console_log("Unable to cd OPFS root");
fireEv("_continue","Unable to cd OPFS root", index);
return;
}
fs::create_directories(storepath, tank);
if(tank.value() != 0) {
emscripten_console_log("Unable to create storepath");
fireEv("_continue","Unable to create storepath", index);
}
fs::current_path(storepath, tank);
if(tank.value() != 0) {
emscripten_console_log("Unable to cd storepath");
fireEv("_continue", "Unable to cd storepath", index);
}
if(!checkFiles() && !fs::exists("id", tank)) {
emscripten_console_log("Model is not available, fetching...");
fireEv("_checkMdl", "fetch", index);
return;
}
emscripten_console_log("Model is available, verifying ID");
FILE* idFile {fopen("id", "r")};
if(idFile == nullptr) {
emscripten_console_log("Couldn't open id file");
fireEv("_checkMdl", "Couldn't open id file", index);
return;
}
emscripten_console_log("1");
if(fseek(idFile, 0, SEEK_END) != 0) {
emscripten_console_log("Id file end seeking fail");
fireEv("_checkMdl", "Id file end seeking fail", index);
fclose(idFile);
return;
};
emscripten_console_log("1");
long long oldsize{ftell(idFile)};
char* oldid {new char[oldsize]};
if(fseek(idFile, 0L, SEEK_SET) != 0) {
emscripten_console_log("Id file start seeking fail");
fireEv("_checkMdl", "Id file start seeking fail", index);
fclose(idFile);
return;
};
emscripten_console_log("1");
fread(oldid, 1, oldsize, idFile);
fclose(idFile);
if(strcmp(oldid, id.c_str()) != 0) fireEv("_checkMdl", "fetch", index);
else fireEv("_checkMdl", nullptr, index);
if(strcmp(oldid, id.c_str()) != 0) {
emscripten_console_log("ID doesn't match, fetching...");
fireEv("_checkMdl", "fetch", index);
}
else {
emscripten_console_log("ID match, returning instance");
fireEv("_checkMdl", nullptr, index);
}
delete[] oldid;
emscripten_console_log("1");
emscripten_console_log("Success! Model is ready!");
});
}
void genericModel::afterFetch() {
thrd.addTask([this](){
emscripten_console_log("Trying to extract...");
if(!extract()) {
fs::remove("/opfs/m0dEl.tar",tank);
fs::current_path("/opfs", tank);
fs::remove_all(storepath, tank);
emscripten_console_log("Unable to extract model");
fireEv("_continue", "Unable to extract model", index);
return;
}
emscripten_console_log("Extract done, checking files...");
if(!checkFiles()) {
emscripten_console_log("URL points to invalid model files");
fireEv("_continue", "URL points to invalid model files", index);
return;
}
emscripten_console_log("Creating ID file...");
int idFd {creat("id",0777)};
if(idFd == -1) {
fireEv("_continue", "Unable create ID file", index);
emscripten_console_log("Unable to create ID file");
fireEv("_continue", "Unable to create ID file", index);
fs::remove("/opfs/m0dEl.tar",tank);
fs::current_path("/opfs", tank);
fs::remove_all(storepath, tank);
return;
}
emscripten_console_log("Writing ID...");
if(write(idFd, id.c_str(), id.size()) == -1) {
emscripten_console_log("Unable to write new ID");
fireEv("_continue", "Unable to write new ID", index);
fs::remove("/opfs/m0dEl.tar",tank);
fs::current_path("/opfs", tank);
@@ -140,14 +160,15 @@ void genericModel::afterFetch() {
return;
};
close(idFd);
emscripten_console_log("Success! Model is ready!");
});
load();
//load();
}
bool genericModel::extract() {
static fs::path path{};
static int fd{};
static archive* src {archive_read_new()};
archive_entry* entry{archive_entry_new()};
static archive_entry* entry{archive_entry_new()};
archive* src {archive_read_new()};
archive_read_support_format_tar(src);
archive_read_open_filename(src, "/opfs/m0dEl.tar", 10240);
if(archive_errno(src) != 0) return false;
@@ -155,8 +176,8 @@ bool genericModel::extract() {
if(archive_errno(src) != 0) return false;
path = archive_entry_pathname(entry);
// Strip 1st component, keep relative path
path = "." + path.generic_string().substr(path.generic_string().find("/"));
emscripten_console_log(path.c_str());
path = "." + path.generic_string().substr(path.generic_string().find("/"));
emscripten_console_logf("Creating file/dir %s", path.c_str());
if(!path.has_extension()) {
fs::create_directory(path);
continue;
@@ -164,8 +185,11 @@ bool genericModel::extract() {
fd = creat(path.c_str(),0777);
if(fd == -1) return false;
archive_read_data_into_fd(src, fd);
if(archive_errno(src) != 0) return false;
close(fd);
if(archive_errno(src) != 0) {
emscripten_console_log(archive_error_string(src));
return false;
}
}
fs::remove("README",tank);
fs::remove("/opfs/m0dEl.tar",tank);
src/global.cc
+6 -3
View File
@@ -14,18 +14,21 @@ void fireEv(const char *type, const char *content, int index) {
if(dstThrd == pthread_self()) proxy();
else glbQ.proxySync(dstThrd, proxy);
}
void reusableThrd::addTask(std::function<void()>&& task) {
static std::thread thrd{[this](){
pthread_detach(pthread_self());
reusableThrd::reusableThrd() {
std::thread thrd{[this](){
while(!done.test()) {
blocker.wait(done.test(std::memory_order_relaxed) || queue.empty(), std::memory_order_relaxed);
blocker.clear(std::memory_order_relaxed);
while(!queue.empty()) {
emscripten_console_log("Executing task...");
queue.front()();
queue.pop();
}
}
}};
thrd.detach();
}
void reusableThrd::addTask(std::function<void()>&& task) {
queue.emplace(task);
blocker.test_and_set(std::memory_order_relaxed);
blocker.notify_one();
src/global.h
+1
View File
@@ -21,5 +21,6 @@ struct reusableThrd {
std::atomic_flag blocker{};
std::atomic_flag done{};
void addTask(std::function<void()>&& task);
reusableThrd();
~reusableThrd();
};
src/pre.js
+1
View File
@@ -41,6 +41,7 @@ class genericModel extends EventTarget {
if(!readRes.done) await wStream.write(readRes.value)
else break
}
tarReader.releaseLock()
await wStream.close()
mdl.obj.afterFetch()
break;