yuzu/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib synced 2024-11-21 14:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add compression buffer size customization (#644)

Browse source 
* add compression buffer size customization and small brotli refactor

* allocat brotli buffer once

* add init to brotli decoder buffer
This commit is contained in:
Ivan Fefer 2020-09-08 19:18:14 +03:00 committed by GitHub
parent 9d12b3f20e
commit 3da4a0ac69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
httplib.h
View file

@ -80,6 +80,10 @@
#define CPPHTTPLIB_RECV_BUFSIZ size_t(4096u) #define CPPHTTPLIB_RECV_BUFSIZ size_t(4096u)
#endif #endif
#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ
#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u)
#endif
#ifndef CPPHTTPLIB_THREAD_POOL_COUNT #ifndef CPPHTTPLIB_THREAD_POOL_COUNT
#define CPPHTTPLIB_THREAD_POOL_COUNT \ #define CPPHTTPLIB_THREAD_POOL_COUNT \
((std::max)(8u, std::thread::hardware_concurrency() > 0 \ ((std::max)(8u, std::thread::hardware_concurrency() > 0 \
@ -2226,7 +2230,7 @@ public:
int ret = Z_OK; int ret = Z_OK;
std::array<char, 16384> buff{}; std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
do { do {
strm_.avail_out = buff.size(); strm_.avail_out = buff.size();
strm_.next_out = reinterpret_cast<Bytef *>(buff.data()); strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
@ -2277,7 +2281,7 @@ public:
strm_.avail_in = static_cast<decltype(strm_.avail_in)>(data_length); strm_.avail_in = static_cast<decltype(strm_.avail_in)>(data_length);
strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data)); strm_.next_in = const_cast<Bytef *>(reinterpret_cast<const Bytef *>(data));
std::array<char, 16384> buff{}; std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
while (strm_.avail_in > 0) { while (strm_.avail_in > 0) {
strm_.avail_out = buff.size(); strm_.avail_out = buff.size();
strm_.next_out = reinterpret_cast<Bytef *>(buff.data()); strm_.next_out = reinterpret_cast<Bytef *>(buff.data());
@ -2315,7 +2319,7 @@ public:
bool compress(const char *data, size_t data_length, bool last, bool compress(const char *data, size_t data_length, bool last,
Callback callback) override { Callback callback) override {
std::array<uint8_t, 16384> buff{}; std::array<uint8_t, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS; auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS;
auto available_in = data_length; auto available_in = data_length;
@ -2377,18 +2381,18 @@ public:
decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT; decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT;
std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) { while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) {
char output[1024]; char *next_out = buff.data();
char *next_out = output; size_t avail_out = buff.size();
size_t avail_out = sizeof(output);
decoder_r = BrotliDecoderDecompressStream( decoder_r = BrotliDecoderDecompressStream(
decoder_s, &avail_in, &next_in, &avail_out, decoder_s, &avail_in, &next_in, &avail_out,
reinterpret_cast<unsigned char **>(&next_out), &total_out); reinterpret_cast<uint8_t **>(&next_out), &total_out);
if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; } if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; }
if (!callback((const char *)output, sizeof(output) - avail_out)) { if (!callback(buff.data(), buff.size() - avail_out)) {
return false; return false;
} }
} }