- [ZBX-370] fixed cpu.c for system.cpu.load[] processing

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

3 files changed, 9 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index fde48fea..d1b42101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -124,6 +124,10 @@ Changes for 1.5:
  - changed how is showed messages (Artem)
  - added login/logout (Artem)
 
+Changes for 1.4.7:
+
+ - [ZBX-370] fixed cpu.c for system.cpu.load[] processing (Sasha)
+
 Changes for 1.4.6:
 
  - [ZBX-404] fixed update of item "Download speed for scenario '...'" (Sasha)
diff --git a/go b/go
index 2725e85f..fdfcd9fe 100755
--- a/go
+++ b/go
@@ -27,24 +27,14 @@ automake
 echo Configuring...
 #export CFLAGS="-Wall -Wuninitialized -O -DDEBUG"
 export CFLAGS="-Wall -Wuninitialized -O -g"
-cd create/schema
-./gen.pl c >../../src/libs/zbxdbhigh/dbschema.c
-echo -e "\n#ifdef HAVE_MYSQL\nconst char *db_schema= {\"\\">>../../src/libs/zbxdbhigh/dbschema.c
-./gen.pl mysql|sed -e 's/\t\t*/ /g' -e 's/$/\\/' >>../../src/libs/zbxdbhigh/dbschema.c
-echo -e "\"};\n#elif HAVE_POSTGRESQL\nconst char *db_schema = {\"\\">>../../src/libs/zbxdbhigh/dbschema.c
-./gen.pl postgresql|sed -e 's/\t\t*/ /g' -e 's/$/\\/' >>../../src/libs/zbxdbhigh/dbschema.c
-echo -e "\"};\n#elif HAVE_ORACLE\nconst char *db_schema = {\"\\">>../../src/libs/zbxdbhigh/dbschema.c
-./gen.pl oracle|sed -e 's/\t\t*/ /g' -e 's/$/\\/' >>../../src/libs/zbxdbhigh/dbschema.c
-echo -e "\"};\n#elif HAVE_SQLITE3\nconst char *db_schema = {\"\\" >>../../src/libs/zbxdbhigh/dbschema.c
-./gen.pl sqlite|sed -e 's/\t\t*/ /g' -e 's/$/\\/' >>../../src/libs/zbxdbhigh/dbschema.c
-echo -e "\"};\n#endif /* HAVE_SQLITE3 */\n" >>../../src/libs/zbxdbhigh/dbschema.c
-cd -
 #export CFLAGS="-Wall -pedantic"
 #for db in sqlite3 pgsql mysql; do
 for db in mysql; do
 	./configure --enable-proxy --enable-agent --enable-server --with-jabber --with-ldap --with-libcurl --with-$db --with-net-snmp --prefix=`pwd` --enable-ipv6 2>>WARNINGS >/dev/null
 	echo Cleaning...
 	make clean 2>>WARNINGS >/dev/null
+	echo Making dbschema...
+	make dbschema 2>>WARNINGS >/dev/null
 	echo Making...
 	make 2>>WARNINGS >/dev/null
 	echo Installing...
diff --git a/src/libs/zbxsysinfo/solaris/cpu.c b/src/libs/zbxsysinfo/solaris/cpu.c
index 44d2c9d2..75c0041f 100644
--- a/src/libs/zbxsysinfo/solaris/cpu.c
+++ b/src/libs/zbxsysinfo/solaris/cpu.c
@@ -222,7 +222,7 @@ int	SYSTEM_CPU_UTIL(const char *cmd, const char *param, unsigned flags, AGENT_RE
 
 static int	SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-#ifdef	HAVE_PROC_LOADAVG
+#ifdef	HAVE_GETLOADAVG
 	double	load[3];
 
 	assert(result);
@@ -245,7 +245,7 @@ static int	SYSTEM_CPU_LOAD1(const char *cmd, const char *param, unsigned flags,
 
 static int	SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-#ifdef	HAVE_PROC_LOADAVG
+#ifdef	HAVE_GETLOADAVG
 	double	load[3];
 
 	assert(result);
@@ -268,7 +268,7 @@ static int	SYSTEM_CPU_LOAD5(const char *cmd, const char *param, unsigned flags,
 	       
 static int	SYSTEM_CPU_LOAD15(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
-#ifdef	HAVE_PROC_LOADAVG
+#ifdef	HAVE_GETLOADAVG
 	double	load[3];
 
 	assert(result);