deps: update zlib to 1.3.0.1-motley-71660e1 by nodejs-github-bot · Pull Request #53464 · nodejs/node · GitHub
Skip to content

deps: update zlib to 1.3.0.1-motley-71660e1 #53464

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

Closed
nodejs-github-bot wants to merge 6 commits into from
Closed

deps: update zlib to 1.3.0.1-motley-71660e1 #53464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ad345d
deps: update zlib to 1.3.0.1-motley-887bb57
nodejs-github-bot Jun 16, 2024
14721db
deps: update zlib to 1.3.0.1-motley-e432200
nodejs-github-bot Jun 23, 2024
167a4c1
deps: update zlib to 1.3.0.1-motley-8b7eff8
nodejs-github-bot Jun 30, 2024
7518912
deps: update zlib to 1.3.0.1-motley-68e57e6
nodejs-github-bot Jul 7, 2024
0bffe08
deps: update zlib to 1.3.0.1-motley-c2469fd
nodejs-github-bot Jul 14, 2024
7bb8e16
deps: update zlib to 1.3.0.1-motley-71660e1
nodejs-github-bot Aug 4, 2024
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
26 changes: 26 additions & 0 deletions deps/zlib/CMakeLists.txt
View file
Open in desktop
20 changes: 6 additions & 14 deletions deps/zlib/contrib/bench/zlib_bench.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ Data read_file_data_or_exit(const char* name) {
return data;
}

size_t zlib_estimate_compressed_size(size_t input_size) {
return compressBound(input_size);
}

enum zlib_wrapper {
kWrapperNONE,
kWrapperZLIB,
Expand Down Expand Up @@ -128,10 +124,6 @@ void zlib_compress(
std::string* output,
bool resize_output = false)
{
if (resize_output)
output->resize(zlib_estimate_compressed_size(input_size));
size_t output_size = output->size();

z_stream stream;
memset(&stream, 0, sizeof(stream));

Expand All @@ -140,6 +132,11 @@ void zlib_compress(
if (result != Z_OK)
error_exit("deflateInit2 failed", result);

if (resize_output) {
output->resize(deflateBound(&stream, input_size));
}
size_t output_size = output->size();

stream.next_out = (Bytef*)string_data(output);
stream.avail_out = (uInt)output_size;
stream.next_in = (z_const Bytef*)input;
Expand Down Expand Up @@ -299,19 +296,14 @@ void zlib_file(const char* name,

// Pre-grow the output buffer so we don't measure string resize time.
for (int b = 0; b < blocks; ++b)
compressed[b].resize(zlib_estimate_compressed_size(block_size));
zlib_compress(type, input[b], input_length[b], &compressed[b], true);

auto start = now();
for (int b = 0; b < blocks; ++b)
for (int r = 0; r < repeats; ++r)
zlib_compress(type, input[b], input_length[b], &compressed[b]);
ctime[run] = std::chrono::duration<double>(now() - start).count();

// Compress again, resizing compressed, so we don't leave junk at the
// end of the compressed string that could confuse zlib_uncompress().
for (int b = 0; b < blocks; ++b)
zlib_compress(type, input[b], input_length[b], &compressed[b], true);

for (int b = 0; b < blocks; ++b)
output[b].resize(input_length[b]);

Expand Down
3 changes: 2 additions & 1 deletion deps/zlib/contrib/minizip/README.chromium
View file
Open in desktop
Loading