Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/libs/zbxsysinfo/openbsd/swap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/zbxsysinfo/openbsd/swap.c')
-rw-r--r--src/libs/zbxsysinfo/openbsd/swap.c114
1 files changed, 89 insertions, 25 deletions
diff --git a/src/libs/zbxsysinfo/openbsd/swap.c b/src/libs/zbxsysinfo/openbsd/swap.c
index 94c861112bb..dedca757b66 100644
--- a/src/libs/zbxsysinfo/openbsd/swap.c
+++ b/src/libs/zbxsysinfo/openbsd/swap.c
@@ -19,8 +19,10 @@
#include "common.h"
#include "sysinfo.h"
+#include "log.h"
-static int get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *used, double *pfree, double *pused)
+static int get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *used, double *pfree, double *pused,
+ char **error)
{
int mib[2];
size_t len;
@@ -32,7 +34,10 @@ static int get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *
len = sizeof(v);
if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+ {
+ *error = zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno));
return SYSINFO_RET_FAIL;
+ }
/* int pagesize; size of a page (PAGE_SIZE): must be power of 2 */
/* int swpages; number of PAGE_SIZE'ed swap pages */
@@ -55,9 +60,13 @@ static int get_swap_size(zbx_uint64_t *total, zbx_uint64_t *free, zbx_uint64_t *
static int SYSTEM_SWAP_TOTAL(AGENT_RESULT *result)
{
zbx_uint64_t value;
+ char *error;
- if (SYSINFO_RET_OK != get_swap_size(&value, NULL, NULL, NULL, NULL))
+ if (SYSINFO_RET_OK != get_swap_size(&value, NULL, NULL, NULL, NULL, &error))
+ {
+ SET_MSG_RESULT(result, error);
return SYSINFO_RET_FAIL;
+ }
SET_UI64_RESULT(result, value);
@@ -67,9 +76,13 @@ static int SYSTEM_SWAP_TOTAL(AGENT_RESULT *result)
static int SYSTEM_SWAP_FREE(AGENT_RESULT *result)
{
zbx_uint64_t value;
+ char *error;
- if (SYSINFO_RET_OK != get_swap_size(NULL, &value, NULL, NULL, NULL))
+ if (SYSINFO_RET_OK != get_swap_size(NULL, &value, NULL, NULL, NULL, &error))
+ {
+ SET_MSG_RESULT(result, error);
return SYSINFO_RET_FAIL;
+ }
SET_UI64_RESULT(result, value);
@@ -79,9 +92,13 @@ static int SYSTEM_SWAP_FREE(AGENT_RESULT *result)
static int SYSTEM_SWAP_USED(AGENT_RESULT *result)
{
zbx_uint64_t value;
+ char *error;
- if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, &value, NULL, NULL))
+ if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, &value, NULL, NULL, &error))
+ {
+ SET_MSG_RESULT(result, error);
return SYSINFO_RET_FAIL;
+ }
SET_UI64_RESULT(result, value);
@@ -91,9 +108,13 @@ static int SYSTEM_SWAP_USED(AGENT_RESULT *result)
static int SYSTEM_SWAP_PFREE(AGENT_RESULT *result)
{
double value;
+ char *error;
- if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, &value, NULL))
+ if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, &value, NULL, &error))
+ {
+ SET_MSG_RESULT(result, error);
return SYSINFO_RET_FAIL;
+ }
SET_DBL_RESULT(result, value);
@@ -103,9 +124,13 @@ static int SYSTEM_SWAP_PFREE(AGENT_RESULT *result)
static int SYSTEM_SWAP_PUSED(AGENT_RESULT *result)
{
double value;
+ char *error;
- if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, NULL, &value))
+ if (SYSINFO_RET_OK != get_swap_size(NULL, NULL, NULL, NULL, &value, &error))
+ {
+ SET_MSG_RESULT(result, error);
return SYSINFO_RET_FAIL;
+ }
SET_DBL_RESULT(result, value);
@@ -115,17 +140,23 @@ static int SYSTEM_SWAP_PUSED(AGENT_RESULT *result)
int SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
{
char *swapdev, *mode;
- int ret = SYSINFO_RET_FAIL;
+ int ret;
if (2 < request->nparam)
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
return SYSINFO_RET_FAIL;
+ }
swapdev = get_rparam(request, 0);
mode = get_rparam(request, 1);
/* default parameter */
if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
return SYSINFO_RET_FAIL;
+ }
/* default parameter */
if (NULL == mode || *mode == '\0' || 0 == strcmp(mode, "free"))
@@ -139,12 +170,16 @@ int SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result)
else if (0 == strcmp(mode, "pused"))
ret = SYSTEM_SWAP_PUSED(result);
else
- ret = SYSINFO_RET_FAIL;
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
+ return SYSINFO_RET_FAIL;
+ }
return ret;
}
-static int get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t *ocount, zbx_uint64_t *opages)
+static int get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t *ocount, zbx_uint64_t *opages,
+ char **error)
{
int mib[2];
size_t len;
@@ -156,7 +191,10 @@ static int get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t
len = sizeof(v);
if (0 != sysctl(mib, 2, &v, &len, NULL, 0))
+ {
+ *error = zbx_dsprintf(NULL, "Cannot obtain system information: %s", zbx_strerror(errno));
return SYSINFO_RET_FAIL;
+ }
/* int swapins; swapins */
/* int swapouts; swapouts */
@@ -170,7 +208,10 @@ static int get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t
*ocount = (zbx_uint64_t)v.swapouts;
#else
if (NULL != icount || NULL != ocount)
+ {
+ *error = zbx_dsprintf(NULL, "Not supported by the system starting from OpenBSD 5.4.");
return SYSINFO_RET_FAIL;
+ }
#endif
if (NULL != ipages)
*ipages = (zbx_uint64_t)v.pgswapin;
@@ -182,68 +223,91 @@ static int get_swap_io(zbx_uint64_t *icount, zbx_uint64_t *ipages, zbx_uint64_t
int SYSTEM_SWAP_IN(AGENT_REQUEST *request, AGENT_RESULT *result)
{
- char *swapdev, *mode;
- zbx_uint64_t value = 0;
+ int ret;
+ char *swapdev, *mode, *error;
+ zbx_uint64_t value;
if (2 < request->nparam)
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
return SYSINFO_RET_FAIL;
+ }
swapdev = get_rparam(request, 0);
mode = get_rparam(request, 1);
/* the only supported parameter */
if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
return SYSINFO_RET_FAIL;
+ }
/* default parameter */
if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "count"))
{
- if (SYSINFO_RET_OK != get_swap_io(&value, NULL, NULL, NULL))
- return SYSINFO_RET_FAIL;
+ ret = get_swap_io(&value, NULL, NULL, NULL, &error);
}
else if (0 == strcmp(mode, "pages"))
{
- if (SYSINFO_RET_OK != get_swap_io(NULL, &value, NULL, NULL))
- return SYSINFO_RET_FAIL;
+ ret = get_swap_io(NULL, &value, NULL, NULL, &error);
}
else
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
return SYSINFO_RET_FAIL;
+ }
- SET_UI64_RESULT(result, value);
+ if (SYSINFO_RET_OK == ret)
+ SET_UI64_RESULT(result, value);
+ else
+ SET_MSG_RESULT(result, error);
- return SYSINFO_RET_OK;
+ return ret;
}
int SYSTEM_SWAP_OUT(AGENT_REQUEST *request, AGENT_RESULT *result)
{
- char *swapdev, *mode;
- zbx_uint64_t value = 0;
+ int ret;
+ char *swapdev, *mode, *error;
+ zbx_uint64_t value;
if (2 < request->nparam)
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Too many parameters."));
return SYSINFO_RET_FAIL;
+ }
swapdev = get_rparam(request, 0);
mode = get_rparam(request, 1);
/* the only supported parameter */
if (NULL != swapdev && '\0' != *swapdev && 0 != strcmp(swapdev, "all"))
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid first parameter."));
return SYSINFO_RET_FAIL;
+ }
/* default parameter */
if (NULL == mode || '\0' == *mode || 0 == strcmp(mode, "count"))
{
- if (SYSINFO_RET_OK != get_swap_io(NULL, NULL, &value, NULL))
- return SYSINFO_RET_FAIL;
+ ret = get_swap_io(NULL, NULL, &value, NULL, &error);
}
else if (0 == strcmp(mode, "pages"))
{
- if (SYSINFO_RET_OK != get_swap_io(NULL, NULL, NULL, &value))
- return SYSINFO_RET_FAIL;
+ ret = get_swap_io(NULL, NULL, NULL, &value, &error);
}
else
+ {
+ SET_MSG_RESULT(result, zbx_strdup(NULL, "Invalid second parameter."));
return SYSINFO_RET_FAIL;
+ }
- SET_UI64_RESULT(result, value);
+ if (SYSINFO_RET_OK == ret)
+ SET_UI64_RESULT(result, value);
+ else
+ SET_MSG_RESULT(result, error);
- return SYSINFO_RET_OK;
+
+ return ret;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 21:49:03 +0300