Merge pull request #64 from sidi762/master

Web: fixed timeout not working

nasal-web-app/server.js

@@ -3,6 +3,7 @@ const path = require('path');
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 const koffi = require('koffi');
+require('expose-gc');
 
 // Parse command line arguments
 const argv = yargs(hideBin(process.argv))
@@ -83,6 +84,7 @@ app.post('/eval', (req, res) => {
     } finally {
         if (argv.verbose) console.log('Cleaning up Nasal context');
         nasalLib.nasal_cleanup(ctx);
+        global.gc()
     }
 });
 

src/nasal_vm.cpp

@@ -570,6 +570,14 @@ void vm::run(const codegen& gen,
 
 #ifndef _MSC_VER
     // using labels as values/computed goto
+
+    // Define an interrupt check macro for computed goto mode.
+    #define CHECK_INTERRUPT { \
+        if (interrupt_ptr && interrupt_ptr->load()) { \
+            throw std::runtime_error("VM execution interrupted by timeout"); \
+        } \
+    }
+
     const void* oprs[] = {
         &&vmexit,
         &&repl,
@@ -665,6 +673,7 @@ void vm::run(const codegen& gen,
         code.push_back(oprs[i.op]);
         imm.push_back(i.num);
     }
+    CHECK_INTERRUPT;
     // goto the first operand
     goto *code[ctx.pc];
 #else
@@ -674,6 +683,9 @@ void vm::run(const codegen& gen,
         imm.push_back(i.num);
     }
     while(code[ctx.pc]) {
+        if (interrupt_ptr && interrupt_ptr->load()) {
+            throw std::runtime_error("VM execution interrupted by timeout");
+        }
         (this->*code[ctx.pc])();
         if (ctx.top>=ctx.canary) {
             die("stack overflow");
@@ -704,6 +716,7 @@ vmexit:
 // do not cause stackoverflow
 #define exec_nodie(op) {\
     op();\
+    CHECK_INTERRUPT;\
     goto *code[++ctx.pc];\
 }
 

src/nasal_vm.h

@@ -4,6 +4,7 @@
 #include <stack>
 #include <cstring>
 #include <sstream>
+#include <atomic>
 
 #include "nasal_import.h"
 #include "nasal_gc.h"
@@ -323,6 +324,13 @@ public:
     auto get_gc_time_ms() const {
         return ngc.get_gc_time_ms();
     }
+
+    void set_interrupt_ptr(std::atomic<bool>* p) {
+        interrupt_ptr = p;
+    }
+
+private:
+    std::atomic<bool>* interrupt_ptr = nullptr;
 };
 
 inline bool vm::boolify(const var& val) {

src/nasal_web.cpp

@@ -17,6 +17,7 @@
 #include <chrono>
 #include <vector>
 #include <future>
+#include <atomic>
 
 namespace {
     // Helper function implementations inside anonymous namespace
@@ -46,9 +47,15 @@ struct NasalContext {
     std::string last_result;
     std::string last_error;
     std::chrono::seconds timeout{5}; // Default 5 second timeout
+    std::atomic<bool> interrupted{false};
 
     NasalContext() {
         vm_instance = std::make_unique<nasal::vm>();
+        vm_instance->set_interrupt_ptr(&interrupted);
+    }
+
+    ~NasalContext() {
+        vm_instance.reset(); // Reset explicitly
     }
 };
 
@@ -71,7 +78,9 @@ void* nasal_init() {
 }
 
 void nasal_cleanup(void* context) {
-    delete static_cast<NasalContext*>(context);
+    auto* ctx = static_cast<NasalContext*>(context);
+    ctx->vm_instance.reset(); 
+    delete ctx;
 }
 
 // Add new function to set timeout
@@ -148,6 +157,7 @@ const char* nasal_eval(void* context, const char* code, int show_time) {
         // Wait for completion or timeout
         auto status = future.wait_for(ctx->timeout);
         if (status == std::future_status::timeout) {
+            ctx->interrupted.store(true);
             std::remove(temp_filename);
             throw std::runtime_error("Execution timed out after " + 
                 std::to_string(ctx->timeout.count()) + " seconds");