Skip to content

Move to lowercase monitoring namespace #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
awegrzyn merged 1 commit into from
Apr 19, 2018
Merged

Move to lowercase monitoring namespace #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/FindMonitoring.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
include(FindPackageHandleStandardArgs)

# find includes
find_path(MONITORING_INCLUDE_DIR Collector.h
find_path(MONITORING_INCLUDE_DIR Monitoring.h
HINTS ${Monitoring_ROOT}/include ENV LD_LIBRARY_PATH PATH_SUFFIXES "../include/Monitoring" "../../include/Monitoring" )

# Remove the final "Monitoring"
Expand Down
15 changes: 7 additions & 8 deletions src/ConsumerStats.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


#include <Monitoring/MonitoringFactory.h>
using namespace AliceO2::Monitoring;
using namespace o2::monitoring;


// macro to get number of element in static array
Expand Down Expand Up @@ -57,7 +57,7 @@ class ConsumerStats: public Consumer {

int monitoringEnabled;
int monitoringUpdatePeriod;
std::unique_ptr<Collector> monitoringCollector;
std::unique_ptr<Monitoring> monitoringCollector;

struct rusage previousUsage; // variable to keep track of last getrusage() result
struct rusage currentUsage; // variable to keep track of last getrusage() result
Expand All @@ -76,7 +76,7 @@ class ConsumerStats: public Consumer {
+ currentUsage.ru_stime.tv_sec*1000000.0+currentUsage.ru_stime.tv_usec-(previousUsage.ru_stime.tv_sec*1000000.0+previousUsage.ru_stime.tv_usec)
) / tDiff;
if (monitoringEnabled) {
monitoringCollector->send(fractionCpuUsed*100, "readout.percentCpuUsed");
monitoringCollector->send({fractionCpuUsed*100, "readout.percentCpuUsed"});
//theLog.log("CPU used = %.2f %%",100*fractionCpuUsed);
}
}
Expand All @@ -88,10 +88,10 @@ class ConsumerStats: public Consumer {
// todo: support for long long types
// https://alice.its.cern.ch/jira/browse/FLPPROT-69

monitoringCollector->send(counterBlocks, "readout.Blocks");
monitoringCollector->send(counterBytesTotal, "readout.BytesTotal");
monitoringCollector->send(counterBytesDiff, "readout.BytesInterval");
// monitoringCollector->send((counterBytesTotal/(1024*1024)), "readout.MegaBytesTotal");
monitoringCollector->send({counterBlocks, "readout.Blocks"});
monitoringCollector->send({counterBytesTotal, "readout.BytesTotal"}, DerivedMetricMode::RATE);
monitoringCollector->send({counterBytesDiff, "readout.BytesInterval"});
// monitoringCollector->send({(counterBytesTotal/(1024*1024)), "readout.MegaBytesTotal"});

counterBytesDiff=0;
}
Expand All @@ -108,7 +108,6 @@ class ConsumerStats: public Consumer {
theLog.log("Monitoring enabled - period %ds - using %s",monitoringUpdatePeriod,configURI.c_str());

monitoringCollector=MonitoringFactory::Get(configURI.c_str());
monitoringCollector->addDerivedMetric("readout.BytesTotal", DerivedMetricMode::RATE);

// enable process monitoring
int processMonitoringInterval=0;
Expand Down