Skip to content

Commit 439276d

Browse files
awegrzynawegrzyn
committed
move back to uint64_t
1 parent e6b35a1 commit 439276d

File tree

9 files changed

+24
-24
lines changed

9 files changed

+24
-24
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Metrics consist of 4 parameters: name, value, timestamp and tags.I
5757
| Parameter name | Type | Required | Default |
5858
| -------------- |:---------------------------------------------:|:--------:| ----------------:|
5959
| name | string | yes | - |
60-
| value | int / double / string / int64_t | yes | - |
60+
| value | int / double / string / uint64_t | yes | - |
6161
| timestamp | chrono::time_point<std::chrono::system_clock> | no | current timestamp |
6262
| tags | vector<Tag> | no | -** |
6363

‎include/Monitoring/Metric.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ class Metric
4343
Metric(double value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
4444

4545
/// Initialize class variables
46-
/// \param value metric value (int64_t)
46+
/// \param value metric value (uint64_t)
4747
/// \param name metric name
4848
/// \param timestamp metric timestamp in milliseconds
49-
Metric(int64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
49+
Metric(uint64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
5050

5151
/// Initialize class variables, required by derived metrics logic
5252
/// \param value metric value (boost variant)
5353
/// \param name metric name
5454
/// \param timestamp metric timestamp in milliseconds
55-
Metric(boost::variant< int, std::string, double, int64_t >, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
55+
Metric(boost::variant< int, std::string, double, uint64_t >, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp = Metric::getCurrentTimestamp());
5656

5757
/// Default destructor
5858
~Metric() = default;
@@ -67,7 +67,7 @@ class Metric
6767

6868
/// Value getter
6969
/// \return metric value
70-
boost::variant< int, std::string, double, int64_t > getValue() const;
70+
boost::variant< int, std::string, double, uint64_t > getValue() const;
7171

7272
/// Value type getter
7373
/// \return type of value stores inside metric : 0 - int, 1 - std::string, 2 - double
@@ -93,7 +93,7 @@ class Metric
9393

9494
private:
9595
/// Metric value
96-
boost::variant< int, std::string, double, int64_t > mValue;
96+
boost::variant< int, std::string, double, uint64_t > mValue;
9797

9898
/// Metric name
9999
std::string mName;

‎src/Collector.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,17 +181,17 @@ void Collector::sendTimed(T value, std::string name, std::chrono::time_point<std
181181
template void Collector::send(int, std::string);
182182
template void Collector::send(double, std::string);
183183
template void Collector::send(std::string, std::string);
184-
template void Collector::send(int64_t, std::string);
184+
template void Collector::send(uint64_t, std::string);
185185

186186
template void Collector::sendTagged(int, std::string, std::vector<Tag>&& tags);
187187
template void Collector::sendTagged(double, std::string, std::vector<Tag>&& tags);
188188
template void Collector::sendTagged(std::string, std::string, std::vector<Tag>&& tags);
189-
template void Collector::sendTagged(int64_t, std::string, std::vector<Tag>&& tags);
189+
template void Collector::sendTagged(uint64_t, std::string, std::vector<Tag>&& tags);
190190

191191
template void Collector::sendTimed(int, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
192192
template void Collector::sendTimed(double, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
193193
template void Collector::sendTimed(std::string, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
194-
template void Collector::sendTimed(int64_t, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
194+
template void Collector::sendTimed(uint64_t, std::string, std::chrono::time_point<std::chrono::system_clock>& timestamp);
195195

196196
} // namespace Monitoring
197197
} // namespace AliceO2

‎src/DerivedMetrics.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Metric DerivedMetrics::calculateRate(std::string name)
5252
search->second.at(size - 1).getTimestamp()
5353
- search->second.at(size - 2).getTimestamp()
5454
);
55-
boost::variant< int, std::string, double, int64_t > current = search->second.at(size - 1).getValue();
56-
boost::variant< int, std::string, double, int64_t > previous = search->second.at(size - 2).getValue();
55+
boost::variant< int, std::string, double, uint64_t > current = search->second.at(size - 1).getValue();
56+
boost::variant< int, std::string, double, uint64_t > previous = search->second.at(size - 2).getValue();
5757
int timestampCount = timestampDifference.count();
5858

5959
// disallow dividing by 0

‎src/Metric.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ Metric::Metric(double value, const std::string& name, std::chrono::time_point<st
4242
mValue(value), mName(name), mTimestamp(timestamp)
4343
{}
4444

45-
Metric::Metric(int64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp) :
45+
Metric::Metric(uint64_t value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp) :
4646
mValue(value), mName(name), mTimestamp(timestamp)
4747
{}
4848

49-
Metric::Metric(boost::variant< int, std::string, double, int64_t > value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp) :
49+
Metric::Metric(boost::variant< int, std::string, double, uint64_t > value, const std::string& name, std::chrono::time_point<std::chrono::system_clock> timestamp) :
5050
mValue(value), mName(name), mTimestamp(timestamp)
5151
{}
5252

53-
boost::variant< int, std::string, double, int64_t > Metric::getValue() const
53+
boost::variant< int, std::string, double, uint64_t > Metric::getValue() const
5454
{
5555
return mValue;
5656
}

‎src/ProcessMonitor.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ std::vector<Metric> ProcessMonitor::getNetworkUsage()
3939
auto position = line.find(":");
4040
auto secondPosition = line.find(":", position + 1);
4141
metrics.emplace_back(Metric{
42-
static_cast<int64_t>(std::stoll(line.substr(position + 1, secondPosition - position - 1))),
42+
static_cast<uint64_t>(std::stoull(line.substr(position + 1, secondPosition - position - 1))),
4343
"bytesReceived"}.addTags({{"if", line.substr(0, position)}})
4444
);
4545
metrics.emplace_back(Metric{
46-
static_cast<int64_t>(std::stoll(line.substr(secondPosition + 1, line.size()))),
46+
static_cast<uint64_t>(std::stoull(line.substr(secondPosition + 1, line.size()))),
4747
"bytesTransmitted"}.addTags({{"if", line.substr(0, position)}})
4848
);
4949
}

‎src/VariantVisitorRate.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace AliceO2
44
namespace Monitoring
55
{
66

7-
class VariantVisitorRate : public boost::static_visitor<boost::variant<int, std::string, double, int64_t>>
7+
class VariantVisitorRate : public boost::static_visitor<boost::variant<int, std::string, double, uint64_t>>
88
{
99
private:
1010
/// Timestamp difference in milliseconds

‎test/testDerived.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,22 @@ BOOST_AUTO_TEST_CASE(derivedRateDouble) {
7979
}
8080
}
8181

82-
BOOST_AUTO_TEST_CASE(derivedRateInt64_t) {
82+
BOOST_AUTO_TEST_CASE(derivedRateUint64_t) {
8383
struct RateResults {
84-
int64_t value;
85-
int64_t rate;
84+
uint64_t value;
85+
uint64_t rate;
8686
};
8787
std::vector<RateResults> results = {{165535, 0 }, {165545, 100}, {165555, 100}, {165575, 200}, {165585, 100}, {165590, 50}};
8888
AliceO2::Monitoring::DerivedMetrics derivedHandler(100);
89-
std::string name("metricInt64_t");
89+
std::string name("metricUint64_t");
9090
derivedHandler.registerMetric(name, AliceO2::Monitoring::DerivedMetricMode::RATE);
9191

9292
for (auto const result : results) {
9393
try {
9494
std::this_thread::sleep_for(std::chrono::milliseconds(100));
9595
AliceO2::Monitoring::Metric metric(result.value, name);
9696
AliceO2::Monitoring::Metric derived = derivedHandler.processMetric(metric);
97-
BOOST_CHECK_EQUAL(derived.getName(), "metricInt64_tRate");
97+
BOOST_CHECK_EQUAL(derived.getName(), "metricUint64_tRate");
9898
BOOST_CHECK_EQUAL(boost::get<double>(derived.getValue()), result.rate);
9999
} catch(MonitoringInternalException &e) {
100100
BOOST_TEST(e.what() == std::string("Not enough values"));

‎test/testMetric.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ BOOST_AUTO_TEST_CASE(retrieveString)
5050

5151
BOOST_AUTO_TEST_CASE(retrieveUnsignedLongLong)
5252
{
53-
int64_t value = 10000000000000LL;
53+
uint64_t value = 10000000000000LL;
5454
std::string name("metric name");
5555
AliceO2::Monitoring::Metric metricInstance(value, name );
5656

57-
BOOST_CHECK_EQUAL(boost::get<int64_t>(metricInstance.getValue()), 10000000000000LL);
57+
BOOST_CHECK_EQUAL(boost::get<uint64_t>(metricInstance.getValue()), 10000000000000LL);
5858
BOOST_CHECK_EQUAL(metricInstance.getType(), 3);
5959
}
6060

0 commit comments

Comments
 (0)