Update benchmarks

This commit is contained in:
Vincent Prouillet 2018-01-26 16:07:44 +01:00
parent 7316b98c9b
commit 49793314a0
3 changed files with 72 additions and 70 deletions

14
Cargo.lock generated
View file

@ -747,15 +747,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "pest" name = "pest"
version = "1.0.2" version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "pest_derive" name = "pest_derive"
version = "1.0.2" version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"pest 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -1157,8 +1157,8 @@ dependencies = [
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pest 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"pest_derive 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "pest_derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1495,8 +1495,8 @@ dependencies = [
"checksum onig_sys 67.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e49311d8357c2173fe429cd6a592a2578ec69d59c7508efb4516634ada85bbb8" "checksum onig_sys 67.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e49311d8357c2173fe429cd6a592a2578ec69d59c7508efb4516634ada85bbb8"
"checksum os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f547689aea1f11fac90333d573854a8e3e52a9160df1c42aefa8cd16734a3c0" "checksum os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f547689aea1f11fac90333d573854a8e3e52a9160df1c42aefa8cd16734a3c0"
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
"checksum pest 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f3db16272e194d43f5cf2be1a4fa9866b3582821f410a00c094951d6b97ff6eb" "checksum pest 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1117ca38a751edc66a4cd9ca1b35644b7d00305971306e07e0d3befbc61e906"
"checksum pest_derive 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e2abeb78379aa216ce65ae83f16c44e3fee1d8c417dadddc8fae972baba9429" "checksum pest_derive 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1debf85717cb8fa6bf2aad21fbbe888fda5797aae22d332cefec9ba79b6c7a33"
"checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc" "checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc"
"checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f" "checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f"
"checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03" "checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03"

View file

@ -14,7 +14,7 @@ CATEGORIES = ["c1", "c2", "c3", "c4"]
PAGE = """ PAGE = """
+++ +++
title = "Hello" title = "Hello"
date = "REPLACE_DATE" date = REPLACE_DATE
tags = REPLACE_TAG tags = REPLACE_TAG
category = "REPLACE_CATEGORY" category = "REPLACE_CATEGORY"
+++ +++
@ -105,6 +105,7 @@ title = "My site"
base_url = "https://replace-this-with-your-url.com" base_url = "https://replace-this-with-your-url.com"
generate_tags_pages = true generate_tags_pages = true
generate_categories_pages = true generate_categories_pages = true
theme = "sample"
[extra.author] [extra.author]
name = "Vincent Prouillet" name = "Vincent Prouillet"
@ -113,14 +114,15 @@ name = "Vincent Prouillet"
f.write(""" f.write("""
title = "My site" title = "My site"
base_url = "https://replace-this-with-your-url.com" base_url = "https://replace-this-with-your-url.com"
theme = "sample"
[extra.author] [extra.author]
name = "Vincent Prouillet" name = "Vincent Prouillet"
""") """)
# Re-use the test templates # Re-use the test templates
shutil.copytree("../test_site/templates", os.path.join(name, "templates")) shutil.copytree("../test_site/templates", os.path.join(name, "templates"))
shutil.copytree("../test_site/themes", os.path.join(name, "themes"))
def gen_section(path, num_pages, is_blog): def gen_section(path, num_pages, is_blog):

View file

@ -30,47 +30,47 @@ fn bench_loading_small_blog_with_syntax_highlighting(b: &mut test::Bencher) {
b.iter(|| site.load().unwrap()); b.iter(|| site.load().unwrap());
} }
#[bench] //#[bench]
fn bench_loading_medium_blog(b: &mut test::Bencher) { //fn bench_loading_medium_blog(b: &mut test::Bencher) {
let mut path = env::current_dir().unwrap().to_path_buf(); // let mut path = env::current_dir().unwrap().to_path_buf();
path.push("benches"); // path.push("benches");
path.push("medium-blog"); // path.push("medium-blog");
let mut site = Site::new(&path, "config.toml").unwrap(); // let mut site = Site::new(&path, "config.toml").unwrap();
//
b.iter(|| site.load().unwrap()); // b.iter(|| site.load().unwrap());
} //}
//
#[bench] //#[bench]
fn bench_loading_medium_blog_with_syntax_highlighting(b: &mut test::Bencher) { //fn bench_loading_medium_blog_with_syntax_highlighting(b: &mut test::Bencher) {
let mut path = env::current_dir().unwrap().to_path_buf(); // let mut path = env::current_dir().unwrap().to_path_buf();
path.push("benches"); // path.push("benches");
path.push("medium-blog"); // path.push("medium-blog");
let mut site = Site::new(&path, "config.toml").unwrap(); // let mut site = Site::new(&path, "config.toml").unwrap();
site.config.highlight_code = Some(true); // site.config.highlight_code = Some(true);
//
b.iter(|| site.load().unwrap()); // b.iter(|| site.load().unwrap());
} //}
//
#[bench] //#[bench]
fn bench_loading_big_blog(b: &mut test::Bencher) { //fn bench_loading_big_blog(b: &mut test::Bencher) {
let mut path = env::current_dir().unwrap().to_path_buf(); // let mut path = env::current_dir().unwrap().to_path_buf();
path.push("benches"); // path.push("benches");
path.push("big-blog"); // path.push("big-blog");
let mut site = Site::new(&path, "config.toml").unwrap(); // let mut site = Site::new(&path, "config.toml").unwrap();
//
b.iter(|| site.load().unwrap()); // b.iter(|| site.load().unwrap());
} //}
//
#[bench] //#[bench]
fn bench_loading_big_blog_with_syntax_highlighting(b: &mut test::Bencher) { //fn bench_loading_big_blog_with_syntax_highlighting(b: &mut test::Bencher) {
let mut path = env::current_dir().unwrap().to_path_buf(); // let mut path = env::current_dir().unwrap().to_path_buf();
path.push("benches"); // path.push("benches");
path.push("big-blog"); // path.push("big-blog");
let mut site = Site::new(&path, "config.toml").unwrap(); // let mut site = Site::new(&path, "config.toml").unwrap();
site.config.highlight_code = Some(true); // site.config.highlight_code = Some(true);
//
b.iter(|| site.load().unwrap()); // b.iter(|| site.load().unwrap());
} //}
//#[bench] //#[bench]
//fn bench_loading_huge_blog(b: &mut test::Bencher) { //fn bench_loading_huge_blog(b: &mut test::Bencher) {
@ -114,26 +114,26 @@ fn bench_loading_small_kb_with_syntax_highlighting(b: &mut test::Bencher) {
b.iter(|| site.load().unwrap()); b.iter(|| site.load().unwrap());
} }
#[bench] //#[bench]
fn bench_loading_medium_kb(b: &mut test::Bencher) { //fn bench_loading_medium_kb(b: &mut test::Bencher) {
let mut path = env::current_dir().unwrap().to_path_buf(); // let mut path = env::current_dir().unwrap().to_path_buf();
path.push("benches"); // path.push("benches");
path.push("medium-kb"); // path.push("medium-kb");
let mut site = Site::new(&path, "config.toml").unwrap(); // let mut site = Site::new(&path, "config.toml").unwrap();
//
b.iter(|| site.load().unwrap()); // b.iter(|| site.load().unwrap());
} //}
//
#[bench] //#[bench]
fn bench_loading_medium_kb_with_syntax_highlighting(b: &mut test::Bencher) { //fn bench_loading_medium_kb_with_syntax_highlighting(b: &mut test::Bencher) {
let mut path = env::current_dir().unwrap().to_path_buf(); // let mut path = env::current_dir().unwrap().to_path_buf();
path.push("benches"); // path.push("benches");
path.push("medium-kb"); // path.push("medium-kb");
let mut site = Site::new(&path, "config.toml").unwrap(); // let mut site = Site::new(&path, "config.toml").unwrap();
site.config.highlight_code = Some(true); // site.config.highlight_code = Some(true);
//
b.iter(|| site.load().unwrap()); // b.iter(|| site.load().unwrap());
} //}
//#[bench] //#[bench]
//fn bench_loading_huge_kb(b: &mut test::Bencher) { //fn bench_loading_huge_kb(b: &mut test::Bencher) {