Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop cpu spinning in metrics server

Browse Source
This commit is contained in:
Imbris 2019-09-20 00:41:44 -04:00
parent 169c08e226
commit dd8500071e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/metrics.rs
View File

@ -1,6 +1,3 @@
extern crate prometheus;
extern crate prometheus_static_metric;
extern crate rouille;
use prometheus::{Encoder, Gauge, IntGauge, IntGaugeVec, Opts, Registry, TextEncoder}; use prometheus::{Encoder, Gauge, IntGauge, IntGaugeVec, Opts, Registry, TextEncoder};
use rouille::{router, Server}; use rouille::{router, Server};
use std::{ use std::{
@ -11,7 +8,7 @@ use std::{
Arc, Arc,
}, },
thread, thread,
time::{SystemTime, UNIX_EPOCH}, time::{Duration, SystemTime, UNIX_EPOCH},
}; };
pub struct ServerMetrics { pub struct ServerMetrics {
@ -24,7 +21,7 @@ pub struct ServerMetrics {
pub start_time: IntGauge, pub start_time: IntGauge,
pub time_of_day: Gauge, pub time_of_day: Gauge,
pub light_count: IntGauge, pub light_count: IntGauge,
pub thread_running: Arc<AtomicBool>, running: Arc<AtomicBool>,
pub handle: Option<thread::JoinHandle<()>>, pub handle: Option<thread::JoinHandle<()>>,
pub every_100th: i8, pub every_100th: i8,
} }
@ -91,8 +88,8 @@ impl ServerMetrics {
registry.register(Box::new(chunks_count.clone())).unwrap(); registry.register(Box::new(chunks_count.clone())).unwrap();
registry.register(Box::new(tick_time.clone())).unwrap(); registry.register(Box::new(tick_time.clone())).unwrap();
let thread_running = Arc::new(AtomicBool::new(true)); let running = Arc::new(AtomicBool::new(true));
let thread_running2 = thread_running.clone(); let running2 = running.clone();
//TODO: make this a job //TODO: make this a job
let handle = Some(thread::spawn(move || { let handle = Some(thread::spawn(move || {
@ -110,8 +107,10 @@ impl ServerMetrics {
) )
}) })
.expect("Failed to start server"); .expect("Failed to start server");
while thread_running2.load(Ordering::Relaxed) { while running2.load(Ordering::Relaxed) {
server.poll(); server.poll();
// Poll at 10Hz
thread::sleep(Duration::from_millis(100));
} }
})); }));
@ -125,7 +124,7 @@ impl ServerMetrics {
start_time, start_time,
time_of_day, time_of_day,
light_count, light_count,
thread_running, running,
handle, handle,
every_100th: 0, every_100th: 0,
} }
@ -144,7 +143,7 @@ impl ServerMetrics {
impl Drop for ServerMetrics { impl Drop for ServerMetrics {
fn drop(&mut self) { fn drop(&mut self) {
self.thread_running.store(false, Ordering::Relaxed); self.running.store(false, Ordering::Relaxed);
let handle = self.handle.take(); let handle = self.handle.take();
handle handle
.unwrap() .unwrap()