diff --git a/configure.sh b/configure.sh
index 740e87a4b6daf33ec094a3441e048d696962057d..7e10ec378cdb26b03b660f5d79b2ed78fba6c475 100755
--- a/configure.sh
+++ b/configure.sh
@@ -55,7 +55,7 @@ ls_sensors() {
try find src -type f -name '*.h' |
sed 's,src/\(.*\)\.h,\1,' |
grep -xEv "($hdr_blacklist)" |
- grep -xE "($hdr_whitelist)"
+ grep -xE "($hdr_whitelist)"
}
# gen_sensors_h(sensor, nb_sensors)
@@ -118,6 +118,10 @@ detect_caps() {
[ -d /sys/class/infiniband ] && hdr_whitelist="${hdr_whitelist}|infiniband"
[ -r /proc/stat ] && hdr_whitelist="${hdr_whitelist}|load"
+ if [ "$(uname -r | cut -d "." -f 1)" -gt "2" ]; then
+ hdr_whitelist="${hdr_whitelist}|memory"
+ fi
+
if [ -r /proc/net/route ]; then
dev=$(awk 'NR == 2 { print $1 }' /proc/net/route)
[ -e "/sys/class/net/$dev" ] && hdr_whitelist="${hdr_whitelist}|network"
diff --git a/src/memory.c b/src/memory.c
new file mode 100644
index 0000000000000000000000000000000000000000..3356a82323d3ff8d4a79391c2bb0f36663ece9e2
--- /dev/null
+++ b/src/memory.c
@@ -0,0 +1,97 @@
+/*******************************************************
+ Copyright (C) 2023-2023 Georges Da Costa <georges.da-costa@irit.fr>
+
+ This file is part of Mojitos.
+
+ Mojitos is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Mojitos is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with MojitO/S. If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/sysinfo.h>
+#include <string.h>
+
+#include "util.h"
+
+typedef enum {
+ TOTALRAM = 0,
+ FREERAM,
+ SHAREDRAM,
+ BUFFERRAM,
+ TOTALSWAP,
+ FREESWAP,
+ PROCS,
+ TOTALHIGH,
+ FREEHIGH,
+ MEM_UNIT,
+
+ MEMORY_COUNT,
+} MemoryKind;
+
+static const char *memory_labels[MEMORY_COUNT] = {
+ "totalram", "freeram", "sharedram", "bufferram",
+ "totalswap", "freeswap",
+ "procs",
+ "totalhigh", "freehigh", "mem_unit",
+};
+
+unsigned int init_memory(char *none1, void **none2)
+{
+ UNUSED(none1);
+ UNUSED(none2);
+ struct sysinfo info;
+ if (sysinfo(&info) < 0) {
+ fprintf(stderr, "Failed to get the memory information");
+ return 0;
+ }
+ return MEMORY_COUNT;
+}
+
+unsigned int get_memory(uint64_t *results, void *none)
+{
+ UNUSED(none);
+ struct sysinfo info;
+ if (sysinfo(&info) < 0) {
+ fprintf(stderr, "Failed to get the memory information");
+ exit(99);
+ }
+
+ // Can't use memcpy, the size isn't always the same
+ results[TOTALRAM] = info.totalram;
+ results[FREERAM] = info.freeram;
+ results[SHAREDRAM] = info.sharedram;
+ results[BUFFERRAM] = info.bufferram;
+ results[TOTALSWAP] = info.totalswap;
+ results[FREESWAP] = info.freeswap;
+ results[PROCS] = info.procs;
+ results[TOTALHIGH] = info.totalhigh;
+ results[FREEHIGH] = info.freehigh;
+ results[MEM_UNIT] = info.mem_unit;
+
+ return MEMORY_COUNT;
+}
+
+void label_memory(char **labels, void *none)
+{
+ UNUSED(none);
+ memcpy(labels, memory_labels, sizeof(char *) * MEMORY_COUNT);
+}
+
+void clean_memory(void *none)
+{
+ UNUSED(none);
+ return;
+}
+
diff --git a/src/memory.h b/src/memory.h
new file mode 100644
index 0000000000000000000000000000000000000000..6e275c63e41e836364d6ead18ebad548f7952de5
--- /dev/null
+++ b/src/memory.h
@@ -0,0 +1,43 @@
+/*******************************************************
+ Copyright (C) 2023-2023 Georges Da Costa <georges.da-costa@irit.fr>
+
+ This file is part of Mojitos.
+
+ Mojitos is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Mojitos is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with MojitO/S. If not, see <https://www.gnu.org/licenses/>.
+
+ *******************************************************/
+
+unsigned int init_memory(char *, void **);
+unsigned int get_memory(uint64_t *results, void *);
+void clean_memory(void *);
+void label_memory(char **labels, void *);
+
+
+Sensor memory = {
+ .init = init_memory,
+ .get = get_memory,
+ .clean = clean_memory,
+ .label = label_memory,
+ .nb_opt = 1,
+};
+
+Optparse memory_opt[1] = {
+ {
+ .longname = "memory",
+ .shortname = 'm',
+ .argtype = OPTPARSE_NONE,
+ .usage_arg = NULL,
+ .usage_msg = "Retrieves information about the memory via the syscall 'sysinfo(2)'.",
+ },
+};
diff --git a/tests/main.c b/tests/main.c
index 3246f0429a7ff7ad065070ac195428af7e099872..e90e8dd69863fcc269d561c07df43dc49a2437ec 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -21,9 +21,11 @@
#include "util.c"
#include "amd_rapl.c"
#include "info_reader.c"
+#include "memory.c"
TMAIN({
CALL_TFUNCTION(test_util);
CALL_TFUNCTION(test_amd_rapl);
CALL_TFUNCTION(test_info_reader);
+ CALL_TFUNCTION(test_memory);
})
diff --git a/tests/memory.c b/tests/memory.c
new file mode 100644
index 0000000000000000000000000000000000000000..78efd28146558909dc0a940bfa2efce57a102b3d
--- /dev/null
+++ b/tests/memory.c
@@ -0,0 +1,78 @@
+/*******************************************************
+ Copyright (C) 2023-2023 Georges Da Costa <georges.da-costa@irit.fr>
+
+ This file is part of Mojitos.
+
+ Mojitos is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Mojitos is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with MojitO/S. If not, see <https://www.gnu.org/licenses/>.
+
+*******************************************************/
+
+#include "small_test.h"
+#include "../src/memory.c"
+
+// In order to verify the integrity.
+TFUNCTION(test_labels, {
+ // If it fails update the tests
+ int tested_count = 10;
+ int expected_count = MEMORY_COUNT;
+ TEST_INT(&tested_count, &expected_count);
+
+ const char *result = NULL;
+ char *expected = NULL;
+
+ expected = "totalram";
+ result = memory_labels[TOTALRAM];
+ TEST_STR(result, expected);
+
+ expected = "freeram";
+ result = memory_labels[FREERAM];
+ TEST_STR(result, expected);
+
+ expected = "sharedram";
+ result = memory_labels[SHAREDRAM];
+ TEST_STR(result, expected);
+
+ expected = "bufferram";
+ result = memory_labels[BUFFERRAM];
+ TEST_STR(result, expected);
+
+ expected = "totalswap";
+ result = memory_labels[TOTALSWAP];
+ TEST_STR(result, expected);
+
+ expected = "freeswap";
+ result = memory_labels[FREESWAP];
+ TEST_STR(result, expected);
+
+ expected = "procs";
+ result = memory_labels[PROCS];
+ TEST_STR(result, expected);
+
+ expected = "totalhigh";
+ result = memory_labels[TOTALHIGH];
+ TEST_STR(result, expected);
+
+ expected = "freehigh";
+ result = memory_labels[FREEHIGH];
+ TEST_STR(result, expected);
+
+ expected = "mem_unit";
+ result = memory_labels[MEM_UNIT];
+ TEST_STR(result, expected);
+})
+
+TFILE_ENTRY_POINT(test_memory, {
+ CALL_TFUNCTION(test_labels);
+})
+