Skip to content

feat(frame): add reset API for frame codec #52

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

Open
PureWhiteWu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(frame): add reset API for frame codec #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6134ed
feat(frame): add reset API for frame codec
PureWhiteWu Sep 14, 2022
687eb65
Merge branch 'master' into feat/reset
PureWhiteWu Dec 3, 2022
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
1 change: 1 addition & 0 deletions bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ path = "src/bench.rs"

[features]
cpp = ["snappy-cpp"]
reuse = []

[dependencies]
criterion = "0.3.1"
Expand Down
332 changes: 331 additions & 1 deletion bench/src/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use std::time::Duration;
use std::{io::Read, time::Duration};

use criterion::{
criterion_group, criterion_main, Bencher, Benchmark, Criterion, Throughput,
};
use snap::read::FrameEncoder;

const CORPUS_HTML: &'static [u8] = include_bytes!("../../data/html");
const CORPUS_URLS_10K: &'static [u8] = include_bytes!("../../data/urls.10K");
Expand All @@ -21,6 +22,8 @@ const CORPUS_GEOPROTO: &'static [u8] =
include_bytes!("../../data/geo.protodata");
const CORPUS_KPPKN: &'static [u8] = include_bytes!("../../data/kppkn.gtb");

const FRAME_HEADER_SIZE: usize = 16;

macro_rules! compress {
($c:expr, $comp:expr, $group:expr, $name:expr, $corpus:expr) => {
compress!($c, $comp, $group, $name, $corpus, 0);
Expand All @@ -39,6 +42,66 @@ macro_rules! compress {
};
}

macro_rules! frame_compress {
($c:expr, $comp:expr, $group:expr, $name:expr, $corpus:expr) => {
frame_compress!($c, $comp, $group, $name, $corpus, 0);
};
($c:expr, $comp:expr, $group:expr, $name:expr, $corpus:expr, $size:expr) => {
let mut corpus = $corpus;
if $size > 0 {
corpus = &corpus[..$size];
}
let mut dst = vec![
0;
snap::raw::max_compress_len(corpus.len())
+ FRAME_HEADER_SIZE
];
define(
$c,
$group,
&format!("frame_compress/{}", $name),
corpus,
move |b| {
b.iter(|| {
dst.clear();
$comp(corpus, &mut dst);
});
},
);
};
}

macro_rules! frame_compress_reuse {
($c:expr, $group:expr, $name:expr, $corpus:expr) => {
frame_compress_reuse!($c, $group, $name, $corpus, 0);
};
($c:expr, $group:expr, $name:expr, $corpus:expr, $size:expr) => {
let mut corpus = $corpus;
if $size > 0 {
corpus = &corpus[..$size];
}
let mut dst = vec![
0;
snap::raw::max_compress_len(corpus.len())
+ FRAME_HEADER_SIZE
];
let mut encoder = snap::read::FrameEncoder::new(corpus);
define(
$c,
$group,
&format!("frame_compress_reuse/{}", $name),
corpus,
move |b| {
b.iter(|| {
dst.clear();
encoder.reset(corpus);
encoder.read_to_end(&mut dst).unwrap();
});
},
);
};
}

macro_rules! decompress {
($c:expr, $decomp:expr, $group:expr, $name:expr, $corpus:expr) => {
decompress!($c, $decomp, $group, $name, $corpus, 0);
Expand All @@ -65,6 +128,71 @@ macro_rules! decompress {
};
}

macro_rules! frame_decompress {
($c:expr, $decomp:expr, $group:expr, $name:expr, $corpus:expr) => {
frame_decompress!($c, $decomp, $group, $name, $corpus, 0);
};
($c:expr, $decomp:expr, $group:expr, $name:expr, $corpus:expr, $size:expr) => {
let mut corpus = $corpus;
if $size > 0 {
corpus = &corpus[..$size];
}
let mut compressed = Vec::with_capacity(
snap::raw::max_compress_len(corpus.len()) + FRAME_HEADER_SIZE,
);
snap::read::FrameEncoder::new(corpus)
.read_to_end(&mut compressed)
.unwrap();
let mut dst = vec![0; corpus.len() + FRAME_HEADER_SIZE];
define(
$c,
$group,
&format!("frame_decompress/{}", $name),
corpus,
move |b| {
b.iter(|| {
dst.clear();
$decomp(&compressed, &mut dst);
});
},
);
};
}

macro_rules! frame_decompress_reuse {
($c:expr, $group:expr, $name:expr, $corpus:expr) => {
frame_decompress_reuse!($c, $group, $name, $corpus, 0);
};
($c:expr, $group:expr, $name:expr, $corpus:expr, $size:expr) => {
let mut corpus = $corpus;
if $size > 0 {
corpus = &corpus[..$size];
}
let mut compressed = Vec::with_capacity(
snap::raw::max_compress_len(corpus.len()) + FRAME_HEADER_SIZE,
);
snap::read::FrameEncoder::new(corpus)
.read_to_end(&mut compressed)
.unwrap();
let mut dst = vec![0; corpus.len() + FRAME_HEADER_SIZE];
define(
$c,
$group,
&format!("frame_decompress_reuse/{}", $name),
corpus,
move |b| {
let src: &[u8] = &compressed;
let mut decoder = snap::read::FrameDecoder::new(src);
b.iter(|| {
dst.clear();
decoder.reset(src);
decoder.read_to_end(&mut dst).unwrap();
});
},
);
};
}

fn all(c: &mut Criterion) {
rust(c);
#[cfg(feature = "cpp")]
Expand All @@ -76,10 +204,20 @@ fn rust(c: &mut Criterion) {
snap::raw::Encoder::new().compress(input, output)
}

fn frame_compress(input: &[u8], output: &mut Vec<u8>) {
let mut encoder = snap::read::FrameEncoder::new(input);
encoder.read_to_end(output).unwrap();
}

fn decompress(input: &[u8], output: &mut [u8]) -> snap::Result<usize> {
snap::raw::Decoder::new().decompress(input, output)
}

fn frame_decompress(input: &[u8], output: &mut Vec<u8>) {
let mut decoder = snap::read::FrameDecoder::new(input);
decoder.read_to_end(output).unwrap();
}

compress!(c, compress, "snap", "zflat00_html", CORPUS_HTML);
compress!(c, compress, "snap", "zflat01_urls", CORPUS_URLS_10K);
compress!(c, compress, "snap", "zflat02_jpg", CORPUS_FIREWORKS);
Expand All @@ -93,6 +231,90 @@ fn rust(c: &mut Criterion) {
compress!(c, compress, "snap", "zflat10_pb", CORPUS_GEOPROTO);
compress!(c, compress, "snap", "zflat11_gaviota", CORPUS_KPPKN);

frame_compress!(c, frame_compress, "snap", "zflat00_html", CORPUS_HTML);
frame_compress!(
c,
frame_compress,
"snap",
"zflat01_urls",
CORPUS_URLS_10K
);
frame_compress!(
c,
frame_compress,
"snap",
"zflat02_jpg",
CORPUS_FIREWORKS
);
frame_compress!(
c,
frame_compress,
"snap",
"zflat03_jpg_200",
CORPUS_FIREWORKS,
200
);
frame_compress!(
c,
frame_compress,
"snap",
"zflat04_pdf",
CORPUS_PAPER_100K
);
frame_compress!(
c,
frame_compress,
"snap",
"zflat05_html4",
CORPUS_HTML_X_4
);
frame_compress!(c, frame_compress, "snap", "zflat06_txt1", CORPUS_ALICE29);
frame_compress!(
c,
frame_compress,
"snap",
"zflat07_txt2",
CORPUS_ASYOULIK
);
frame_compress!(c, frame_compress, "snap", "zflat08_txt3", CORPUS_LCET10);
frame_compress!(
c,
frame_compress,
"snap",
"zflat09_txt4",
CORPUS_PLRABN12
);
frame_compress!(c, frame_compress, "snap", "zflat10_pb", CORPUS_GEOPROTO);
frame_compress!(
c,
frame_compress,
"snap",
"zflat11_gaviota",
CORPUS_KPPKN
);

#[cfg(feature = "reuse")]
{
frame_compress_reuse!(c, "snap", "zflat00_html", CORPUS_HTML);
frame_compress_reuse!(c, "snap", "zflat01_urls", CORPUS_URLS_10K);
frame_compress_reuse!(c, "snap", "zflat02_jpg", CORPUS_FIREWORKS);
frame_compress_reuse!(
c,
"snap",
"zflat03_jpg_200",
CORPUS_FIREWORKS,
200
);
frame_compress_reuse!(c, "snap", "zflat04_pdf", CORPUS_PAPER_100K);
frame_compress_reuse!(c, "snap", "zflat05_html4", CORPUS_HTML_X_4);
frame_compress_reuse!(c, "snap", "zflat06_txt1", CORPUS_ALICE29);
frame_compress_reuse!(c, "snap", "zflat07_txt2", CORPUS_ASYOULIK);
frame_compress_reuse!(c, "snap", "zflat08_txt3", CORPUS_LCET10);
frame_compress_reuse!(c, "snap", "zflat09_txt4", CORPUS_PLRABN12);
frame_compress_reuse!(c, "snap", "zflat10_pb", CORPUS_GEOPROTO);
frame_compress_reuse!(c, "snap", "zflat11_gaviota", CORPUS_KPPKN);
}

decompress!(c, decompress, "snap", "uflat00_html", CORPUS_HTML);
decompress!(c, decompress, "snap", "uflat01_urls", CORPUS_URLS_10K);
decompress!(c, decompress, "snap", "uflat02_jpg", CORPUS_FIREWORKS);
Expand All @@ -112,6 +334,114 @@ fn rust(c: &mut Criterion) {
decompress!(c, decompress, "snap", "uflat09_txt4", CORPUS_PLRABN12);
decompress!(c, decompress, "snap", "uflat10_pb", CORPUS_GEOPROTO);
decompress!(c, decompress, "snap", "uflat11_gaviota", CORPUS_KPPKN);

frame_decompress!(
c,
frame_decompress,
"snap",
"uflat00_html",
CORPUS_HTML
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat01_urls",
CORPUS_URLS_10K
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat02_jpg",
CORPUS_FIREWORKS
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat03_jpg_200",
CORPUS_FIREWORKS,
200
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat04_pdf",
CORPUS_PAPER_100K
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat05_html4",
CORPUS_HTML_X_4
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat06_txt1",
CORPUS_ALICE29
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat07_txt2",
CORPUS_ASYOULIK
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat08_txt3",
CORPUS_LCET10
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat09_txt4",
CORPUS_PLRABN12
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat10_pb",
CORPUS_GEOPROTO
);
frame_decompress!(
c,
frame_decompress,
"snap",
"uflat11_gaviota",
CORPUS_KPPKN
);

#[cfg(feature = "reuse")]
{
frame_decompress_reuse!(c, "snap", "uflat00_html", CORPUS_HTML);
frame_decompress_reuse!(c, "snap", "uflat01_urls", CORPUS_URLS_10K);
frame_decompress_reuse!(c, "snap", "uflat02_jpg", CORPUS_FIREWORKS);
frame_decompress_reuse!(
c,
"snap",
"uflat03_jpg_200",
CORPUS_FIREWORKS,
200
);
frame_decompress_reuse!(c, "snap", "uflat04_pdf", CORPUS_PAPER_100K);
frame_decompress_reuse!(c, "snap", "uflat05_html4", CORPUS_HTML_X_4);
frame_decompress_reuse!(c, "snap", "uflat06_txt1", CORPUS_ALICE29);
frame_decompress_reuse!(c, "snap", "uflat07_txt2", CORPUS_ASYOULIK);
frame_decompress_reuse!(c, "snap", "uflat08_txt3", CORPUS_LCET10);
frame_decompress_reuse!(c, "snap", "uflat09_txt4", CORPUS_PLRABN12);
frame_decompress_reuse!(c, "snap", "uflat10_pb", CORPUS_GEOPROTO);
frame_decompress_reuse!(c, "snap", "uflat11_gaviota", CORPUS_KPPKN);
}
}

#[cfg(feature = "cpp")]
Expand Down
Loading