projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.4' into collectd-4.5
[collectd.git]
/
src
/
memory.c
diff --git
a/src/memory.c
b/src/memory.c
index
c9cb834
..
c31b30e
100644
(file)
--- a/
src/memory.c
+++ b/
src/memory.c
@@
-43,6
+43,10
@@
# include <mach/vm_statistics.h>
#endif
# include <mach/vm_statistics.h>
#endif
+#if HAVE_STATGRAB_H
+# include <statgrab.h>
+#endif
+
/* vm_statistics_data_t */
#if HAVE_HOST_STATISTICS
static mach_port_t port_host;
/* vm_statistics_data_t */
#if HAVE_HOST_STATISTICS
static mach_port_t port_host;
@@
-62,6
+66,10
@@
static int pagesize;
static kstat_t *ksp;
/* #endif HAVE_LIBKSTAT */
static kstat_t *ksp;
/* #endif HAVE_LIBKSTAT */
+#elif HAVE_LIBSTATGRAB
+/* no global variables */
+/* endif HAVE_LIBSTATGRAB */
+
#else
# error "No applicable input method."
#endif
#else
# error "No applicable input method."
#endif
@@
-101,9
+109,9
@@
static void memory_submit (const char *type_instance, gauge_t value)
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- s
trcpy (vl.host, hostname_g
);
- s
trcpy (vl.plugin, "memory"
);
- s
trcpy (vl.type, "memory"
);
+ s
strncpy (vl.host, hostname_g, sizeof (vl.host)
);
+ s
strncpy (vl.plugin, "memory", sizeof (vl.plugin)
);
+ s
strncpy (vl.type, "memory", sizeof (vl.type)
);
sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
@@
-218,7
+226,7
@@
static int memory_read (void)
memory_submit ("cache", sysctl_vals[6]);
/* #endif HAVE_SYSCTLBYNAME */
memory_submit ("cache", sysctl_vals[6]);
/* #endif HAVE_SYSCTLBYNAME */
-#elif
defined(KERNEL_LINUX)
+#elif
KERNEL_LINUX
FILE *fh;
char buffer[1024];
FILE *fh;
char buffer[1024];
@@
-276,9
+284,9
@@
static int memory_read (void)
memory_submit ("cached", mem_cached);
memory_submit ("free", mem_free);
}
memory_submit ("cached", mem_cached);
memory_submit ("free", mem_free);
}
-/* #endif
defined(KERNEL_LINUX)
*/
+/* #endif
KERNEL_LINUX
*/
-#elif
defined(HAVE_LIBKSTAT)
+#elif
HAVE_LIBKSTAT
long long mem_used;
long long mem_free;
long long mem_lock;
long long mem_used;
long long mem_free;
long long mem_lock;
@@
-303,15
+311,15
@@
static int memory_read (void)
memory_submit ("used", mem_used);
memory_submit ("free", mem_free);
memory_submit ("locked", mem_lock);
memory_submit ("used", mem_used);
memory_submit ("free", mem_free);
memory_submit ("locked", mem_lock);
-/* #endif
defined(HAVE_LIBKSTAT)
*/
+/* #endif
HAVE_LIBKSTAT
*/
-#elif
defined(HAVE_LIBSTATGRAB)
+#elif
HAVE_LIBSTATGRAB
sg_mem_stats *ios;
if ((ios = sg_get_mem_stats ()) != NULL)
{
memory_submit ("used", ios->used);
sg_mem_stats *ios;
if ((ios = sg_get_mem_stats ()) != NULL)
{
memory_submit ("used", ios->used);
- memory_submit ("cached", ios->cache
d
);
+ memory_submit ("cached", ios->cache);
memory_submit ("free", ios->free);
}
#endif /* HAVE_LIBSTATGRAB */
memory_submit ("free", ios->free);
}
#endif /* HAVE_LIBSTATGRAB */