Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 84 insertions, 0 deletions

diff --git a/vendor/zip/benches/read_entry.rs b/vendor/zip/benches/read_entry.rs
new file mode 100644
index 000000000..af9affe31
--- /dev/null
+++ b/vendor/zip/benches/read_entry.rs
@@ -0,0 +1,43 @@
+use bencher::{benchmark_group, benchmark_main};
+
+use std::io::{Cursor, Read, Write};
+
+use bencher::Bencher;
+use getrandom::getrandom;
+use zip::{ZipArchive, ZipWriter};
+
+fn generate_random_archive(size: usize) -> Vec<u8> {
+    let data = Vec::new();
+    let mut writer = ZipWriter::new(Cursor::new(data));
+    let options =
+        zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
+
+    writer.start_file("random.dat", options).unwrap();
+    let mut bytes = vec![0u8; size];
+    getrandom(&mut bytes).unwrap();
+    writer.write_all(&bytes).unwrap();
+
+    writer.finish().unwrap().into_inner()
+}
+
+fn read_entry(bench: &mut Bencher) {
+    let size = 1024 * 1024;
+    let bytes = generate_random_archive(size);
+    let mut archive = ZipArchive::new(Cursor::new(bytes.as_slice())).unwrap();
+
+    bench.iter(|| {
+        let mut file = archive.by_name("random.dat").unwrap();
+        let mut buf = [0u8; 1024];
+        loop {
+            let n = file.read(&mut buf).unwrap();
+            if n == 0 {
+                break;
+            }
+        }
+    });
+
+    bench.bytes = size as u64;
+}
+
+benchmark_group!(benches, read_entry);
+benchmark_main!(benches);
diff --git a/vendor/zip/benches/read_metadata.rs b/vendor/zip/benches/read_metadata.rs
new file mode 100644
index 000000000..51f1f69e8
--- /dev/null
+++ b/vendor/zip/benches/read_metadata.rs
@@ -0,0 +1,41 @@
+use bencher::{benchmark_group, benchmark_main};
+
+use std::io::{Cursor, Write};
+
+use bencher::Bencher;
+use zip::{ZipArchive, ZipWriter};
+
+const FILE_COUNT: usize = 15_000;
+const FILE_SIZE: usize = 1024;
+
+fn generate_random_archive(count_files: usize, file_size: usize) -> Vec<u8> {
+    let data = Vec::new();
+    let mut writer = ZipWriter::new(Cursor::new(data));
+    let options =
+        zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Stored);
+
+    let bytes = vec![0u8; file_size];
+
+    for i in 0..count_files {
+        let name = format!(
+            "file_deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef_{}.dat",
+            i
+        );
+        writer.start_file(name, options).unwrap();
+        writer.write_all(&bytes).unwrap();
+    }
+
+    writer.finish().unwrap().into_inner()
+}
+
+fn read_metadata(bench: &mut Bencher) {
+    let bytes = generate_random_archive(FILE_COUNT, FILE_SIZE);
+
+    bench.iter(|| {
+        let archive = ZipArchive::new(Cursor::new(bytes.as_slice())).unwrap();
+        archive.len()
+    });
+}
+
+benchmark_group!(benches, read_metadata);
+benchmark_main!(benches);