...G...... [ZBXNEXT-1550] introduced cleaner and more efficient api for calling agent functions, same as for loadable modules

1 files changed, 42 insertions, 42 deletions

diff --git a/include/sysinfo.h b/include/sysinfo.h
index 31dabd79020..9c750f3cd1b 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -189,53 +189,53 @@ int	set_result_type(AGENT_RESULT *result, int value_type, int data_type, char *c
 
 /* external system functions */
 
-int	GET_SENSOR(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	KERNEL_MAXFILES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	KERNEL_MAXPROC(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	PROC_MEM(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	PROC_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_IF_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_IF_OUT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_IF_TOTAL(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_IF_COLLISIONS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_IF_DISCOVERY(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_TCP_LISTEN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_UDP_LISTEN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_CPU_SWITCHES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_CPU_INTR(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_CPU_LOAD(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_CPU_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_HW_CHASSIS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_HW_CPU(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_HW_DEVICES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_HW_MACADDR(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_SW_ARCH(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_SW_OS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_SW_PACKAGES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_SWAP_IN(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_SWAP_OUT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_SWAP_SIZE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_UPTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SYSTEM_BOOTTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	VFS_DEV_READ(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	VFS_DEV_WRITE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	VFS_FS_INODE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	VFS_FS_SIZE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	VFS_FS_DISCOVERY(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	VM_MEMORY_SIZE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
+int	GET_SENSOR(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	KERNEL_MAXFILES(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	KERNEL_MAXPROC(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	PROC_MEM(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	PROC_NUM(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_IF_IN(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_IF_OUT(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_IF_TOTAL(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_IF_COLLISIONS(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_IF_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_TCP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_UDP_LISTEN(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_CPU_SWITCHES(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_HW_CHASSIS(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_HW_CPU(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_HW_DEVICES(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_HW_MACADDR(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_SW_ARCH(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_SW_OS(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_SW_PACKAGES(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_SWAP_IN(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_SWAP_OUT(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_SWAP_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_UPTIME(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SYSTEM_BOOTTIME(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	VFS_DEV_READ(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	VFS_DEV_WRITE(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	VFS_FS_INODE(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	VFS_FS_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	VFS_FS_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	VM_MEMORY_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result);
 
 #ifdef _WINDOWS
-int	USER_PERF_COUNTER(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	PERF_COUNTER(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SERVICE_STATE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	SERVICES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	PROC_INFO(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
-int	NET_IF_LIST(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
+int	USER_PERF_COUNTER(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	PERF_COUNTER(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SERVICE_STATE(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	SERVICES(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	PROC_INFO(AGENT_REQUEST *request, AGENT_RESULT *result);
+int	NET_IF_LIST(AGENT_REQUEST *request, AGENT_RESULT *result);
 #endif
 
 #ifdef _AIX
-int	SYSTEM_STAT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result);
+int	SYSTEM_STAT(AGENT_REQUEST *request, AGENT_RESULT *result);
 #endif
 
 typedef struct