diff --git a/src/server/sparkd/http/WebServer.cpp b/src/server/sparkd/http/WebServer.cpp index bba094524..822a2316c 100644 --- a/src/server/sparkd/http/WebServer.cpp +++ b/src/server/sparkd/http/WebServer.cpp @@ -63,7 +63,7 @@ namespace http { _ctx(ctx), _metrics(metrics), _mtimer(std::make_shared>("spark_metrics_query_duration_us", - std::array({ 10.0, 20.0, 40.0, 80.0 }))) + std::array({ 50.0, 100.0, 200.0, 500.0 }))) { _www = os::sparkdata_path("www"); _conf = os::sparkdata_path("conf"); diff --git a/src/server/sparkd/metrics/system_metrics.cpp b/src/server/sparkd/metrics/system_metrics.cpp index ab43e80bb..08f40bd2f 100644 --- a/src/server/sparkd/metrics/system_metrics.cpp +++ b/src/server/sparkd/metrics/system_metrics.cpp @@ -5,28 +5,81 @@ #include #include +#include +#include namespace bts { namespace metrics { +struct ProcessStats { + int pid; + std::string comm, state, ppid, pgrp, session, tty_nr; + std::string tpgid, flags, minflt, cminflt, majflt, cmajflt; + std::string utime, stime, cutime, cstime, priority, nice; + std::string O, itrealvalue, starttime; + // virtual size + uint64_t vsize; + // resident set + int64_t rss; +}; + +void read_stats(ProcessStats& stats) { + std::ifstream stat_stream("/proc/self/stat", std::ios_base::in); + stat_stream + >> stats.pid >> stats.comm >> stats.state >> stats.ppid >> stats.pgrp >> stats.session >> stats.tty_nr + >> stats.tpgid >> stats.flags >> stats.minflt >> stats.cminflt >> stats.majflt >> stats.cmajflt + >> stats.utime >> stats.stime >> stats.cutime >> stats.cstime >> stats.priority >> stats.nice + >> stats.O >> stats.itrealvalue >> stats.starttime >> stats.vsize >> stats.rss; + stat_stream.close(); +} + +void process_mem_usage(double& vm, double& resident) { + using std::ios_base; + using std::ifstream; + vm = resident = 0.0; + + ProcessStats stats; + read_stats(stats); + + long page_size_kb = sysconf(_SC_PAGE_SIZE) / 1024; + vm = stats.vsize / 1024.0; + resident = stats.rss * page_size_kb; +} void publish_system_metrics(MetricsContainer& stats) { - auto cm = std::make_shared>("spark_test_counter", std::vector