Skip to content

logs-generator: don't spin in loop just sleep till next iteration #153

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
pmalek-sumo merged 1 commit into from
Oct 11, 2021
Merged

logs-generator: don't spin in loop just sleep till next iteration #153

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
8 changes: 8 additions & 0 deletions src/rust/logs-generator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,11 @@ rustfmt:
.PHONY: check-rustfmt
check-rustfmt:
rustfmt --check $(RUSTFMT_FLAGS) $(RUST_SOURCE_FILES)

.PHONY: build
build:
cargo build --release

.PHONY: build-debug
build-debug:
cargo build
21 changes: 14 additions & 7 deletions src/rust/logs-generator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ use rand::Rng;
use std::fs::File;
use std::fs::OpenOptions;
use std::io::{BufRead, BufReader, Write};
use std::ops::Sub;
use std::process;
use std::thread;
use std::time::{Duration, Instant};
use std::vec::Vec;

Expand Down Expand Up @@ -68,7 +70,10 @@ fn main() {
.short('I')
.long("time-resolution")
.value_name("time-resolution")
.help("Time resolution defines how often throughput should be verified and statistics printed")
.help(concat!(
"Time resolution (in seconds) defines how often ",
"throughput should be verified and statistics printed")
)
.required(false)
.takes_value(true))

Expand Down Expand Up @@ -131,7 +136,7 @@ fn main() {
.takes_value(true))
.get_matches();

let time_resolution = value_t!(matches, "time-resolution", u64).unwrap_or(10);
let time_resolution = Duration::from_secs(value_t!(matches, "time-resolution", u64).unwrap_or(10));
let logs_per_s = value_t!(matches, "logs-throughput", u64).unwrap_or(0);
let bytes_per_s = value_t!(matches, "throughput", u64).unwrap_or(0);
let total_logs = value_t!(matches, "total-logs", u64).unwrap_or(0);
Expand Down Expand Up @@ -164,11 +169,11 @@ fn main() {
print(
verbose,
format!(
"[s] Going to generate logs into {} with average {} lps and average {} Bps with time resolution: {}",
"[s] Going to generate logs into {} with average {} lps and average {} Bps with time resolution: {}s",
&path,
logs_per_s,
bytes_per_s,
time_resolution
time_resolution.as_secs(),
)
);

Expand Down Expand Up @@ -213,7 +218,7 @@ fn main() {
let mut counter = 0;
loop {
// Print statistics
if now.elapsed().as_secs() >= time_resolution {
if now.elapsed() >= time_resolution {
print(
verbose,
format!(
Expand All @@ -232,12 +237,14 @@ fn main() {
}

// Skip iteration because limit of logs/s already reached
if logs_per_s > 0 && current_logs >= logs_per_s * time_resolution {
if logs_per_s > 0 && current_logs >= logs_per_s * time_resolution.as_secs() {
thread::sleep(time_resolution.sub(now.elapsed()));
continue;
}

// Skip iteration because limit of bytes/s already reached
if bytes_per_s > 0 && current_bytes >= bytes_per_s * time_resolution {
if bytes_per_s > 0 && current_bytes >= bytes_per_s * time_resolution.as_secs() {
thread::sleep(time_resolution.sub(now.elapsed()));
continue;
}

Expand Down