disable_logging parameter

include/cosim/fmi/fmu.hpp

@@ -66,6 +66,13 @@ class fmu
     virtual std::shared_ptr<fmi::importer> importer() const = 0;
 
     virtual ~fmu() { }
+
+    void disable_logging(bool disabled) { logging_disabled = disabled; }
+
+    bool is_logging_disabled() const { return logging_disabled; }
+
+protected:
+    bool logging_disabled;
 };
 
 

include/cosim/orchestration.hpp

@@ -172,14 +172,15 @@ class model_uri_resolver
 class fmu_file_uri_sub_resolver : public model_uri_sub_resolver
 {
 public:
-    fmu_file_uri_sub_resolver();
+    explicit fmu_file_uri_sub_resolver(bool disable_logging = false);
 
-    explicit fmu_file_uri_sub_resolver(std::shared_ptr<file_cache> cache);
+    explicit fmu_file_uri_sub_resolver(std::shared_ptr<file_cache> cache, bool disable_logging = false);
 
     std::shared_ptr<model> lookup_model(const uri& modelUri) override;
 
 private:
     std::shared_ptr<fmi::importer> importer_;
+    bool disable_logging;
 };
 
 

src/cosim/fmi/v1/fmu.cpp

@@ -291,17 +291,10 @@ slave_instance::slave_instance(
             fmu->importer()->last_error_message());
     }
 
-    auto fmi_no_logging_env = std::getenv("LIBCOSIM_NO_FMI_LOGGING");
-    long fmi_no_logging = -1;
-    if (fmi_no_logging_env) {
-        char* ptr;
-        fmi_no_logging = strtol(fmi_no_logging_env, &ptr, 10);
-    }
-
     fmi1_callback_functions_t callbacks;
     callbacks.allocateMemory = std::calloc;
     callbacks.freeMemory = std::free;
-    callbacks.logger = (fmi_no_logging == 1) ? empty_log_message : log_message;
+    callbacks.logger = fmu->is_logging_disabled() ? empty_log_message : log_message;
     callbacks.stepFinished = step_finished_placeholder;
 
     if (fmi1_import_create_dllfmu(handle_, callbacks, false) != jm_status_success) {

src/cosim/fmi/v2/fmu.cpp

@@ -291,17 +291,10 @@ slave_instance::slave_instance(
             fmu->importer()->last_error_message());
     }
 
-    auto fmi_no_logging_env = std::getenv("LIBCOSIM_NO_FMI_LOGGING");
-    long fmi_no_logging = -1;
-    if (fmi_no_logging_env) {
-        char* ptr;
-        fmi_no_logging = strtol(fmi_no_logging_env, &ptr, 10);
-    }
-
     fmi2_callback_functions_t callbacks;
     callbacks.allocateMemory = std::calloc;
     callbacks.freeMemory = std::free;
-    callbacks.logger = (fmi_no_logging == 1) ? empty_log_message : log_message;
+    callbacks.logger = fmu->is_logging_disabled() ? empty_log_message : log_message;
     callbacks.stepFinished = step_finished_placeholder;
     callbacks.componentEnvironment = nullptr;
 

src/cosim/orchestration.cpp

@@ -99,15 +99,18 @@ class fmu_model : public model
 } // namespace
 
 
-fmu_file_uri_sub_resolver::fmu_file_uri_sub_resolver()
+fmu_file_uri_sub_resolver::fmu_file_uri_sub_resolver(bool disable_logging)
     : importer_(fmi::importer::create())
+    , disable_logging(disable_logging)
 {
 }
 
 
 fmu_file_uri_sub_resolver::fmu_file_uri_sub_resolver(
-    std::shared_ptr<file_cache> cache)
+    std::shared_ptr<file_cache> cache,
+    bool disable_logging)
     : importer_(fmi::importer::create(cache))
+    , disable_logging(disable_logging)
 {
 }
 
@@ -128,6 +131,7 @@ std::shared_ptr<model> fmu_file_uri_sub_resolver::lookup_model(const uri& modelU
     const auto path = file_uri_to_path(modelUri);
     if (path.extension() != ".fmu") return nullptr;
     auto fmu = importer_->import(path);
+    fmu->disable_logging(disable_logging);
     return std::make_shared<fmu_model>(fmu);
 }