Expose the loaded path of a module from the VM. Display path for the loaded module in the debugger.

arr committed 10 years ago

Commit 42194721 parent 836214e4 files · +47 −57Browse files

Showing the changes to src/include (1 of 4 files). Show all

Unified · Split

         const char * const label; // Optional
     };
+    // Loaded module reference
+    class loaded_vm_module_t final
+    {
+    public:
+        // Origin of module
+        std::unique_ptr<runtime::vm_string_t> origin;
+        // Weak reference to a loaded module
+        std::weak_ptr<runtime::vm_module_t> module;
+    };
+    using loaded_vm_module_callback_t = std::function<void(const loaded_vm_module_t&)>;
     // Virtual machine
     class vm_t final
     {
         // Load the module at the supplied path into the virtual machine
         std::shared_ptr<runtime::vm_module_t> load_module(const char *path);
-        // Get a collection of all currently loaded modules.
+        // Enumerate all loaded modules - this can include references to modules that
-        // Note this will only include modules that have been loaded by a call to vm_t::load_module.
+        // have been unloaded due to no longer being used. If the module instance is null, the
-        std::vector<std::shared_ptr<runtime::vm_module_t>> get_loaded_modules() const;
+        // module is no longer loaded.
+        // Note this will only enumerate modules that have been loaded by a call to vm_t::load_module.
+        void enum_loaded_modules(loaded_vm_module_callback_t callback) const;
         // Access the scheduler control for this VM.
         runtime::vm_scheduler_control_t &get_scheduler_control() const;
     private:
         const runtime::vm_thread_t &schedule_thread(std::unique_ptr<runtime::vm_thread_t> thread);
-        // Loaded module reference
+        using loaded_modules_t = std::forward_list<loaded_vm_module_t>;
-        class loaded_module_t final
-        {
-        public:
-            loaded_module_t(std::unique_ptr<runtime::vm_string_t> origin, std::shared_ptr<runtime::vm_module_t> module);
-            loaded_module_t(const loaded_module_t &) = delete;
-            loaded_module_t &operator=(const loaded_module_t &) = delete;
-            loaded_module_t(loaded_module_t &&);
-            ~loaded_module_t();
-            // Origin of module
-            std::unique_ptr<runtime::vm_string_t> origin;
-            // Weak reference to a loaded module
-            std::weak_ptr<runtime::vm_module_t> module;
-        };
-        using loaded_modules_t = std::forward_list<loaded_module_t>;
         mutable std::mutex _modules_lock;
         loaded_modules_t _modules;