From d079b656b4719739b2247dcd9d46e9bec793095a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 6 Feb 2023 17:11:34 +0100
Subject: Merging upstream version 1.38.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 CMakeLists.txt | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c12e9c81b..263fb8125 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -453,8 +453,8 @@ set(LIBNETDATA_FILES
         libnetdata/adaptive_resortable_list/adaptive_resortable_list.h
         libnetdata/config/appconfig.c
         libnetdata/config/appconfig.h
-        libnetdata/arrayalloc/arrayalloc.c
-        libnetdata/arrayalloc/arrayalloc.h
+        libnetdata/aral/aral.c
+        libnetdata/aral/aral.h
         libnetdata/avl/avl.c
         libnetdata/avl/avl.h
         libnetdata/buffer/buffer.c
@@ -471,6 +471,8 @@ set(LIBNETDATA_FILES
         libnetdata/eval/eval.h
         libnetdata/health/health.c
         libnetdata/health/health.h
+        libnetdata/july/july.c
+        libnetdata/july/july.h
         libnetdata/inlined.h
         libnetdata/json/json.c
         libnetdata/json/json.h
@@ -775,8 +777,12 @@ set(RRD_PLUGIN_FILES
         database/engine/rrdengineapi.h
         database/engine/pagecache.c
         database/engine/pagecache.h
-        database/engine/rrdenglocking.c
-        database/engine/rrdenglocking.h
+        database/engine/cache.c
+        database/engine/cache.h
+        database/engine/metric.c
+        database/engine/metric.h
+        database/engine/pdc.c
+        database/engine/pdc.h
         database/KolmogorovSmirnovDist.c
         database/KolmogorovSmirnovDist.h
         )
@@ -938,8 +944,6 @@ set(MQTT_WEBSOCKETS_FILES
         mqtt_websockets/c-rbuf/src/ringbuffer.c
         mqtt_websockets/c-rbuf/include/ringbuffer.h
         mqtt_websockets/c-rbuf/src/ringbuffer_internal.h
-        mqtt_websockets/MQTT-C/src/mqtt.c
-        mqtt_websockets/MQTT-C/include/mqtt.h
         )
 
 set(SPAWN_PLUGIN_FILES
@@ -1002,6 +1006,8 @@ set(DAEMON_FILES
         daemon/common.h
         daemon/daemon.c
         daemon/daemon.h
+        daemon/event_loop.c
+        daemon/event_loop.h
         daemon/global_statistics.c
         daemon/global_statistics.h
         daemon/analytics.c
@@ -1030,12 +1036,17 @@ set(ML_FILES
 IF(ENABLE_ML)
     message(STATUS "ML: enabled")
     list(APPEND ML_FILES
+            ml/ADCharts.h
+            ml/ADCharts.cc
+            ml/Chart.h
+            ml/Chart.cc
             ml/Config.h
             ml/Config.cc
-            ml/Dimension.cc
             ml/Dimension.h
+            ml/Dimension.cc
             ml/Host.h
             ml/Host.cc
+            ml/Mutex.h
             ml/Query.h
             ml/KMeans.h
             ml/KMeans.cc
@@ -1260,7 +1271,6 @@ list(APPEND NETDATA_COMMON_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
 list(APPEND NETDATA_COMMON_CFLAGS ${PROTOBUF_CFLAGS_OTHER})
 list(APPEND NETDATA_FILES ${ACLK_FILES} ${ACLK_PROTO_BUILT_SRCS} ${ACLK_PROTO_BUILT_HDRS})
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/aclk/aclk-schemas)
-include_directories(BEFORE ${CMAKE_SOURCE_DIR}/mqtt_websockets/MQTT-C/include)
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/mqtt_websockets/src/include)
 include_directories(BEFORE ${CMAKE_SOURCE_DIR}/mqtt_websockets/c-rbuf/include)
 
@@ -1269,7 +1279,8 @@ ADD_LIBRARY(mqttwebsockets STATIC
 
 target_compile_options(mqttwebsockets PUBLIC
                         -DMQTT_WSS_CUSTOM_ALLOC
-                        -DRBUF_CUSTOM_MALLOC)
+                        -DRBUF_CUSTOM_MALLOC
+                        -DMQTT_WSS_CPUSTATS)
 
 target_include_directories(mqttwebsockets PUBLIC
              ${CMAKE_SOURCE_DIR}/aclk/helpers)
-- 
cgit v1.2.3