Skip to content

Commit

Permalink
Remove July arrays (netdata#19194)
Browse files Browse the repository at this point in the history
  • Loading branch information
stelfrag authored Dec 12, 2024
1 parent bf4a3a5 commit bef8258
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 580 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -728,8 +728,6 @@ set(LIBNETDATA_FILES
src/libnetdata/functions_evloop/functions_evloop.h
src/libnetdata/gorilla/gorilla.cc
src/libnetdata/gorilla/gorilla.h
src/libnetdata/july/july.c
src/libnetdata/july/july.h
src/libnetdata/inlined.h
src/libnetdata/json/json.c
src/libnetdata/json/json.h
Expand Down
5 changes: 0 additions & 5 deletions src/daemon/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,6 @@ int get_system_info(struct rrdhost_system_info *system_info) {
int buffer_unittest(void);
int pgc_unittest(void);
int mrg_unittest(void);
int julytest(void);
int pluginsd_parser_unittest(void);
void replication_initialize(void);
void bearer_tokens_init(void);
Expand Down Expand Up @@ -1046,10 +1045,6 @@ int netdata_main(int argc, char **argv) {
unittest_running = true;
return mrg_unittest();
}
else if(strcmp(optarg, "julytest") == 0) {
unittest_running = true;
return julytest();
}
else if(strcmp(optarg, "parsertest") == 0) {
unittest_running = true;
return pluginsd_parser_unittest();
Expand Down
42 changes: 0 additions & 42 deletions src/daemon/pulse/pulse-dbengine.c
Original file line number Diff line number Diff line change
Expand Up @@ -671,9 +671,6 @@ void pulse_dbengine_do(bool extended) {
struct rrdeng_buffer_sizes dbmem = rrdeng_pulse_memory_sizes();

size_t buffers_total_size = dbmem.xt_buf + dbmem.wal;
#ifdef PDC_USE_JULYL
buffers_total_size += buffers.julyl;
#endif

size_t aral_structures_total_size = 0, aral_used_total_size = 0;
size_t aral_padding_total_size = 0;
Expand Down Expand Up @@ -757,9 +754,6 @@ void pulse_dbengine_do(bool extended) {
static RRDDIM *rd_pgc_buffers_epdl = NULL;
static RRDDIM *rd_pgc_buffers_deol = NULL;
static RRDDIM *rd_pgc_buffers_pd = NULL;
#ifdef PDC_USE_JULYL
static RRDDIM *rd_pgc_buffers_julyl = NULL;
#endif

if (unlikely(!st_pgc_buffers)) {
st_pgc_buffers = rrdset_create_localhost(
Expand Down Expand Up @@ -790,9 +784,6 @@ void pulse_dbengine_do(bool extended) {
rd_pgc_buffers_xt_buf = rrddim_add(st_pgc_buffers, "extent buffers", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
rd_pgc_buffers_epdl = rrddim_add(st_pgc_buffers, "epdl", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
rd_pgc_buffers_deol = rrddim_add(st_pgc_buffers, "deol", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
#ifdef PDC_USE_JULYL
rd_pgc_buffers_julyl = rrddim_add(st_pgc_buffers, "julyl", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
#endif
}
priority++;

Expand All @@ -810,43 +801,10 @@ void pulse_dbengine_do(bool extended) {
rrddim_set_by_pointer(st_pgc_buffers, rd_pgc_buffers_xt_buf, (collected_number)dbmem.xt_buf);
rrddim_set_by_pointer(st_pgc_buffers, rd_pgc_buffers_epdl, (collected_number)aral_free_bytes_from_stats(dbmem.as[RRDENG_MEM_EPDL]));
rrddim_set_by_pointer(st_pgc_buffers, rd_pgc_buffers_deol, (collected_number)aral_free_bytes_from_stats(dbmem.as[RRDENG_MEM_DEOL]));
#ifdef PDC_USE_JULYL
rrddim_set_by_pointer(st_pgc_buffers, rd_pgc_buffers_julyl, (collected_number)buffers.julyl);
#endif

rrdset_done(st_pgc_buffers);
}

#ifdef PDC_USE_JULYL
{
static RRDSET *st_julyl_moved = NULL;
static RRDDIM *rd_julyl_moved = NULL;

if (unlikely(!st_julyl_moved)) {
st_julyl_moved = rrdset_create_localhost(
"netdata",
"dbengine_julyl_moved",
NULL,
"dbengine memory",
NULL,
"Netdata JulyL Memory Moved",
"bytes/s",
"netdata",
"pulse",
priority,
localhost->rrd_update_every,
RRDSET_TYPE_AREA);

rd_julyl_moved = rrddim_add(st_julyl_moved, "moved", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
}
priority++;

rrddim_set_by_pointer(st_julyl_moved, rd_julyl_moved, (collected_number)julyl_bytes_moved());

rrdset_done(st_julyl_moved);
}
#endif

{
static RRDSET *st_mrg_metrics = NULL;
static RRDDIM *rd_mrg_metrics = NULL;
Expand Down
12 changes: 0 additions & 12 deletions src/database/engine/pdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,6 @@

struct rrdeng_cmd;

#ifdef PDC_USE_JULYL
#define PDCJudyLIns JulyLIns
#define PDCJudyLGet JulyLGet
#define PDCJudyLFirst JulyLFirst
#define PDCJudyLNext JulyLNext
#define PDCJudyLLast JulyLLast
#define PDCJudyLPrev JulyLPrev
#define PDCJudyLFirstThenNext JulyLFirstThenNext
#define PDCJudyLLastThenPrev JulyLLastThenPrev
#define PDCJudyLFreeArray JulyLFreeArray
#else
#define PDCJudyLIns JudyLIns
#define PDCJudyLGet JudyLGet
#define PDCJudyLFirst JudyLFirst
Expand All @@ -27,7 +16,6 @@ struct rrdeng_cmd;
#define PDCJudyLFirstThenNext JudyLFirstThenNext
#define PDCJudyLLastThenPrev JudyLLastThenPrev
#define PDCJudyLFreeArray JudyLFreeArray
#endif

typedef struct extent_page_details_list EPDL;
typedef void (*execute_extent_page_details_list_t)(struct rrdengine_instance *ctx, EPDL *epdl, enum storage_priority priority);
Expand Down
8 changes: 0 additions & 8 deletions src/database/engine/rrdengine.c
Original file line number Diff line number Diff line change
Expand Up @@ -1601,10 +1601,6 @@ struct rrdeng_buffer_sizes rrdeng_pulse_memory_sizes(void) {
},
.wal = __atomic_load_n(&wal_globals.atomics.allocated, __ATOMIC_RELAXED) * (sizeof(WAL) + RRDENG_BLOCK_SIZE),
.xt_buf = extent_buffer_cache_size(),

#ifdef PDC_USE_JULYL
.julyl = julyl_cache_size(),
#endif
};
}

Expand All @@ -1627,10 +1623,6 @@ static void *cleanup_tp_worker(struct rrdengine_instance *ctx __maybe_unused, vo
}
}

#ifdef PDC_USE_JULYL
julyl_cleanup1();
#endif

return data;
}

Expand Down
3 changes: 0 additions & 3 deletions src/database/engine/rrdengineapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,6 @@ struct rrdeng_buffer_sizes {

size_t wal;
size_t xt_buf;
#ifdef PDC_USE_JULYL
size_t julyl;
#endif
};

struct rrdeng_buffer_sizes rrdeng_pulse_memory_sizes(void);
Expand Down
14 changes: 0 additions & 14 deletions src/libnetdata/july/README.md

This file was deleted.

Loading

0 comments on commit bef8258

Please sign in to comment.