Skip to content

Commit

Permalink
Switch to standard logging library (#218)
Browse files Browse the repository at this point in the history 
This allows to configure or compile away logging in the library from a single place in Rust apps.

For the CLI side, the usage and output remained the same, except it's now colour-coded.

Fixes #217.
  • Loading branch information
@RReverser
RReverser authored Apr 18, 2020
1 parent 3b754bf commit 23ae9c3
Show file tree
Hide file tree
Showing 12 changed files with 352 additions and 331 deletions.
136 changes: 132 additions & 4 deletions Cargo.lock
View file

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ miniz_oxide = "0.3"
rgb = "0.8.11"
indexmap = { version = "1.3.2", features = ["rayon"] }
libdeflater = "0.2.0"
log = "0.4.8"
stderrlog = { version = "0.4.3", optional = true }

[dependencies.rayon]
optional = true
Expand All @@ -50,18 +52,19 @@ version = "^2.10.0"
optional = true
version = "2.0.0"

[target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64"))'.dependencies]
cloudflare-zlib = "^0.2.2"

[dependencies.image]
default-features = false
features = ["png"]
version = "0.23"

[target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64"))'.dependencies]
cloudflare-zlib = "^0.2.2"

[features]
binary = [
"clap",
"wild",
"stderrlog",
]
default = ["binary", "parallel"]
parallel = ["rayon"]
Expand Down
180 changes: 20 additions & 160 deletions benches/deflate.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ fn deflate_16_bits_strategy_0(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
0,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 0, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -34,14 +27,7 @@ fn deflate_8_bits_strategy_0(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
0,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 0, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -54,14 +40,7 @@ fn deflate_4_bits_strategy_0(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
0,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 0, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -74,14 +53,7 @@ fn deflate_2_bits_strategy_0(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
0,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 0, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -94,14 +66,7 @@ fn deflate_1_bits_strategy_0(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
0,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 0, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -112,14 +77,7 @@ fn deflate_16_bits_strategy_1(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
1,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 1, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -130,14 +88,7 @@ fn deflate_8_bits_strategy_1(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
1,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 1, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -150,14 +101,7 @@ fn deflate_4_bits_strategy_1(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
1,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 1, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -170,14 +114,7 @@ fn deflate_2_bits_strategy_1(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
1,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 1, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -190,14 +127,7 @@ fn deflate_1_bits_strategy_1(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
1,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 1, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -208,14 +138,7 @@ fn deflate_16_bits_strategy_2(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
2,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 2, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -226,14 +149,7 @@ fn deflate_8_bits_strategy_2(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
2,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 2, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -246,14 +162,7 @@ fn deflate_4_bits_strategy_2(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
2,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 2, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -266,14 +175,7 @@ fn deflate_2_bits_strategy_2(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
2,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 2, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -286,14 +188,7 @@ fn deflate_1_bits_strategy_2(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
2,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 2, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -304,14 +199,7 @@ fn deflate_16_bits_strategy_3(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
3,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 3, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -322,14 +210,7 @@ fn deflate_8_bits_strategy_3(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
3,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 3, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -342,14 +223,7 @@ fn deflate_4_bits_strategy_3(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
3,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 3, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -362,14 +236,7 @@ fn deflate_2_bits_strategy_3(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
3,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 3, 15, &min, &Deadline::new(None))
});
}

Expand All @@ -382,14 +249,7 @@ fn deflate_1_bits_strategy_3(b: &mut Bencher) {

b.iter(|| {
let min = AtomicMin::new(None);
deflate(
png.raw.data.as_ref(),
9,
3,
15,
&min,
&Deadline::new(None, false),
)
deflate(png.raw.data.as_ref(), 9, 3, 15, &min, &Deadline::new(None))
});
}

Expand Down
2 changes: 1 addition & 1 deletion src/deflate/cfzlib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn compress_test() {
Z_DEFAULT_STRATEGY as u8,
15,
&AtomicMin::new(None),
&Deadline::new(None, false),
&Deadline::new(None),
)
.unwrap();
let res = crate::deflate::inflate(&vec).unwrap();
Expand Down
Loading

0 comments on commit 23ae9c3

Please sign in to comment.