From d079b656b4719739b2247dcd9d46e9bec793095a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 6 Feb 2023 17:11:34 +0100 Subject: Merging upstream version 1.38.0. Signed-off-by: Daniel Baumann --- Makefile.am | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 5e1605237..3eaf1ee8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,6 @@ CLEANFILES = \ EXTRA_DIST = \ .gitignore \ - .csslintrc \ .eslintignore \ .eslintrc \ .github/CODEOWNERS \ @@ -132,8 +131,8 @@ 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 \ @@ -149,6 +148,8 @@ LIBNETDATA_FILES = \ libnetdata/eval/eval.c \ libnetdata/eval/eval.h \ libnetdata/inlined.h \ + libnetdata/july/july.c \ + libnetdata/july/july.h \ libnetdata/libnetdata.c \ libnetdata/libnetdata.h \ libnetdata/required_dummies.h \ @@ -236,10 +237,15 @@ ML_FILES += \ ml/ADCharts.cc \ ml/Config.h \ ml/Config.cc \ + ml/Chart.cc \ + ml/Chart.h \ + ml/Stats.h \ ml/Dimension.cc \ ml/Dimension.h \ ml/Host.h \ ml/Host.cc \ + ml/Mutex.h \ + ml/Queue.h \ ml/Query.h \ ml/KMeans.h \ ml/KMeans.cc \ @@ -262,13 +268,6 @@ ml/ml.$(OBJEXT) : CXXFLAGS += -Wno-psabi endif - -if ENABLE_ML_TESTS -ML_TESTS_FILES = \ - ml/SamplesBufferTests.cc \ - $(NULL) -endif - IDLEJITTER_PLUGIN_FILES = \ collectors/idlejitter.plugin/plugin_idlejitter.c \ $(NULL) @@ -549,8 +548,12 @@ if ENABLE_DBENGINE 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 \ $(NULL) endif @@ -732,10 +735,15 @@ libmqttwebsockets_a_SOURCES = \ 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 + mqtt_websockets/c_rhash/src/c_rhash.c \ + mqtt_websockets/c_rhash/include/c_rhash.h \ + mqtt_websockets/c_rhash/src/c_rhash_internal.h -libmqttwebsockets_a_CFLAGS = $(CFLAGS) -DMQTT_WSS_CUSTOM_ALLOC -DRBUF_CUSTOM_MALLOC -I$(srcdir)/aclk/helpers +libmqttwebsockets_a_CFLAGS = $(CFLAGS) -DMQTT_WSS_CUSTOM_ALLOC -DRBUF_CUSTOM_MALLOC -DMQTT_WSS_CPUSTATS -I$(srcdir)/aclk/helpers -I$(srcdir)/mqtt_websockets/c_rhash/include + +if MQTT_WSS_DEBUG +libmqttwebsockets_a_CFLAGS += -DMQTT_WSS_DEBUG +endif mqtt_websockets/src/mqtt_wss_client.$(OBJEXT) : CFLAGS += -Wno-unused-result @@ -891,6 +899,8 @@ 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 \ @@ -916,7 +926,6 @@ NETDATA_FILES = \ $(EXPORTING_ENGINE_FILES) \ $(HEALTH_PLUGIN_FILES) \ $(ML_FILES) \ - $(ML_TESTS_FILES) \ $(IDLEJITTER_PLUGIN_FILES) \ $(PLUGINSD_PLUGIN_FILES) \ $(REGISTRY_PLUGIN_FILES) \ @@ -1004,11 +1013,6 @@ if ENABLE_ACLK $(NULL) endif -if ENABLE_ML_TESTS - netdata_LDADD += $(OPTIONAL_ML_TESTS_LIBS) \ - $(NULL) -endif - netdata_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@ sbin_PROGRAMS += netdatacli -- cgit v1.2.3