sync from windows
This commit is contained in:
parent
34fe72877e
commit
499a738901
@ -95,10 +95,10 @@
|
|||||||
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/SystemInfo.h">
|
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/SystemInfo.h">
|
||||||
<Option target="Atop"/>
|
<Option target="Atop"/>
|
||||||
</Unit>
|
</Unit>
|
||||||
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/init.c">
|
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/filter.c">
|
||||||
<Option target="Atop"/>
|
<Option target="Atop"/>
|
||||||
</Unit>
|
</Unit>
|
||||||
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/init.h">
|
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/filter.h">
|
||||||
<Option target="Atop"/>
|
<Option target="Atop"/>
|
||||||
</Unit>
|
</Unit>
|
||||||
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/server.c">
|
<Unit filename="/cygdrive/c/Users/Iain/Desktop/vperf/src/server.c">
|
||||||
|
|||||||
@ -8,7 +8,7 @@ set(CMAKE_DEPENDS_CHECK_C
|
|||||||
"/cygdrive/c/Users/Iain/Desktop/vperf/main.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/main.c.o"
|
"/cygdrive/c/Users/Iain/Desktop/vperf/main.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/main.c.o"
|
||||||
"/cygdrive/c/Users/Iain/Desktop/vperf/src/ProcessInfo.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/ProcessInfo.c.o"
|
"/cygdrive/c/Users/Iain/Desktop/vperf/src/ProcessInfo.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/ProcessInfo.c.o"
|
||||||
"/cygdrive/c/Users/Iain/Desktop/vperf/src/SystemInfo.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/SystemInfo.c.o"
|
"/cygdrive/c/Users/Iain/Desktop/vperf/src/SystemInfo.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/SystemInfo.c.o"
|
||||||
"/cygdrive/c/Users/Iain/Desktop/vperf/src/init.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/init.c.o"
|
"/cygdrive/c/Users/Iain/Desktop/vperf/src/filter.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/filter.c.o"
|
||||||
"/cygdrive/c/Users/Iain/Desktop/vperf/src/server.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/server.c.o"
|
"/cygdrive/c/Users/Iain/Desktop/vperf/src/server.c" "/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles/Atop.dir/src/server.c.o"
|
||||||
)
|
)
|
||||||
set(CMAKE_C_COMPILER_ID "GNU")
|
set(CMAKE_C_COMPILER_ID "GNU")
|
||||||
|
|||||||
@ -89,18 +89,18 @@ CMakeFiles/Atop.dir/main.c.s: cmake_force
|
|||||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/Atop.dir/main.c.s"
|
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/Atop.dir/main.c.s"
|
||||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /cygdrive/c/Users/Iain/Desktop/vperf/main.c -o CMakeFiles/Atop.dir/main.c.s
|
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /cygdrive/c/Users/Iain/Desktop/vperf/main.c -o CMakeFiles/Atop.dir/main.c.s
|
||||||
|
|
||||||
CMakeFiles/Atop.dir/src/init.c.o: CMakeFiles/Atop.dir/flags.make
|
CMakeFiles/Atop.dir/src/filter.c.o: CMakeFiles/Atop.dir/flags.make
|
||||||
CMakeFiles/Atop.dir/src/init.c.o: ../src/init.c
|
CMakeFiles/Atop.dir/src/filter.c.o: ../src/filter.c
|
||||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/Atop.dir/src/init.c.o"
|
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/cygdrive/c/Users/Iain/Desktop/vperf/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/Atop.dir/src/filter.c.o"
|
||||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/Atop.dir/src/init.c.o -c /cygdrive/c/Users/Iain/Desktop/vperf/src/init.c
|
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -o CMakeFiles/Atop.dir/src/filter.c.o -c /cygdrive/c/Users/Iain/Desktop/vperf/src/filter.c
|
||||||
|
|
||||||
CMakeFiles/Atop.dir/src/init.c.i: cmake_force
|
CMakeFiles/Atop.dir/src/filter.c.i: cmake_force
|
||||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/Atop.dir/src/init.c.i"
|
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing C source to CMakeFiles/Atop.dir/src/filter.c.i"
|
||||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /cygdrive/c/Users/Iain/Desktop/vperf/src/init.c > CMakeFiles/Atop.dir/src/init.c.i
|
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /cygdrive/c/Users/Iain/Desktop/vperf/src/filter.c > CMakeFiles/Atop.dir/src/filter.c.i
|
||||||
|
|
||||||
CMakeFiles/Atop.dir/src/init.c.s: cmake_force
|
CMakeFiles/Atop.dir/src/filter.c.s: cmake_force
|
||||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/Atop.dir/src/init.c.s"
|
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling C source to assembly CMakeFiles/Atop.dir/src/filter.c.s"
|
||||||
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /cygdrive/c/Users/Iain/Desktop/vperf/src/init.c -o CMakeFiles/Atop.dir/src/init.c.s
|
/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /cygdrive/c/Users/Iain/Desktop/vperf/src/filter.c -o CMakeFiles/Atop.dir/src/filter.c.s
|
||||||
|
|
||||||
CMakeFiles/Atop.dir/src/SystemInfo.c.o: CMakeFiles/Atop.dir/flags.make
|
CMakeFiles/Atop.dir/src/SystemInfo.c.o: CMakeFiles/Atop.dir/flags.make
|
||||||
CMakeFiles/Atop.dir/src/SystemInfo.c.o: ../src/SystemInfo.c
|
CMakeFiles/Atop.dir/src/SystemInfo.c.o: ../src/SystemInfo.c
|
||||||
@ -157,7 +157,7 @@ CMakeFiles/Atop.dir/include/cJSON.c.s: cmake_force
|
|||||||
# Object files for target Atop
|
# Object files for target Atop
|
||||||
Atop_OBJECTS = \
|
Atop_OBJECTS = \
|
||||||
"CMakeFiles/Atop.dir/main.c.o" \
|
"CMakeFiles/Atop.dir/main.c.o" \
|
||||||
"CMakeFiles/Atop.dir/src/init.c.o" \
|
"CMakeFiles/Atop.dir/src/filter.c.o" \
|
||||||
"CMakeFiles/Atop.dir/src/SystemInfo.c.o" \
|
"CMakeFiles/Atop.dir/src/SystemInfo.c.o" \
|
||||||
"CMakeFiles/Atop.dir/src/ProcessInfo.c.o" \
|
"CMakeFiles/Atop.dir/src/ProcessInfo.c.o" \
|
||||||
"CMakeFiles/Atop.dir/src/server.c.o" \
|
"CMakeFiles/Atop.dir/src/server.c.o" \
|
||||||
@ -167,7 +167,7 @@ Atop_OBJECTS = \
|
|||||||
Atop_EXTERNAL_OBJECTS =
|
Atop_EXTERNAL_OBJECTS =
|
||||||
|
|
||||||
Atop.exe: CMakeFiles/Atop.dir/main.c.o
|
Atop.exe: CMakeFiles/Atop.dir/main.c.o
|
||||||
Atop.exe: CMakeFiles/Atop.dir/src/init.c.o
|
Atop.exe: CMakeFiles/Atop.dir/src/filter.c.o
|
||||||
Atop.exe: CMakeFiles/Atop.dir/src/SystemInfo.c.o
|
Atop.exe: CMakeFiles/Atop.dir/src/SystemInfo.c.o
|
||||||
Atop.exe: CMakeFiles/Atop.dir/src/ProcessInfo.c.o
|
Atop.exe: CMakeFiles/Atop.dir/src/ProcessInfo.c.o
|
||||||
Atop.exe: CMakeFiles/Atop.dir/src/server.c.o
|
Atop.exe: CMakeFiles/Atop.dir/src/server.c.o
|
||||||
|
|||||||
@ -5,7 +5,7 @@ file(REMOVE_RECURSE
|
|||||||
"CMakeFiles/Atop.dir/main.c.o"
|
"CMakeFiles/Atop.dir/main.c.o"
|
||||||
"CMakeFiles/Atop.dir/src/ProcessInfo.c.o"
|
"CMakeFiles/Atop.dir/src/ProcessInfo.c.o"
|
||||||
"CMakeFiles/Atop.dir/src/SystemInfo.c.o"
|
"CMakeFiles/Atop.dir/src/SystemInfo.c.o"
|
||||||
"CMakeFiles/Atop.dir/src/init.c.o"
|
"CMakeFiles/Atop.dir/src/filter.c.o"
|
||||||
"CMakeFiles/Atop.dir/src/server.c.o"
|
"CMakeFiles/Atop.dir/src/server.c.o"
|
||||||
"libAtop.dll.a"
|
"libAtop.dll.a"
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
/usr/bin/cc -g -Wl,--enable-auto-import CMakeFiles/Atop.dir/main.c.o CMakeFiles/Atop.dir/src/init.c.o CMakeFiles/Atop.dir/src/SystemInfo.c.o CMakeFiles/Atop.dir/src/ProcessInfo.c.o CMakeFiles/Atop.dir/src/server.c.o CMakeFiles/Atop.dir/include/cJSON.c.o -o Atop.exe -Wl,--out-implib,libAtop.dll.a -Wl,--major-image-version,0,--minor-image-version,0
|
/usr/bin/cc -g -Wl,--enable-auto-import CMakeFiles/Atop.dir/main.c.o CMakeFiles/Atop.dir/src/filter.c.o CMakeFiles/Atop.dir/src/SystemInfo.c.o CMakeFiles/Atop.dir/src/ProcessInfo.c.o CMakeFiles/Atop.dir/src/server.c.o CMakeFiles/Atop.dir/include/cJSON.c.o -o Atop.exe -Wl,--out-implib,libAtop.dll.a -Wl,--major-image-version,0,--minor-image-version,0
|
||||||
|
|||||||
@ -250,32 +250,32 @@ src/SystemInfo.c.s:
|
|||||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/SystemInfo.c.s
|
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/SystemInfo.c.s
|
||||||
.PHONY : src/SystemInfo.c.s
|
.PHONY : src/SystemInfo.c.s
|
||||||
|
|
||||||
src/init.o: src/init.c.o
|
src/filter.o: src/filter.c.o
|
||||||
|
|
||||||
.PHONY : src/init.o
|
.PHONY : src/filter.o
|
||||||
|
|
||||||
# target to build an object file
|
# target to build an object file
|
||||||
src/init.c.o:
|
src/filter.c.o:
|
||||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/init.c.o
|
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/filter.c.o
|
||||||
.PHONY : src/init.c.o
|
.PHONY : src/filter.c.o
|
||||||
|
|
||||||
src/init.i: src/init.c.i
|
src/filter.i: src/filter.c.i
|
||||||
|
|
||||||
.PHONY : src/init.i
|
.PHONY : src/filter.i
|
||||||
|
|
||||||
# target to preprocess a source file
|
# target to preprocess a source file
|
||||||
src/init.c.i:
|
src/filter.c.i:
|
||||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/init.c.i
|
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/filter.c.i
|
||||||
.PHONY : src/init.c.i
|
.PHONY : src/filter.c.i
|
||||||
|
|
||||||
src/init.s: src/init.c.s
|
src/filter.s: src/filter.c.s
|
||||||
|
|
||||||
.PHONY : src/init.s
|
.PHONY : src/filter.s
|
||||||
|
|
||||||
# target to generate assembly for a file
|
# target to generate assembly for a file
|
||||||
src/init.c.s:
|
src/filter.c.s:
|
||||||
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/init.c.s
|
$(MAKE) $(MAKESILENT) -f CMakeFiles/Atop.dir/build.make CMakeFiles/Atop.dir/src/filter.c.s
|
||||||
.PHONY : src/init.c.s
|
.PHONY : src/filter.c.s
|
||||||
|
|
||||||
src/server.o: src/server.c.o
|
src/server.o: src/server.c.o
|
||||||
|
|
||||||
@ -325,9 +325,9 @@ help:
|
|||||||
@echo "... src/SystemInfo.o"
|
@echo "... src/SystemInfo.o"
|
||||||
@echo "... src/SystemInfo.i"
|
@echo "... src/SystemInfo.i"
|
||||||
@echo "... src/SystemInfo.s"
|
@echo "... src/SystemInfo.s"
|
||||||
@echo "... src/init.o"
|
@echo "... src/filter.o"
|
||||||
@echo "... src/init.i"
|
@echo "... src/filter.i"
|
||||||
@echo "... src/init.s"
|
@echo "... src/filter.s"
|
||||||
@echo "... src/server.o"
|
@echo "... src/server.o"
|
||||||
@echo "... src/server.i"
|
@echo "... src/server.i"
|
||||||
@echo "... src/server.s"
|
@echo "... src/server.s"
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
Start testing: Jul 21 00:14
|
Start testing: Jul 21 12:35
|
||||||
----------------------------------------------------------
|
----------------------------------------------------------
|
||||||
End testing: Jul 21 00:14
|
End testing: Jul 21 12:35
|
||||||
|
|||||||
@ -2,22 +2,38 @@
|
|||||||
// Created by Iain on 2021/7/17.
|
// Created by Iain on 2021/7/17.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
#include "SystemInfo.h"
|
||||||
#include<stdio.h>
|
#include<stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#define BUFFER_SIZE_MEMINFO 128
|
#define BUFFER_SIZE_MEMINFO 128
|
||||||
|
#define SYSTEM_CPU_INFO_PATH "/proc/stat"
|
||||||
#define SYSTEM_MEM_INFO_PATH "/proc/meminfo"
|
#define SYSTEM_MEM_INFO_PATH "/proc/meminfo"
|
||||||
|
|
||||||
void updateSystemMem(unsigned int *all, unsigned int *fre, float *useage) {
|
void updateSystemCPU(Sys_CPU_Time *cpuInfo) {
|
||||||
char buf[BUFFER_SIZE_MEMINFO]; /*缓冲区*/
|
char buf[BUFFER_SIZE_MEMINFO]; /*缓冲区*/
|
||||||
FILE *fp; /*文件指针*/
|
FILE *fp; /*文件指针*/
|
||||||
|
if ((fp = fopen(SYSTEM_CPU_INFO_PATH, "r")) == NULL) {
|
||||||
|
perror("fail to read /proc/meminfo");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
fgets(buf, BUFFER_SIZE_MEMINFO, fp);
|
||||||
|
sscanf(buf, "cpu: %u kB", cpuInfo->user, cpuInfo->nice, cpuInfo->system, cpuInfo->idle);
|
||||||
|
*useage = 1 - (float) *fre / *all;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
void updateSystemMem(Sys_Mem *memInfo) {
|
||||||
|
char buf[BUFFER_SIZE_MEMINFO]; /*缓冲区*/
|
||||||
|
FILE *fp; /*文件指针*/
|
||||||
if ((fp = fopen(SYSTEM_MEM_INFO_PATH, "r")) == NULL) {
|
if ((fp = fopen(SYSTEM_MEM_INFO_PATH, "r")) == NULL) {
|
||||||
perror("fail to read /proc/meminfo");
|
perror("fail to read /proc/meminfo");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
fgets(buf, BUFFER_SIZE_MEMINFO, fp);
|
fgets(buf, BUFFER_SIZE_MEMINFO, fp);
|
||||||
sscanf(buf, "MemTotal: %u kB", all);
|
sscanf(buf, "MemTotal: %u kB", memInfo->All);
|
||||||
fgets(buf, BUFFER_SIZE_MEMINFO, fp);
|
fgets(buf, BUFFER_SIZE_MEMINFO, fp);
|
||||||
sscanf(buf, "MemFree %u kB", fre);
|
sscanf(buf, "MemFree %u kB", memInfo->Free);
|
||||||
*useage = 1 - (float) *fre / *all;
|
memInfo->Usage = 1 - (float) memInfo->Free / memInfo->All;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,25 +5,18 @@
|
|||||||
#ifndef ATOP_SYSTEMINFO_H
|
#ifndef ATOP_SYSTEMINFO_H
|
||||||
#define ATOP_SYSTEMINFO_H
|
#define ATOP_SYSTEMINFO_H
|
||||||
|
|
||||||
typedef struct {
|
typedef struct Sys_CPU_Time_ {
|
||||||
|
float Usage;
|
||||||
unsigned long user;
|
unsigned long user;
|
||||||
unsigned long nice;
|
unsigned long nice;
|
||||||
unsigned long system;
|
unsigned long system;
|
||||||
unsigned long idle;
|
unsigned long idle;
|
||||||
} Total_CPU_Time;
|
} Sys_CPU_Time;
|
||||||
|
|
||||||
struct memGlobal {
|
typedef struct Sys_Mem_ {
|
||||||
|
float Usage;
|
||||||
unsigned int All;
|
unsigned int All;
|
||||||
float Usage;
|
|
||||||
unsigned int Free;
|
unsigned int Free;
|
||||||
} memG;
|
} Sys_Mem;
|
||||||
|
|
||||||
struct cpuGlobal {
|
|
||||||
unsigned long user;
|
|
||||||
unsigned long nice;
|
|
||||||
unsigned long system;
|
|
||||||
unsigned long idle;
|
|
||||||
float Usage;
|
|
||||||
} cpuG;
|
|
||||||
|
|
||||||
#endif //ATOP_SYSTEMINFO_H
|
#endif //ATOP_SYSTEMINFO_H
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user