diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 130 |
1 files changed, 109 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 6241fc102..7f8adf6af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -61,7 +61,6 @@ dist_noinst_DATA = \ netdata.spec \ packaging/bundle-ebpf.sh \ packaging/bundle-ebpf-co-re.sh \ - packaging/bundle-judy.sh \ packaging/bundle-libbpf.sh \ packaging/check-kernel-config.sh \ packaging/ebpf.checksums \ @@ -75,8 +74,6 @@ dist_noinst_DATA = \ packaging/installer/UPDATE.md \ packaging/jsonc.checksums \ packaging/jsonc.version \ - packaging/judy.checksums \ - packaging/judy.version \ packaging/libbpf.checksums \ packaging/libbpf.version \ packaging/protobuf.checksums \ @@ -136,6 +133,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/avl/avl.c \ libnetdata/avl/avl.h \ libnetdata/buffer/buffer.c \ @@ -260,7 +259,7 @@ ML_FILES += \ $(NULL) # Disable warnings from dlib library -ml/kmeans/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits +ml/kmeans/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow endif @@ -435,6 +434,8 @@ RRD_PLUGIN_FILES = \ database/rrdcalc.h \ database/rrdcalctemplate.c \ database/rrdcalctemplate.h \ + database/rrdcontext.c \ + database/rrdcontext.h \ database/rrddim.c \ database/rrddimvar.c \ database/rrddimvar.h \ @@ -454,6 +455,10 @@ RRD_PLUGIN_FILES = \ database/ram/rrddim_mem.h \ database/sqlite/sqlite_functions.c \ database/sqlite/sqlite_functions.h \ + database/sqlite/sqlite_context.c \ + database/sqlite/sqlite_context.h \ + database/sqlite/sqlite_db_migration.c \ + database/sqlite/sqlite_db_migration.h \ database/sqlite/sqlite_aclk.c \ database/sqlite/sqlite_aclk.h \ database/sqlite/sqlite_health.c \ @@ -468,11 +473,70 @@ RRD_PLUGIN_FILES = \ database/sqlite/sqlite3.h \ database/KolmogorovSmirnovDist.c \ database/KolmogorovSmirnovDist.h \ - database/metric_correlations.c \ - database/metric_correlations.h \ $(NULL) +database/sqlite/sqlite3.$(OBJEXT) : CFLAGS += -Wno-cast-function-type +database/KolmogorovSmirnovDist.$(OBJEXT) : CFLAGS += -Wno-maybe-uninitialized + if ENABLE_DBENGINE + noinst_LIBRARIES = libjudy.a + + libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \ + libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \ + libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \ + libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \ + libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \ + libnetdata/libjudy/src/JudyL/JudyL.h \ + libnetdata/libjudy/src/JudyL/JudyLByCount.c \ + libnetdata/libjudy/src/JudyL/JudyLCascade.c \ + libnetdata/libjudy/src/JudyL/JudyLCount.c \ + libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \ + libnetdata/libjudy/src/JudyL/JudyLDecascade.c \ + libnetdata/libjudy/src/JudyL/JudyLDel.c \ + libnetdata/libjudy/src/JudyL/JudyLFirst.c \ + libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \ + libnetdata/libjudy/src/JudyL/j__udyLGet.c \ + libnetdata/libjudy/src/JudyL/JudyLGet.c \ + libnetdata/libjudy/src/JudyL/JudyLInsArray.c \ + libnetdata/libjudy/src/JudyL/JudyLIns.c \ + libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \ + libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \ + libnetdata/libjudy/src/JudyL/JudyLMemActive.c \ + libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \ + libnetdata/libjudy/src/JudyL/JudyLNext.c \ + libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \ + libnetdata/libjudy/src/JudyL/JudyLPrev.c \ + libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \ + libnetdata/libjudy/src/JudyHS/JudyHS.c \ + $(NULL) + + nodist_libjudy_a_SOURCES = JudyLTables.c + + BUILT_SOURCES += JudyLTables.c + + CLEANFILES += JudyLTables.c + + libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough + + libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV + libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV + libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT + libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT + libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS += -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB + libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS += -DJUDYGETINLINE + + noinst_PROGRAMS = judyltablesgen + + judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c + judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough + + judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security + +JudyLTables.c: $(abs_top_srcdir)/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c $(builddir)/judyltablesgen$(EXEEXT) + $(builddir)/judyltablesgen$(EXEEXT) + + libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL + RRD_PLUGIN_FILES += \ database/engine/rrdengine.c \ database/engine/rrdengine.h \ @@ -511,6 +575,8 @@ API_PLUGIN_FILES = \ web/api/exporters/shell/allmetrics_shell.h \ web/api/queries/average/average.c \ web/api/queries/average/average.h \ + web/api/queries/countif/countif.c \ + web/api/queries/countif/countif.h \ web/api/queries/des/des.c \ web/api/queries/des/des.h \ web/api/queries/incremental_sum/incremental_sum.c \ @@ -521,6 +587,10 @@ API_PLUGIN_FILES = \ web/api/queries/median/median.h \ web/api/queries/min/min.c \ web/api/queries/min/min.h \ + web/api/queries/percentile/percentile.c \ + web/api/queries/percentile/percentile.h \ + web/api/queries/trimmed_mean/trimmed_mean.c \ + web/api/queries/trimmed_mean/trimmed_mean.h \ web/api/queries/query.c \ web/api/queries/query.h \ web/api/queries/rrdr.c \ @@ -531,6 +601,8 @@ API_PLUGIN_FILES = \ web/api/queries/stddev/stddev.h \ web/api/queries/sum/sum.c \ web/api/queries/sum/sum.h \ + web/api/queries/weights.c \ + web/api/queries/weights.h \ web/api/formatters/rrd2json.c \ web/api/formatters/rrd2json.h \ web/api/formatters/csv/csv.c \ @@ -637,15 +709,13 @@ ACLK_FILES = \ 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 - $(NULL) - -if ENABLE_NEW_CLOUD_PROTOCOL -ACLK_FILES += \ + mqtt_websockets/MQTT-C/include/mqtt.h \ aclk/aclk_charts_api.c \ aclk/aclk_charts_api.h \ aclk/aclk_alarm_api.c \ aclk/aclk_alarm_api.h \ + aclk/aclk_contexts_api.c \ + aclk/aclk_contexts_api.h \ aclk/schema-wrappers/connection.cc \ aclk/schema-wrappers/connection.h \ aclk/schema-wrappers/node_connection.cc \ @@ -664,11 +734,19 @@ ACLK_FILES += \ aclk/schema-wrappers/node_info.h \ aclk/schema-wrappers/capability.cc \ aclk/schema-wrappers/capability.h \ + aclk/schema-wrappers/proto_2_json.cc \ + aclk/schema-wrappers/proto_2_json.h \ aclk/schema-wrappers/schema_wrappers.h \ aclk/schema-wrappers/schema_wrapper_utils.cc \ aclk/schema-wrappers/schema_wrapper_utils.h \ + aclk/schema-wrappers/context_stream.cc \ + aclk/schema-wrappers/context_stream.h \ + aclk/schema-wrappers/context.cc \ + aclk/schema-wrappers/context.h \ $(NULL) +mqtt_websockets/src/mqtt_wss_client.$(OBJEXT) : CFLAGS += -Wno-unused-result + ACLK_PROTO_DEFINITIONS = \ aclk/aclk-schemas/proto/aclk/v1/lib.proto \ aclk/aclk-schemas/proto/agent/v1/disconnect.proto \ @@ -682,6 +760,8 @@ ACLK_PROTO_DEFINITIONS = \ aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto \ aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto \ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto \ + aclk/aclk-schemas/proto/context/v1/context.proto \ + aclk/aclk-schemas/proto/context/v1/stream.proto \ $(NULL) dist_noinst_DATA += $(ACLK_PROTO_DEFINITIONS) @@ -710,6 +790,10 @@ ACLK_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \ aclk/aclk-schemas/proto/alarm/v1/stream.pb.h \ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.cc \ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h \ + aclk/aclk-schemas/proto/context/v1/context.pb.cc \ + aclk/aclk-schemas/proto/context/v1/context.pb.h \ + aclk/aclk-schemas/proto/context/v1/stream.pb.cc \ + aclk/aclk-schemas/proto/context/v1/stream.pb.h \ $(NULL) BUILT_SOURCES += $(ACLK_PROTO_BUILT_FILES) @@ -764,16 +848,15 @@ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.cc \ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h: aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto $(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^ -endif #ENABLE_NEW_CLOUD_PROTOCOL +aclk/aclk-schemas/proto/context/v1/context.pb.cc \ +aclk/aclk-schemas/proto/context/v1/context.pb.h: aclk/aclk-schemas/proto/context/v1/context.proto + $(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^ -endif #ENABLE_ACLK +aclk/aclk-schemas/proto/context/v1/stream.pb.cc \ +aclk/aclk-schemas/proto/context/v1/stream.pb.h: aclk/aclk-schemas/proto/context/v1/stream.proto + $(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^ -if ENABLE_ACLK -ACLK_COMMON_FILES = \ - aclk/aclk_collector_list.c \ - aclk/aclk_collector_list.h \ - $(NULL) -endif +endif #ENABLE_ACLK ACLK_ALWAYS_BUILD_FILES = \ aclk/aclk_rrdhost_state.h \ @@ -881,7 +964,6 @@ NETDATA_FILES = \ $(CLAIM_FILES) \ $(PARSER_FILES) \ $(ACLK_ALWAYS_BUILD_FILES) \ - $(ACLK_COMMON_FILES) \ $(ACLK_FILES) \ $(SPAWN_PLUGIN_FILES) \ $(TIMEX_PLUGIN_FILES) \ @@ -926,6 +1008,11 @@ NETDATA_COMMON_LIBS = \ $(OPTIONAL_ATOMIC_LIBS) \ $(NULL) +if ENABLE_DBENGINE + NETDATA_COMMON_LIBS += libjudy.a \ + $(NULL) +endif + if LINK_STATIC_JSONC NETDATA_COMMON_LIBS += $(abs_top_srcdir)/externaldeps/jsonc/libjson-c.a endif @@ -1166,6 +1253,7 @@ if ENABLE_UNITTESTS $(EXPORTING_ENGINE_TEST_FILES) \ $(EXPORTING_ENGINE_FILES) \ $(LIBNETDATA_FILES) \ + database/rrdlabels.c \ $(NULL) exporting_tests_exporting_engine_testdriver_CFLAGS = \ $(AM_CFLAGS) \ @@ -1259,7 +1347,7 @@ endif $(NULL) collectors_cgroups_plugin_tests_cgroups_testdriver_LDADD = $(NETDATA_COMMON_LIBS) $(TEST_LIBS) collectors_cgroups_plugin_tests_cgroups_testdriver_LDFLAGS = \ - -Wl,--wrap=add_label_to_list \ + -Wl,--wrap=rrdlabels_add \ $(NULL) endif |