Skip to content
This repository was archived by the owner on Oct 6, 2023. It is now read-only.

Commit ea349bd

Browse files
committed
enh(bam): Attempt to start cbd quickly (#704)
* fix(stats): a compilation warning removed. * cleanup(bam): default constructors/destructors cleaned * cleanup(bam): override applied on many objects * enh(bam/metrics): metrics removed from bam * fix(bam): metric_book is removed * fix(bam): metric_listener is removed from bam * enh(bam): selects in load dimensions are parallelized * fix(bam): cache is lighter * fix(core): call to signal() uniformized. * fix(bam/reader_v2): Queries improved. REFS: MON-11910
1 parent 7a79044 commit ea349bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+612
-1903
lines changed

bam/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,13 @@ add_library("${BAM}" SHARED
3737
"${SRC_DIR}/ba_svc_mapping.cc"
3838
"${SRC_DIR}/ba_event.cc"
3939
"${SRC_DIR}/ba_duration_event.cc"
40-
"${SRC_DIR}/bool_aggregate.cc"
4140
"${SRC_DIR}/bool_and.cc"
4241
"${SRC_DIR}/bool_binary_operator.cc"
4342
"${SRC_DIR}/bool_call.cc"
4443
"${SRC_DIR}/bool_constant.cc"
4544
"${SRC_DIR}/bool_equal.cc"
4645
"${SRC_DIR}/bool_expression.cc"
4746
"${SRC_DIR}/bool_less_than.cc"
48-
"${SRC_DIR}/bool_metric.cc"
4947
"${SRC_DIR}/bool_more_than.cc"
5048
"${SRC_DIR}/bool_not.cc"
5149
"${SRC_DIR}/bool_not_equal.cc"
@@ -90,8 +88,6 @@ add_library("${BAM}" SHARED
9088
"${SRC_DIR}/kpi_service.cc"
9189
"${SRC_DIR}/kpi_status.cc"
9290
"${SRC_DIR}/main.cc"
93-
"${SRC_DIR}/metric_book.cc"
94-
"${SRC_DIR}/metric_listener.cc"
9591
"${SRC_DIR}/monitoring_stream.cc"
9692
"${SRC_DIR}/rebuild.cc"
9793
"${SRC_DIR}/reporting_stream.cc"
@@ -106,15 +102,13 @@ add_library("${BAM}" SHARED
106102
"${INC_DIR}/ba_svc_mapping.hh"
107103
"${INC_DIR}/ba_event.hh"
108104
"${INC_DIR}/ba_duration_event.hh"
109-
"${INC_DIR}/bool_aggregate.hh"
110105
"${INC_DIR}/bool_and.hh"
111106
"${INC_DIR}/bool_binary_operator.hh"
112107
"${INC_DIR}/bool_call.hh"
113108
"${INC_DIR}/bool_constant.hh"
114109
"${INC_DIR}/bool_equal.hh"
115110
"${INC_DIR}/bool_expression.hh"
116111
"${INC_DIR}/bool_less_than.hh"
117-
"${INC_DIR}/bool_metric.hh"
118112
"${INC_DIR}/bool_more_than.hh"
119113
"${INC_DIR}/bool_not.hh"
120114
"${INC_DIR}/bool_not_equal.hh"
@@ -160,8 +154,6 @@ add_library("${BAM}" SHARED
160154
"${INC_DIR}/kpi_event.hh"
161155
"${INC_DIR}/kpi_service.hh"
162156
"${INC_DIR}/kpi_status.hh"
163-
"${INC_DIR}/metric_book.hh"
164-
"${INC_DIR}/metric_listener.hh"
165157
"${INC_DIR}/monitoring_stream.hh"
166158
"${INC_DIR}/rebuild.hh"
167159
"${INC_DIR}/reporting_stream.hh"

bam/inc/com/centreon/broker/bam/ba_duration_event.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ba_duration_event : public io::data {
4040
public:
4141
ba_duration_event();
4242
ba_duration_event(ba_duration_event const& other);
43-
~ba_duration_event();
43+
~ba_duration_event() noexcept override = default;
4444
ba_duration_event& operator=(ba_duration_event const& other);
4545
bool operator==(ba_duration_event const& other) const;
4646
constexpr static uint32_t static_type() {

bam/inc/com/centreon/broker/bam/ba_event.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ba_event : public io::data {
3939
public:
4040
ba_event();
4141
ba_event(ba_event const& other);
42-
~ba_event();
42+
~ba_event() noexcept override = default;
4343
ba_event& operator=(ba_event const& other);
4444
bool operator==(ba_event const& other) const;
4545
constexpr static uint32_t static_type() {

bam/inc/com/centreon/broker/bam/ba_status.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** Copyright 2014 Centreon
2+
** Copyright 2014, 2021 Centreon
33
**
44
** Licensed under the Apache License, Version 2.0 (the "License");
55
** you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ class ba_status : public io::data {
4040
public:
4141
ba_status();
4242
ba_status(ba_status const& other);
43-
~ba_status();
43+
~ba_status() noexcept override = default;
4444
ba_status& operator=(ba_status const& other);
4545
constexpr static uint32_t static_type() {
4646
return io::events::data_type<io::events::bam, bam::de_ba_status>::value;

bam/inc/com/centreon/broker/bam/bool_aggregate.hh

Lines changed: 0 additions & 71 deletions
This file was deleted.

bam/inc/com/centreon/broker/bam/bool_and.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class bool_and : public bool_binary_operator {
3636
public:
3737
bool_and();
3838
bool_and(bool_and const& right);
39-
~bool_and();
39+
~bool_and() noexcept override = default;
4040
bool_and& operator=(bool_and const& right);
41-
double value_hard();
42-
double value_soft();
41+
double value_hard() override;
42+
double value_soft() override;
4343
};
4444
} // namespace bam
4545

bam/inc/com/centreon/broker/bam/bool_binary_operator.hh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ class bool_binary_operator : public bool_value {
4343

4444
bool_binary_operator();
4545
bool_binary_operator(bool_binary_operator const& right);
46-
virtual ~bool_binary_operator();
46+
~bool_binary_operator() noexcept override = default;
4747
bool_binary_operator& operator=(bool_binary_operator const& right);
48-
bool child_has_update(computable* child, io::stream* visitor = NULL);
48+
bool child_has_update(computable* child, io::stream* visitor = NULL) override;
4949
void set_left(std::shared_ptr<bool_value> const& left);
5050
void set_right(std::shared_ptr<bool_value> const& right);
51-
bool state_known() const;
52-
bool in_downtime() const;
51+
bool state_known() const override;
52+
bool in_downtime() const override;
5353

5454
protected:
5555
std::shared_ptr<bool_value> _left;

bam/inc/com/centreon/broker/bam/bool_call.hh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ class bool_call : public bool_value {
4242

4343
bool_call(std::string const& name);
4444
bool_call(bool_call const& right);
45-
~bool_call();
45+
~bool_call() noexcept override = default;
4646
bool_call& operator=(bool_call const& right);
47-
double value_hard();
48-
double value_soft();
49-
bool state_known() const;
47+
double value_hard() override;
48+
double value_soft() override;
49+
bool state_known() const override;
5050
std::string const& get_name() const;
5151
void set_expression(std::shared_ptr<bool_value> expression);
52-
bool child_has_update(computable* child, io::stream* visitor = NULL);
52+
bool child_has_update(computable* child, io::stream* visitor = NULL) override;
5353

5454
private:
5555
std::string _name;

bam/inc/com/centreon/broker/bam/bool_constant.hh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,17 @@ namespace bam {
3333
* value (i.e '42').
3434
*/
3535
class bool_constant : public bool_value {
36+
double _value;
37+
3638
public:
3739
bool_constant(double value);
3840
bool_constant(bool_constant const& right);
39-
~bool_constant();
41+
~bool_constant() noexcept override = default;
4042
bool_constant& operator=(bool_constant const& right);
41-
bool child_has_update(computable* child, io::stream* visitor);
42-
double value_hard();
43-
double value_soft();
44-
bool state_known() const;
45-
46-
private:
47-
double _value;
43+
bool child_has_update(computable* child, io::stream* visitor) override;
44+
double value_hard() override;
45+
double value_soft() override;
46+
bool state_known() const override;
4847
};
4948
} // namespace bam
5049

bam/inc/com/centreon/broker/bam/bool_equal.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class bool_equal : public bool_binary_operator {
3636
public:
3737
bool_equal();
3838
bool_equal(bool_equal const& right);
39-
~bool_equal();
39+
~bool_equal() noexcept override = default;
4040
bool_equal& operator=(bool_equal const& right);
41-
double value_hard();
42-
double value_soft();
41+
double value_hard() override;
42+
double value_soft() override;
4343
};
4444
} // namespace bam
4545

0 commit comments

Comments
 (0)