xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

first statis

This commit is contained in:
dmchen 2024-02-25 03:45:30 +00:00
parent 2df6ae1116
commit e27138e413
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source/os/src/osSysinfo.c
View File

@ -563,9 +563,9 @@ int32_t taosGetCpuCores(float *numOfCores, bool physical) {
} }
void taosGetCpuUsage(double *cpu_system, double *cpu_engine) { void taosGetCpuUsage(double *cpu_system, double *cpu_engine) {
static int64_t lastSysUsed = 0; static int64_t lastSysUsed = -1;
static int64_t lastSysTotal = 0; static int64_t lastSysTotal = -1;
static int64_t lastProcTotal = 0; static int64_t lastProcTotal = -1;
static int64_t curSysUsed = 0; static int64_t curSysUsed = 0;
static int64_t curSysTotal = 0; static int64_t curSysTotal = 0;
static int64_t curProcTotal = 0; static int64_t curProcTotal = 0;
@ -580,14 +580,20 @@ void taosGetCpuUsage(double *cpu_system, double *cpu_engine) {
curSysTotal = curSysUsed + sysCpu.idle; curSysTotal = curSysUsed + sysCpu.idle;
curProcTotal = procCpu.utime + procCpu.stime + procCpu.cutime + procCpu.cstime; curProcTotal = procCpu.utime + procCpu.stime + procCpu.cutime + procCpu.cstime;
if (curSysTotal - lastSysTotal > 0 && curSysUsed >= lastSysUsed && curProcTotal >= lastProcTotal) { if(lastSysUsed >= 0 && lastSysTotal >=0 && lastProcTotal >=0){
if (cpu_system != NULL) { if (curSysTotal - lastSysTotal > 0 && curSysUsed >= lastSysUsed && curProcTotal >= lastProcTotal) {
*cpu_system = (curSysUsed - lastSysUsed) / (double)(curSysTotal - lastSysTotal) * 100; if (cpu_system != NULL) {
} *cpu_system = (curSysUsed - lastSysUsed) / (double)(curSysTotal - lastSysTotal) * 100;
if (cpu_engine != NULL) { }
*cpu_engine = (curProcTotal - lastProcTotal) / (double)(curSysTotal - lastSysTotal) * 100; if (cpu_engine != NULL) {
*cpu_engine = (curProcTotal - lastProcTotal) / (double)(curSysTotal - lastSysTotal) * 100;
}
} }
} }
else{
*cpu_system = 0;
*cpu_engine = 0;
}
lastSysUsed = curSysUsed; lastSysUsed = curSysUsed;
lastSysTotal = curSysTotal; lastSysTotal = curSysTotal;
@ -821,19 +827,27 @@ int32_t taosGetProcIO(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int
} }
void taosGetProcIODelta(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) { void taosGetProcIODelta(int64_t *rchars, int64_t *wchars, int64_t *read_bytes, int64_t *write_bytes) {
static int64_t last_rchars = 0; static int64_t last_rchars = -1;
static int64_t last_wchars = 0; static int64_t last_wchars = -1;
static int64_t last_read_bytes = 0; static int64_t last_read_bytes = -1;
static int64_t last_write_bytes = 0; static int64_t last_write_bytes = -1;
static int64_t cur_rchars = 0; static int64_t cur_rchars = 0;
static int64_t cur_wchars = 0; static int64_t cur_wchars = 0;
static int64_t cur_read_bytes = 0; static int64_t cur_read_bytes = 0;
static int64_t cur_write_bytes = 0; static int64_t cur_write_bytes = 0;
if (taosGetProcIO(&cur_rchars, &cur_wchars, &cur_read_bytes, &cur_write_bytes) == 0) { if (taosGetProcIO(&cur_rchars, &cur_wchars, &cur_read_bytes, &cur_write_bytes) == 0) {
*rchars = cur_rchars - last_rchars; if(last_rchars >=0 && last_wchars >=0 && last_read_bytes >=0 && last_write_bytes >= 0){
*wchars = cur_wchars - last_wchars; *rchars = cur_rchars - last_rchars;
*read_bytes = cur_read_bytes - last_read_bytes; *wchars = cur_wchars - last_wchars;
*write_bytes = cur_write_bytes - last_write_bytes; *read_bytes = cur_read_bytes - last_read_bytes;
*write_bytes = cur_write_bytes - last_write_bytes;
}
else{
*rchars = 0;
*wchars = 0;
*read_bytes = 0;
*write_bytes = 0;
}
last_rchars = cur_rchars; last_rchars = cur_rchars;
last_wchars = cur_wchars; last_wchars = cur_wchars;
last_read_bytes = cur_read_bytes; last_read_bytes = cur_read_bytes;
@ -900,12 +914,12 @@ int32_t taosGetCardInfo(int64_t *receive_bytes, int64_t *transmit_bytes) {
} }
void taosGetCardInfoDelta(int64_t *receive_bytes, int64_t *transmit_bytes) { void taosGetCardInfoDelta(int64_t *receive_bytes, int64_t *transmit_bytes) {
static int64_t last_receive_bytes = 0; static int64_t last_receive_bytes = -1;
static int64_t last_transmit_bytes = 0; static int64_t last_transmit_bytes = -1;
int64_t cur_receive_bytes = 0; int64_t cur_receive_bytes = 0;
int64_t cur_transmit_bytes = 0; int64_t cur_transmit_bytes = 0;
if (taosGetCardInfo(&cur_receive_bytes, &cur_transmit_bytes) == 0) { if (taosGetCardInfo(&cur_receive_bytes, &cur_transmit_bytes) == 0) {
if(last_receive_bytes > 0 && last_receive_bytes > 0){ if(last_receive_bytes >= 0 && last_transmit_bytes >= 0){
*receive_bytes = cur_receive_bytes - last_receive_bytes; *receive_bytes = cur_receive_bytes - last_receive_bytes;
*transmit_bytes = cur_transmit_bytes - last_transmit_bytes; *transmit_bytes = cur_transmit_bytes - last_transmit_bytes;
} }