mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-08 14:01:49 +02:00
4272e802a1
There two main reasons for this change: * Active support of PHP 5.x ended on January 2017, security support will end on December 2018. Packages in the main repository should be supported for at least 2 years, this means until first quarter of 2019 for the upcoming v3.6. * php7 and its extensions are currently in the community repository, so we can't use single abuild for both php5-* and php7-* packages (as we do for Python and Lua packages). This change was suggested by @vakartel, approved by @ncopa, @kaniini, and @jirutka.
32 lines
794 B
Diff
32 lines
794 B
Diff
--- a/src/libs/zbxsysinfo/linux/cpu.c
|
|
+++ b/src/libs/zbxsysinfo/linux/cpu.c
|
|
@@ -21,6 +21,28 @@
|
|
#include "sysinfo.h"
|
|
#include "stats.h"
|
|
|
|
+#ifndef HAVE_GETLOADAVG
|
|
+/*! \brief Alternative method of getting load avg on Linux only */
|
|
+int getloadavg(double *list, int nelem)
|
|
+{
|
|
+ FILE *LOADAVG;
|
|
+ double avg[3] = { 0.0, 0.0, 0.0 };
|
|
+ int i, res = -1;
|
|
+
|
|
+ if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
|
|
+ fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
|
|
+ res = 0;
|
|
+ fclose(LOADAVG);
|
|
+ }
|
|
+
|
|
+ for (i = 0; (i < nelem) && (i < 3); i++) {
|
|
+ list[i] = avg[i];
|
|
+ }
|
|
+
|
|
+ return res;
|
|
+}
|
|
+#endif
|
|
+
|
|
int SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result)
|
|
{
|
|
char *type;
|