Power Measurements Service

.editorconfig

@@ -8,6 +8,8 @@ indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
+# https://devblogs.microsoft.com/cppblog/doxygen-and-xml-doc-comment-support/
+vc_generate_documentation_comments = doxygen_slash_star
 
 [*.json]
 indent_size = 2

.github/workflows/build.yml

@@ -13,6 +13,7 @@ env:
     -DMEGAMOL_WARNING_LEVEL="Off"
     -DMEGAMOL_PLUGIN_MEGAMOL101_GL=ON
     -DMEGAMOL_USE_CGAL=ON
+    -DMEGAMOL_USE_POWER=ON
     -DMEGAMOL_USE_PROFILING=ON
     -DMEGAMOL_USE_STACKTRACE=ON
     -DMEGAMOL_USE_TRACY=ON

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright (c) 2020, MegaMol Dev Team
 # All rights reserved.
 #
-cmake_minimum_required(VERSION 3.19...3.29 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.24...3.29 FATAL_ERROR)
 
 # Vcpkg setup
 set(MEGAMOL_VCPKG_VERSION "2024.07.12") # Update default-registry baseline in vcpkg.json when changing!
@@ -27,6 +27,7 @@ megamol_feature_option(VTKM "Enable VTK-m support." OFF)
 megamol_feature_option(CUESDK "Enable Corsair CUESDK support." OFF "WIN32")
 megamol_feature_option(OPENGL_DEBUGGROUPS "Inject OpenGL debug groups into calls." OFF "MEGAMOL_USE_OPENGL")
 megamol_feature_option(POWER_VISA "Enable power measurement VISA sensors." OFF "MEGAMOL_USE_POWER")
+megamol_feature_option(TRACY_TIME_PLOT "Enable custom Tracy timed plotting capabilities." OFF "MEGAMOL_USE_TRACY")
 megamol_feature_option(VR_INTEROP "Enable MegaMol-Unity VR Interop via Spout2." OFF "WIN32;MEGAMOL_USE_OPENGL")
 
 # Disable in source build

cmake/megamol_config.cmake

@@ -27,6 +27,12 @@ endif ()
 add_compile_definitions("$<$<CONFIG:DEBUG>:DEBUG>")
 add_compile_definitions("$<$<CONFIG:DEBUG>:_DEBUG>")
 
+# MEMLEAK
+cmake_dependent_option(MEGAMOL_DETECT_MEMLEAK "Enable to use Memleak detection (MSVC only)" OFF "MSVC" OFF)
+if (MEGAMOL_DETECT_MEMLEAK)
+  add_compile_definitions("$<$<CONFIG:DEBUG>:MEGAMOL_DETECT_MEMLEAK>")
+endif()
+
 # Compiler flags
 # Note: special C++ and C-Compiler flags should be set for each language separately as done below.
 # Otherwise, a possible compilation with CUDA will propagate those flags to the CUDA-Compiler and lead to a crash.
@@ -95,8 +101,10 @@ endif ()
 
 # CUDA
 if (MEGAMOL_USE_CUDA)
+  if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
+    set(CMAKE_CUDA_ARCHITECTURES native)
+  endif()
   enable_language(CUDA)
-  set(CMAKE_CUDA_ARCHITECTURES FALSE)
 endif ()
 
 # MPI

cmake/vcpkg_ports/dataversepp/portfile.cmake

@@ -0,0 +1,30 @@
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO UniStuttgart-VISUS/dataversepp
+    REF 4857d61a899443ae77641e3df730d2b8c26607dc # master on 2024-07-27
+    SHA512 801b2f43ea42698f295ad36069f30495da8891acee5dda23127168b7d989e8d9a67b45f794288ed3747c5333109fbbcb6a78051b46fcf46273de91a46750dd55
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+      -DDATAVERSE_BuildCli=OFF
+      -DDATAVERSE_DownloadThirdParty=OFF
+      -DDATAVERSE_BuildTests=OFF
+      -DDATAVERSE_Unicode=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    PACKAGE_NAME dataversepp
+    CONFIG_PATH lib/cmake/dataverse
+)
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENCE")

cmake/vcpkg_ports/dataversepp/vcpkg.json

@@ -0,0 +1,32 @@
+{
+  "name": "dataversepp",
+  "version-date": "2024-07-27",
+  "description": "Framework for dataverse data transfer.",
+  "homepage": "https://github.com/UniStuttgart-VISUS/dataversepp",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "curl",
+      "features": [
+        "ssl"
+      ]
+    },
+    {
+      "name": "icu",
+      "platform": "!windows"
+    },
+    "nlohmann-json",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "wil",
+      "platform": "windows"
+    }
+  ]
+}

core/include/mmcore/utility/graphics/ScreenShotComments.h

@@ -14,6 +14,8 @@
 
 #include <png.h>
 
+#include "RuntimeInfo.h"
+
 namespace megamol::core::utility::graphics {
 
 class ScreenShotComments {
@@ -26,7 +28,7 @@ class ScreenShotComments {
      * constructor and later get out the png_text you need for feeding libpng. Note that the returned png_text array
      * is only valid as long as the ScreenShotComments instance is in scope!
      */
-    ScreenShotComments(std::string const& project_configuration,
+    ScreenShotComments(std::string const& project_configuration, megamol::frontend_resources::RuntimeInfo const* ri,
         const std::optional<comments_storage_map>& additional_comments = std::nullopt);
 
     png_comments GetComments() const;

core/include/mmcore/utility/platform/RuntimeInfo.h

@@ -5,6 +5,7 @@
  */
 #pragma once
 
+#include <mutex>
 #include <string>
 
 #include "WMIUtil.h"
@@ -15,25 +16,60 @@ class RuntimeInfo {
 public:
     static std::string GetHardwareInfo() {
         if (m_hardware_info.empty()) {
+            std::lock_guard<std::mutex> lock(write_mtx_);
             get_hardware_info();
         }
         return m_hardware_info;
     }
 
     static std::string GetOsInfo() {
         if (m_os_info.empty()) {
+            std::lock_guard<std::mutex> lock(write_mtx_);
             get_os_info();
         }
         return m_os_info;
     }
 
     static std::string GetRuntimeLibraries() {
         if (m_runtime_libraries.empty()) {
+            std::lock_guard<std::mutex> lock(write_mtx_);
             get_runtime_libraries();
         }
         return m_runtime_libraries;
     }
 
+    static std::string GetSMBIOSInfo() {
+        if (smbios_.empty()) {
+            std::lock_guard<std::mutex> lock(write_mtx_);
+            get_smbios_info();
+        }
+        return smbios_;
+    }
+
+    static std::string GetCPUInfo() {
+        if (cpu_.empty()) {
+            std::lock_guard<std::mutex> lock(write_mtx_);
+            get_cpu_info();
+        }
+        return cpu_;
+    }
+
+    static std::string GetGPUInfo() {
+        if (gpu_.empty()) {
+            std::lock_guard<std::mutex> lock(write_mtx_);
+            get_gpu_info();
+        }
+        return gpu_;
+    }
+
+    static std::string GetOSInfo() {
+        if (os_.empty()) {
+            std::lock_guard<std::mutex> lock(write_mtx_);
+            get_OS_info();
+        }
+        return os_;
+    }
+
 
 private:
     static void get_hardware_info();
@@ -45,6 +81,18 @@ class RuntimeInfo {
     inline static std::string m_os_info;
     inline static std::string m_hardware_info;
 
+    static void get_smbios_info(bool serial = false);
+    static void get_cpu_info();
+    static void get_gpu_info();
+    static void get_OS_info();
+
+    inline static std::string smbios_;
+    inline static std::string cpu_;
+    inline static std::string gpu_;
+    inline static std::string os_;
+
+    inline static std::mutex write_mtx_;
+
 #ifdef _WIN32
     inline static WMIUtil wmi;
 #endif

core/include/mmcore/utility/platform/WMIUtil.h

@@ -9,6 +9,7 @@
 #ifdef _WIN32
 
 #include <iostream>
+#include <wil/com.h>
 
 #define _WIN32_DCOM
 #include <Wbemidl.h>
@@ -27,8 +28,10 @@ class WMIUtil {
     std::string get_value(const std::string& wmi_class, const std::string& attribute);
 
 private:
-    IWbemLocator* locator = nullptr;
-    IWbemServices* service = nullptr;
+    //IWbemLocator* locator = nullptr;
+    //IWbemServices* service = nullptr;
+    wil::com_ptr<IWbemServices> service;
+    //wil::unique_couninitialize_call cleanup;
 };
 } // namespace megamol::core::utility::platform
 

core/src/utility/graphics/ScreenShotComments.cpp

@@ -20,8 +20,9 @@
 
 namespace mcu_graphics = megamol::core::utility::graphics;
 
-mcu_graphics::ScreenShotComments::ScreenShotComments(
-    std::string const& project_configuration, const std::optional<comments_storage_map>& additional_comments) {
+mcu_graphics::ScreenShotComments::ScreenShotComments(std::string const& project_configuration,
+    megamol::frontend_resources::RuntimeInfo const* ri,
+    const std::optional<comments_storage_map>& additional_comments) {
 
     the_comments["Title"] = "MegaMol Screen Capture " + utility::DateTime::CurrentDateTimeFormatted();
     //the_comments["Author"] = "";
@@ -34,11 +35,14 @@ mcu_graphics::ScreenShotComments::ScreenShotComments(
 
     the_comments["Remote Branch"] = megamol::core::utility::buildinfo::MEGAMOL_GIT_BRANCH_NAME_FULL();
     the_comments["Remote URL"] = megamol::core::utility::buildinfo::MEGAMOL_GIT_REMOTE_URL();
-    the_comments["Software Environment"] = platform::RuntimeInfo::GetRuntimeLibraries();
-    the_comments["Hardware Environment"] = platform::RuntimeInfo::GetHardwareInfo();
     the_comments["CMakeCache"] = megamol::core::utility::buildinfo::MEGAMOL_CMAKE_CACHE();
     the_comments["Git Diff"] = megamol::core::utility::buildinfo::MEGAMOL_GIT_DIFF();
-    the_comments["Operating System"] = platform::RuntimeInfo::GetOsInfo();
+
+    if (ri) {
+        the_comments["Hardware Environment"] = ri->get_hardware_info();
+        the_comments["Operating System"] = ri->get_os_info();
+        the_comments["Software Environment"] = ri->get_runtime_libraries();
+    }
 
     //the_comments["Disclaimer"] = "";
     //the_comments["Warning"] = "";