- improved support of proc.num[<process>,<user name>,<all|run|sleep|zomb>] (Eugene)

- added support of system.swap.in.num (Eugene)
- added support of system.swap.in.pages (Eugene)
- added support of system.swap.out.num (Eugene)
- added support of system.swap.out.pages (Eugene)
- added support of kernel.max.proc (Eugene)
- added support of system.cpu.intr (Eugene)
- added support of system.cpu.switches (Eugene)


git-svn-id: svn://svn.zabbix.com/trunk@2189 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 57 insertions, 2 deletions

diff --git a/src/libs/zbxsysinfo/aix/Makefile.am b/src/libs/zbxsysinfo/aix/Makefile.am
index 61445b63..4e57c84f 100644
--- a/src/libs/zbxsysinfo/aix/Makefile.am
+++ b/src/libs/zbxsysinfo/aix/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=
 
-libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c memory.c sensors.c swap.c uptime.c
+libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c memory.c proc.c sensors.c swap.c uptime.c
 
 lib_LIBRARIES=libzbxsysinfo2.a
 libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
diff --git a/src/libs/zbxsysinfo/aix/aix.c b/src/libs/zbxsysinfo/aix/aix.c
index 71da5581..b187dbfe 100644
--- a/src/libs/zbxsysinfo/aix/aix.c
+++ b/src/libs/zbxsysinfo/aix/aix.c
@@ -90,7 +90,10 @@ int	DISKWRITEBLKS15(const char *cmd, const char *parameter,double  *value);
 int	AGENT_PING(const char *cmd, const char *parameter,double  *value);
 int	VM_MEMORY_SHARED(const char *cmd, const char *parameter,double  *value);
 int	VM_MEMORY_TOTAL(const char *cmd, const char *parameter,double  *value);
+
 int	PROC_NUM(const char *cmd, const char *parameter,double  *value);
+int	PROC_MEMORY(const char *cmd, const char *param, double  *value);
+
 int	PROCCOUNT(const char *cmd, const char *parameter,double  *value);
 
 int	SYSTEM_CPU_LOAD1(const char *cmd, const char *parameter,double  *value);
@@ -181,7 +184,8 @@ COMMAND	parameters_specific[]=
 	{"kernel.maxfiles]"	,KERNEL_MAXFILES,	0, 0},
 	{"kernel.maxproc"	,KERNEL_MAXPROC, 	0, 0},
 
-	{"proc.num[*]"		,PROC_NUM, 		0, "inetd"},
+	{"proc.num[*]"		,PROC_NUM, 	        0, "inetd"},
+	{"proc.mem[*]"		,PROC_MEMORY, 	    0, "inetd"},
 
 	{"vm.memory.total"	,VM_MEMORY_TOTAL,	0, 0},
 	{"vm.memory.shared"	,VM_MEMORY_SHARED,	0, 0},
diff --git a/src/libs/zbxsysinfo/aix/proc.c b/src/libs/zbxsysinfo/aix/proc.c
new file mode 100644
index 00000000..6c2e9a53
--- /dev/null
+++ b/src/libs/zbxsysinfo/aix/proc.c
@@ -0,0 +1,51 @@
+/*
+ * ** ZABBIX
+ * ** Copyright (C) 2000-2005 SIA Zabbix
+ * **
+ * ** This program is free software; you can redistribute it and/or modify
+ * ** it under the terms of the GNU General Public License as published by
+ * ** the Free Software Foundation; either version 2 of the License, or
+ * ** (at your option) any later version.
+ * **
+ * ** This program is distributed in the hope that it will be useful,
+ * ** but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * ** GNU General Public License for more details.
+ * **
+ * ** You should have received a copy of the GNU General Public License
+ * ** along with this program; if not, write to the Free Software
+ * ** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * **/
+
+#include "config.h"
+
+#include <errno.h>
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "common.h"
+#include "sysinfo.h"
+
+/*
+#define FDI(f, m) fprintf(stderr, "DEBUG INFO: " f "\n" , m) // show debug info to stderr
+#define SDI(m) FDI("%s", m) // string info
+#define IDI(i) FDI("%i", i) // integer info
+*/
+
+int	PROC_MEMORY(const char *cmd, const char *param,double  *value)
+{
+    /* in this moment this function for this platform unsupported */
+    return	SYSINFO_RET_FAIL;
+}
+
+int	PROC_NUM(const char *cmd, const char *param,double  *value)
+{
+    /* in this moment this function for this platform unsupported */
+    return	SYSINFO_RET_FAIL;
+}
+