Started memory monitering class for linux, not compiling
This commit is contained in:
@@ -18,7 +18,7 @@ set(Include ./include)
|
|||||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
|
|
||||||
include_directories(${Build}/ ${Include})
|
include_directories(${Build} ${Include}/)
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
file(GLOB_RECURSE PlatformDepSource
|
file(GLOB_RECURSE PlatformDepSource
|
||||||
@@ -39,8 +39,8 @@ file(GLOB_RECURSE SourceFiles
|
|||||||
)
|
)
|
||||||
|
|
||||||
add_executable(${Build}
|
add_executable(${Build}
|
||||||
${SourceFiles}
|
|
||||||
${PlatformDepSource}
|
${PlatformDepSource}
|
||||||
|
${SourceFiles}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${Build} Threads::Threads)
|
target_link_libraries(${Build} Threads::Threads)
|
||||||
|
|||||||
30
Makefile
30
Makefile
@@ -150,6 +150,33 @@ platform/linux/monitoring/cpu.cpp.s:
|
|||||||
$(MAKE) -f CMakeFiles/./bin/resource-monitor.dir/build.make CMakeFiles/./bin/resource-monitor.dir/platform/linux/monitoring/cpu.cpp.s
|
$(MAKE) -f CMakeFiles/./bin/resource-monitor.dir/build.make CMakeFiles/./bin/resource-monitor.dir/platform/linux/monitoring/cpu.cpp.s
|
||||||
.PHONY : platform/linux/monitoring/cpu.cpp.s
|
.PHONY : platform/linux/monitoring/cpu.cpp.s
|
||||||
|
|
||||||
|
platform/linux/monitoring/memory.o: platform/linux/monitoring/memory.cpp.o
|
||||||
|
|
||||||
|
.PHONY : platform/linux/monitoring/memory.o
|
||||||
|
|
||||||
|
# target to build an object file
|
||||||
|
platform/linux/monitoring/memory.cpp.o:
|
||||||
|
$(MAKE) -f CMakeFiles/./bin/resource-monitor.dir/build.make CMakeFiles/./bin/resource-monitor.dir/platform/linux/monitoring/memory.cpp.o
|
||||||
|
.PHONY : platform/linux/monitoring/memory.cpp.o
|
||||||
|
|
||||||
|
platform/linux/monitoring/memory.i: platform/linux/monitoring/memory.cpp.i
|
||||||
|
|
||||||
|
.PHONY : platform/linux/monitoring/memory.i
|
||||||
|
|
||||||
|
# target to preprocess a source file
|
||||||
|
platform/linux/monitoring/memory.cpp.i:
|
||||||
|
$(MAKE) -f CMakeFiles/./bin/resource-monitor.dir/build.make CMakeFiles/./bin/resource-monitor.dir/platform/linux/monitoring/memory.cpp.i
|
||||||
|
.PHONY : platform/linux/monitoring/memory.cpp.i
|
||||||
|
|
||||||
|
platform/linux/monitoring/memory.s: platform/linux/monitoring/memory.cpp.s
|
||||||
|
|
||||||
|
.PHONY : platform/linux/monitoring/memory.s
|
||||||
|
|
||||||
|
# target to generate assembly for a file
|
||||||
|
platform/linux/monitoring/memory.cpp.s:
|
||||||
|
$(MAKE) -f CMakeFiles/./bin/resource-monitor.dir/build.make CMakeFiles/./bin/resource-monitor.dir/platform/linux/monitoring/memory.cpp.s
|
||||||
|
.PHONY : platform/linux/monitoring/memory.cpp.s
|
||||||
|
|
||||||
src/main.o: src/main.cpp.o
|
src/main.o: src/main.cpp.o
|
||||||
|
|
||||||
.PHONY : src/main.o
|
.PHONY : src/main.o
|
||||||
@@ -189,6 +216,9 @@ help:
|
|||||||
@echo "... platform/linux/monitoring/cpu.o"
|
@echo "... platform/linux/monitoring/cpu.o"
|
||||||
@echo "... platform/linux/monitoring/cpu.i"
|
@echo "... platform/linux/monitoring/cpu.i"
|
||||||
@echo "... platform/linux/monitoring/cpu.s"
|
@echo "... platform/linux/monitoring/cpu.s"
|
||||||
|
@echo "... platform/linux/monitoring/memory.o"
|
||||||
|
@echo "... platform/linux/monitoring/memory.i"
|
||||||
|
@echo "... platform/linux/monitoring/memory.s"
|
||||||
@echo "... src/main.o"
|
@echo "... src/main.o"
|
||||||
@echo "... src/main.i"
|
@echo "... src/main.i"
|
||||||
@echo "... src/main.s"
|
@echo "... src/main.s"
|
||||||
|
|||||||
Binary file not shown.
@@ -15,10 +15,7 @@ public:
|
|||||||
int CPU_WORK;
|
int CPU_WORK;
|
||||||
int CPU_TOTAL;
|
int CPU_TOTAL;
|
||||||
|
|
||||||
int UPDATE_INTERVAL; // s
|
int UPDATE_INTERVAL; // ms
|
||||||
|
|
||||||
// int CPU_PREVIOUS_CORES_WORK_AND_TOTAL[2048][8];
|
|
||||||
// int CPU_CORES_WORK_AND_TOTAL[2048][8];
|
|
||||||
|
|
||||||
std::map<int, std::map<int, int>> CPU_PREVIOUS_CORES_WORK_AND_TOTAL;
|
std::map<int, std::map<int, int>> CPU_PREVIOUS_CORES_WORK_AND_TOTAL;
|
||||||
std::map<int, std::map<int, int>> CPU_CORES_WORK_AND_TOTAL;
|
std::map<int, std::map<int, int>> CPU_CORES_WORK_AND_TOTAL;
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
|
|
||||||
@@ -9,14 +8,13 @@ public:
|
|||||||
Memory();
|
Memory();
|
||||||
|
|
||||||
std::mutex Memory_Mutex;
|
std::mutex Memory_Mutex;
|
||||||
|
|
||||||
long double MEMORY_TOTAL_MB;
|
long double MEMORY_TOTAL_MB;
|
||||||
long double MEMORY_FREE_MB;
|
long double MEMORY_FREE_MB;
|
||||||
long double MEMORY_AVAILABLE_MB;
|
long double MEMORY_AVAILABLE_MB;
|
||||||
long double MEMORY_ACTIVE_MB;
|
long double MEMORY_ACTIVE_MB;
|
||||||
long double MEMORY_INACTIVE_MB;
|
long double MEMORY_INACTIVE_MB;
|
||||||
|
|
||||||
int UPDATE_INTERVAL; // s
|
int UPDATE_INTERVAL; // ms
|
||||||
|
|
||||||
void START_MEMORY_POLLING();
|
void START_MEMORY_POLLING();
|
||||||
static void MEMORY_POLL(Memory* mem);
|
static void MEMORY_POLL(Memory* mem);
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
#include <memory.h>
|
||||||
|
|
||||||
|
Memory::Memory() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void Memory::START_MEMORY_POLLING() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void Memory::MEMORY_POLL() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void Memory::END_MEMORY_POLLING(Memory* memory) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
Memory::~Memory() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
#include <iostream>
|
|
||||||
#include <cpu.h>
|
#include <cpu.h>
|
||||||
#include <memory.h>
|
#include <memory.h>
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
CPU* cpu = new CPU();
|
CPU* cpu = new CPU();
|
||||||
CPU_Instance = cpu;
|
CPU_Instance = cpu;
|
||||||
|
|
||||||
// Memory* mem = new Memory();
|
Memory* mem = new Memory();
|
||||||
// Memory_Instance = mem;
|
Memory_Instance = mem;
|
||||||
|
|
||||||
cpu->START_CPU_POLLING();
|
cpu->START_CPU_POLLING();
|
||||||
// mem->START_MEMORY_POLLING();
|
mem->START_MEMORY_POLLING();
|
||||||
|
|
||||||
while(1) {
|
while(1) {
|
||||||
sleep(1);
|
sleep(1);
|
||||||
|
|||||||
Reference in New Issue
Block a user