diff options
| -rw-r--r-- | include/sysinfo.h | 2 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/freebsd/proc.c | 4 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/linux/proc.c | 4 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/netbsd/proc.c | 4 | ||||
| -rw-r--r-- | src/libs/zbxsysinfo/openbsd/proc.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/include/sysinfo.h b/include/sysinfo.h index 1b481ba91d2..7380a252930 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -160,7 +160,7 @@ extern int CONFIG_UNSAFE_USER_PARAMETERS; #define ZBX_PROC_STAT_RUN 1 #define ZBX_PROC_STAT_SLEEP 2 #define ZBX_PROC_STAT_ZOMB 3 -#define ZBX_PROC_STAT_IOWAIT 4 +#define ZBX_PROC_STAT_DISK 4 #define ZBX_PROC_STAT_TRACE 5 #define ZBX_DO_SUM 0 diff --git a/src/libs/zbxsysinfo/freebsd/proc.c b/src/libs/zbxsysinfo/freebsd/proc.c index e34669a4744..042768a1fb1 100644 --- a/src/libs/zbxsysinfo/freebsd/proc.c +++ b/src/libs/zbxsysinfo/freebsd/proc.c @@ -407,7 +407,7 @@ int PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) else if (0 == strcmp(param, "zomb")) zbx_proc_stat = ZBX_PROC_STAT_ZOMB; else if (0 == strcmp(param, "disk")) - zbx_proc_stat = ZBX_PROC_STAT_IOWAIT; + zbx_proc_stat = ZBX_PROC_STAT_DISK; else if (0 == strcmp(param, "trace")) zbx_proc_stat = ZBX_PROC_STAT_TRACE; else @@ -483,7 +483,7 @@ int PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) if (SZOMB == proc[i].ZBX_PROC_STAT) stat_ok = 1; break; - case ZBX_PROC_STAT_IOWAIT: + case ZBX_PROC_STAT_DISK: if (SSLEEP == proc[i].ZBX_PROC_STAT && 0 == (proc[i].ZBX_PROC_TDFLAG & TDF_SINTR)) stat_ok = 1; break; diff --git a/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c index e9ecb622a24..58f0d1dcd87 100644 --- a/src/libs/zbxsysinfo/linux/proc.c +++ b/src/libs/zbxsysinfo/linux/proc.c @@ -222,7 +222,7 @@ static int check_procstate(FILE *f_stat, int zbx_proc_stat) return ('S' == *p) ? SUCCEED : FAIL; case ZBX_PROC_STAT_ZOMB: return ('Z' == *p) ? SUCCEED : FAIL; - case ZBX_PROC_STAT_IOWAIT: + case ZBX_PROC_STAT_DISK: return ('D' == *p) ? SUCCEED : FAIL; case ZBX_PROC_STAT_TRACE: return ('T' == *p) ? SUCCEED : FAIL; @@ -763,7 +763,7 @@ int PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) else if (0 == strcmp(param, "zomb")) zbx_proc_stat = ZBX_PROC_STAT_ZOMB; else if (0 == strcmp(param, "disk")) - zbx_proc_stat = ZBX_PROC_STAT_IOWAIT; + zbx_proc_stat = ZBX_PROC_STAT_DISK; else if (0 == strcmp(param, "trace")) zbx_proc_stat = ZBX_PROC_STAT_TRACE; else diff --git a/src/libs/zbxsysinfo/netbsd/proc.c b/src/libs/zbxsysinfo/netbsd/proc.c index d9008a63ceb..5041a36b82e 100644 --- a/src/libs/zbxsysinfo/netbsd/proc.c +++ b/src/libs/zbxsysinfo/netbsd/proc.c @@ -239,7 +239,7 @@ int PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) else if (0 == strcmp(param, "zomb")) zbx_proc_stat = ZBX_PROC_STAT_ZOMB; else if (0 == strcmp(param, "disk")) - zbx_proc_stat = ZBX_PROC_STAT_IOWAIT; + zbx_proc_stat = ZBX_PROC_STAT_DISK; else if (0 == strcmp(param, "trace")) zbx_proc_stat = ZBX_PROC_STAT_TRACE; else @@ -301,7 +301,7 @@ int PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) if (SZOMB == pproc->p_stat || LSDEAD == pproc->p_stat) stat_ok = 1; break; - case ZBX_PROC_STAT_IOWAIT: + case ZBX_PROC_STAT_DISK: if (LSSLEEP == pproc->p_stat && !(pproc->p_flag & L_SINTR)) stat_ok = 1; break; diff --git a/src/libs/zbxsysinfo/openbsd/proc.c b/src/libs/zbxsysinfo/openbsd/proc.c index cfafd4629a2..91f52c670d0 100644 --- a/src/libs/zbxsysinfo/openbsd/proc.c +++ b/src/libs/zbxsysinfo/openbsd/proc.c @@ -343,7 +343,7 @@ int PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) else if (0 == strcmp(param, "zomb")) zbx_proc_stat = ZBX_PROC_STAT_ZOMB; else if (0 == strcmp(param, "disk")) - zbx_proc_stat = ZBX_PROC_STAT_IOWAIT; + zbx_proc_stat = ZBX_PROC_STAT_DISK; else if (0 == strcmp(param, "trace")) zbx_proc_stat = ZBX_PROC_STAT_TRACE; else @@ -441,7 +441,7 @@ int PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result) if (SZOMB == proc[i].ZBX_P_STAT || SDEAD == proc[i].ZBX_P_STAT) stat_ok = 1; break; - case ZBX_PROC_STAT_IOWAIT: + case ZBX_PROC_STAT_DISK: if (SSLEEP == proc[i].ZBX_P_STAT && !(proc[i].ZBX_P_FLAG & P_SINTR)) stat_ok = 1; break; |