From 00151562145df50cc65e9902d52d5fa77f89fe50 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 9 Jun 2022 06:52:47 +0200 Subject: Merging upstream version 1.35.0. Signed-off-by: Daniel Baumann --- libnetdata/libnetdata.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libnetdata/libnetdata.h') diff --git a/libnetdata/libnetdata.h b/libnetdata/libnetdata.h index 7f62c882e..34062f2a6 100644 --- a/libnetdata/libnetdata.h +++ b/libnetdata/libnetdata.h @@ -233,12 +233,15 @@ extern __thread size_t log_thread_memory_allocations; #define mallocz(size) mallocz_int(__FILE__, __FUNCTION__, __LINE__, size) #define reallocz(ptr, size) reallocz_int(__FILE__, __FUNCTION__, __LINE__, ptr, size) #define freez(ptr) freez_int(__FILE__, __FUNCTION__, __LINE__, ptr) +#define log_allocations() log_allocations_int(__FILE__, __FUNCTION__, __LINE__) extern char *strdupz_int(const char *file, const char *function, const unsigned long line, const char *s); extern void *callocz_int(const char *file, const char *function, const unsigned long line, size_t nmemb, size_t size); extern void *mallocz_int(const char *file, const char *function, const unsigned long line, size_t size); extern void *reallocz_int(const char *file, const char *function, const unsigned long line, void *ptr, size_t size); extern void freez_int(const char *file, const char *function, const unsigned long line, void *ptr); +extern void log_allocations_int(const char *file, const char *function, const unsigned long line); + #else // NETDATA_LOG_ALLOCATIONS extern char *strdupz(const char *s) MALLOCLIKE NEVERNULL; extern void *callocz(size_t nmemb, size_t size) MALLOCLIKE NEVERNULL; @@ -250,7 +253,7 @@ extern void freez(void *ptr); extern void json_escape_string(char *dst, const char *src, size_t size); extern void json_fix_string(char *s); -extern void *mymmap(const char *filename, size_t size, int flags, int ksm); +extern void *netdata_mmap(const char *filename, size_t size, int flags, int ksm); extern int memory_file_save(const char *filename, void *mem, size_t size); extern int fd_is_valid(int fd); @@ -342,6 +345,8 @@ extern char *netdata_configured_host_prefix; #include "json/json.h" #include "health/health.h" #include "string/utf8.h" +#include "onewayalloc/onewayalloc.h" +#include "worker_utilization/worker_utilization.h" // BEWARE: Outside of the C code this also exists in alarm-notify.sh #define DEFAULT_CLOUD_BASE_URL "https://app.netdata.cloud" -- cgit v1.2.3