Merge pull request #70 from joular/develop

1.0.5
joular · Nov 19, 2024 · cbd80a9 · cbd80a9
2 parents 4a791cd + 8fe9116
commit cbd80a9
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/alire.toml b/alire.toml
@@ -1,6 +1,6 @@
 name = "powerjoular"
 description = "Monitoring the power consumption of multiple platforms and processes"
-version = "1.0.4"
+version = "1.0.5"
 
 authors = ["Adel Noureddine"]
 maintainers = ["Adel Noureddine <adel.noureddine@univ-pau.fr>"]

diff --git a/installer/aur/PKGBUILD b/installer/aur/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Adel Noureddine <adel.noureddine@outlook.com>
 pkgname=powerjoular
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="PowerJoular allows monitoring power consumption of multiple platforms and processes."
 arch=('x86_64' 'aarch64' 'armv7h')

diff --git a/installer/powerjoular.spec b/installer/powerjoular.spec
@@ -1,5 +1,5 @@
 Name:           powerjoular
-Version:        1.0.4
+Version:        1.0.5
 Release:        1%{?dist}
 Summary:        PowerJoular allows monitoring power consumption of multiple platforms and processes.
 
@@ -22,6 +22,8 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/systemd/system/%{name}.
 %{_sysconfdir}/systemd/system/%{name}.service
 
 %changelog
+* Tue Nov 19 2024 Adel Noureddine <adel.noureddine@univ-pau.fr> - 1.0.5-1
+- Hotfix: don't exit when DRAM energy can't be read
 * Wed Jul 11 2024 Adel Noureddine <adel.noureddine@univ-pau.fr> - 1.0.4-1
 - Hotfix for error in updating PID list for monitoring an application by name
 * Thu Jul 08 2024 Adel Noureddine <adel.noureddine@univ-pau.fr> - 1.0.3-1

diff --git a/release-version.sh b/release-version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.0.4
+VERSION=1.0.5
 
 # First cross compiler
 

diff --git a/src/cpu_stat_app.adb b/src/cpu_stat_app.adb
@@ -74,7 +74,6 @@ package body CPU_STAT_App is
         Seps : constant String := " "; -- Seperator (space) for slicing string
         Slice_number_count : String_Split.Slice_Number;
         Loop_I : Integer;
-        Test : Integer;
     begin
         Args := Argument_String_To_List (Command);
         declare

diff --git a/src/help_info.adb b/src/help_info.adb
@@ -14,7 +14,7 @@ with Ada.Characters.Latin_1; use Ada.Characters.Latin_1;
 
 package body Help_Info is
 
-    Version_Number : constant String := "1.0.4";
+    Version_Number : constant String := "1.0.5";
 
     procedure Show_Help is
     begin

diff --git a/src/intel_rapl_sysfs.adb b/src/intel_rapl_sysfs.adb
@@ -36,12 +36,18 @@ package body Intel_RAPL_sysfs is
 
             -- For pkg, also check dram because total energy = pkg + dram
             if RAPL_Data.dram_supported then
-                -- Read energy_uj which is in micro joules
-                Open (F_Name, In_File, Folder_Name & "intel-rapl:0/intel-rapl:0:2/energy_uj");
-                -- Store energy value divided by 1000000 to get it in joules
-                RAPL_Data.dram := Long_Float'Value (Get_Line (F_Name)) / 1000000.0;
-                Close (F_Name);
-                RAPL_Data.total_energy := RAPL_Data.pkg + RAPL_Data.dram;
+                begin
+                    -- Read energy_uj which is in micro joules
+                    Open (F_Name, In_File, Folder_Name & "intel-rapl:0/intel-rapl:0:2/energy_uj");
+                    -- Store energy value divided by 1000000 to get it in joules
+                    RAPL_Data.dram := Long_Float'Value (Get_Line (F_Name)) / 1000000.0;
+                    Close (F_Name);
+                    RAPL_Data.total_energy := RAPL_Data.pkg + RAPL_Data.dram;
+                exception
+                    when others =>
+                        -- Don't exit because we can continue without dram
+                        null;
+                end;
             end if;
         else
             return;