Skip to content

Commit

Permalink
Optimizations.
Browse files Browse the repository at this point in the history
  • Loading branch information
@matt-42
matt-42 committed Oct 28, 2020
1 parent 998e605 commit 8032668
Show file tree
Hide file tree
Showing 7 changed files with 180 additions and 41 deletions.
27 changes: 20 additions & 7 deletions libraries/http_backend/http_backend/http_serve.hh
View file
Expand Up @@ -281,9 +281,13 @@ struct http_ctx {
while (start < (line_end - 1) and *start == split_char)
start++;

const char* end = start + 1;
while (end < (line_end - 1) and *end != split_char)
end++;
const char* end = (const char*)memchr(start + 1, split_char, line_end - start - 2);
if (!end) end = line_end - 1;

// Was:
// const char* end = start + 1;
// while (end < (line_end - 1) and *end != split_char)
// end++;
cur = end + 1;
if (*end == split_char)
return std::string_view(start, cur - start - 1);
Expand Down Expand Up @@ -565,12 +569,21 @@ template <typename F> auto make_http_processor(F handler) {
return;

const char* cur = rb.data() + header_end;
const char* rbend = rb.data() + rb.end - 3;
while (!complete_header) {
// Look for end of header and save header lines.
while ((cur - rb.data()) < rb.end - 3) {
if (cur[0] == '\r' and cur[1] == '\n') {
ctx.add_header_line(cur + 2);
cur += 2;
// while ((cur - rb.data()) < rb.end - 3) {
while (cur < rbend) {
cur = (const char*) memchr(cur, '\r', rbend - cur);
if (!cur) {
cur = rbend;
break;
}
if (cur[0] == '\r' and // already checked by memchr.
cur[1] == '\n') {
cur += 2;// skip \r\n
ctx.add_header_line(cur);
// If we read \r\n twice the header is complete.
if (cur[0] == '\r' and cur[1] == '\n')
{
complete_header = true;
Expand Down
11 changes: 11 additions & 0 deletions libraries/json/json/decode_stringstream.hh
View file
Expand Up @@ -122,6 +122,17 @@ public:
inline int bad() const { return bad_; }
inline int good() const { return !bad_ && !eof(); }

template <typename O, typename F> void copy_until(O& output, F until) {
const char* start = cur;
const char* end = cur;
const char* buffer_end = buffer.data() + buffer.size();
while (until(*end) && end < buffer_end)
end++;

output.append(std::string_view(start, end - start));
cur = end;
}

template <typename T> void operator>>(T& value) {
eat_spaces();
if constexpr (std::is_floating_point<T>::value) {
Expand Down
17 changes: 13 additions & 4 deletions libraries/json/json/unicode.hh
View file
Expand Up @@ -14,15 +14,21 @@
namespace li {

template <typename O> inline decltype(auto) wrap_json_output_stream(O&& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::ostringstream& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::string& s) {
return mmm(s::append = [&s](char c) { s.append(1, c); });
return mmm(s::append = [&s](auto c) {
using C = std::remove_reference_t<decltype(c)>;
if constexpr(std::is_same_v<C, char> || std::is_same_v<C, unsigned char> || std::is_same_v<C, int>)
s.append(1, c);
else
s.append(c);
});
}

inline decltype(auto) wrap_json_input_stream(std::istringstream& s) { return s; }
Expand Down Expand Up @@ -56,7 +62,7 @@ enum json_encodings { UTF32BE, UTF32LE, UTF16BE, UTF16LE, UTF8 };

// Detection of encoding depending on the pattern of the
// first fourth characters.
auto detect_encoding(char a, char b, char c, char d) {
inline auto detect_encoding(char a, char b, char c, char d) {
// 00 00 00 xx UTF-32BE
// xx 00 00 00 UTF-32LE
// 00 xx 00 xx UTF-16BE
Expand Down Expand Up @@ -249,6 +255,9 @@ template <typename S, typename T> auto utf8_to_json(S&& s, T&& o) {

while (!s.eof()) {
// 7-bits codepoint
if constexpr(std::is_same_v<std::remove_reference_t<S>, decode_stringstream>)
s.copy_until(o, [] (char c) { return c > '"' && c <= '~' && c != '\\'; });

while (s.good() and s.peek() <= 0x7F and s.peek() != EOF) {
switch (s.peek()) {
case '"':
Expand Down
55 changes: 44 additions & 11 deletions single_headers/lithium.hh
View file
Expand Up @@ -1918,6 +1918,17 @@ public:
inline int bad() const { return bad_; }
inline int good() const { return !bad_ && !eof(); }

template <typename O, typename F> void copy_until(O& output, F until) {
const char* start = cur;
const char* end = cur;
const char* buffer_end = buffer.data() + buffer.size();
while (until(*end) && end < buffer_end)
end++;

output.append(std::string_view(start, end - start));
cur = end;
}

template <typename T> void operator>>(T& value) {
eat_spaces();
if constexpr (std::is_floating_point<T>::value) {
Expand Down Expand Up @@ -2044,15 +2055,21 @@ static int json_ok = json_no_error();
namespace li {

template <typename O> inline decltype(auto) wrap_json_output_stream(O&& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::ostringstream& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::string& s) {
return mmm(s::append = [&s](char c) { s.append(1, c); });
return mmm(s::append = [&s](auto c) {
using C = std::remove_reference_t<decltype(c)>;
if constexpr(std::is_same_v<C, char> || std::is_same_v<C, unsigned char> || std::is_same_v<C, int>)
s.append(1, c);
else
s.append(c);
});
}

inline decltype(auto) wrap_json_input_stream(std::istringstream& s) { return s; }
Expand Down Expand Up @@ -2086,7 +2103,7 @@ enum json_encodings { UTF32BE, UTF32LE, UTF16BE, UTF16LE, UTF8 };

// Detection of encoding depending on the pattern of the
// first fourth characters.
auto detect_encoding(char a, char b, char c, char d) {
inline auto detect_encoding(char a, char b, char c, char d) {
// 00 00 00 xx UTF-32BE
// xx 00 00 00 UTF-32LE
// 00 xx 00 xx UTF-16BE
Expand Down Expand Up @@ -2279,6 +2296,9 @@ template <typename S, typename T> auto utf8_to_json(S&& s, T&& o) {

while (!s.eof()) {
// 7-bits codepoint
if constexpr(std::is_same_v<std::remove_reference_t<S>, decode_stringstream>)
s.copy_until(o, [] (char c) { return c > '"' && c <= '~' && c != '\\'; });

while (s.good() and s.peek() <= 0x7F and s.peek() != EOF) {
switch (s.peek()) {
case '"':
Expand Down Expand Up @@ -7909,9 +7929,13 @@ struct http_ctx {
while (start < (line_end - 1) and *start == split_char)
start++;

const char* end = start + 1;
while (end < (line_end - 1) and *end != split_char)
end++;
const char* end = (const char*)memchr(start + 1, split_char, line_end - start - 2);
if (!end) end = line_end - 1;

// Was:
// const char* end = start + 1;
// while (end < (line_end - 1) and *end != split_char)
// end++;
cur = end + 1;
if (*end == split_char)
return std::string_view(start, cur - start - 1);
Expand Down Expand Up @@ -8193,12 +8217,21 @@ template <typename F> auto make_http_processor(F handler) {
return;

const char* cur = rb.data() + header_end;
const char* rbend = rb.data() + rb.end - 3;
while (!complete_header) {
// Look for end of header and save header lines.
while ((cur - rb.data()) < rb.end - 3) {
if (cur[0] == '\r' and cur[1] == '\n') {
ctx.add_header_line(cur + 2);
cur += 2;
// while ((cur - rb.data()) < rb.end - 3) {
while (cur < rbend) {
cur = (const char*) memchr(cur, '\r', rbend - cur);
if (!cur) {
cur = rbend;
break;
}
if (cur[0] == '\r' and // already checked by memchr.
cur[1] == '\n') {
cur += 2;// skip \r\n
ctx.add_header_line(cur);
// If we read \r\n twice the header is complete.
if (cur[0] == '\r' and cur[1] == '\n')
{
complete_header = true;
Expand Down
55 changes: 44 additions & 11 deletions single_headers/lithium_http_backend.hh
View file
Expand Up @@ -190,6 +190,17 @@ public:
inline int bad() const { return bad_; }
inline int good() const { return !bad_ && !eof(); }

template <typename O, typename F> void copy_until(O& output, F until) {
const char* start = cur;
const char* end = cur;
const char* buffer_end = buffer.data() + buffer.size();
while (until(*end) && end < buffer_end)
end++;

output.append(std::string_view(start, end - start));
cur = end;
}

template <typename T> void operator>>(T& value) {
eat_spaces();
if constexpr (std::is_floating_point<T>::value) {
Expand Down Expand Up @@ -985,15 +996,21 @@ auto forward_tuple_as_metamap(std::tuple<S...> keys, const std::tuple<V...>& val
namespace li {

template <typename O> inline decltype(auto) wrap_json_output_stream(O&& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::ostringstream& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::string& s) {
return mmm(s::append = [&s](char c) { s.append(1, c); });
return mmm(s::append = [&s](auto c) {
using C = std::remove_reference_t<decltype(c)>;
if constexpr(std::is_same_v<C, char> || std::is_same_v<C, unsigned char> || std::is_same_v<C, int>)
s.append(1, c);
else
s.append(c);
});
}

inline decltype(auto) wrap_json_input_stream(std::istringstream& s) { return s; }
Expand Down Expand Up @@ -1027,7 +1044,7 @@ enum json_encodings { UTF32BE, UTF32LE, UTF16BE, UTF16LE, UTF8 };

// Detection of encoding depending on the pattern of the
// first fourth characters.
auto detect_encoding(char a, char b, char c, char d) {
inline auto detect_encoding(char a, char b, char c, char d) {
// 00 00 00 xx UTF-32BE
// xx 00 00 00 UTF-32LE
// 00 xx 00 xx UTF-16BE
Expand Down Expand Up @@ -1220,6 +1237,9 @@ template <typename S, typename T> auto utf8_to_json(S&& s, T&& o) {

while (!s.eof()) {
// 7-bits codepoint
if constexpr(std::is_same_v<std::remove_reference_t<S>, decode_stringstream>)
s.copy_until(o, [] (char c) { return c > '"' && c <= '~' && c != '\\'; });

while (s.good() and s.peek() <= 0x7F and s.peek() != EOF) {
switch (s.peek()) {
case '"':
Expand Down Expand Up @@ -4424,9 +4444,13 @@ struct http_ctx {
while (start < (line_end - 1) and *start == split_char)
start++;

const char* end = start + 1;
while (end < (line_end - 1) and *end != split_char)
end++;
const char* end = (const char*)memchr(start + 1, split_char, line_end - start - 2);
if (!end) end = line_end - 1;

// Was:
// const char* end = start + 1;
// while (end < (line_end - 1) and *end != split_char)
// end++;
cur = end + 1;
if (*end == split_char)
return std::string_view(start, cur - start - 1);
Expand Down Expand Up @@ -4708,12 +4732,21 @@ template <typename F> auto make_http_processor(F handler) {
return;

const char* cur = rb.data() + header_end;
const char* rbend = rb.data() + rb.end - 3;
while (!complete_header) {
// Look for end of header and save header lines.
while ((cur - rb.data()) < rb.end - 3) {
if (cur[0] == '\r' and cur[1] == '\n') {
ctx.add_header_line(cur + 2);
cur += 2;
// while ((cur - rb.data()) < rb.end - 3) {
while (cur < rbend) {
cur = (const char*) memchr(cur, '\r', rbend - cur);
if (!cur) {
cur = rbend;
break;
}
if (cur[0] == '\r' and // already checked by memchr.
cur[1] == '\n') {
cur += 2;// skip \r\n
ctx.add_header_line(cur);
// If we read \r\n twice the header is complete.
if (cur[0] == '\r' and cur[1] == '\n')
{
complete_header = true;
Expand Down
28 changes: 24 additions & 4 deletions single_headers/lithium_http_client.hh
View file
Expand Up @@ -462,6 +462,17 @@ public:
inline int bad() const { return bad_; }
inline int good() const { return !bad_ && !eof(); }

template <typename O, typename F> void copy_until(O& output, F until) {
const char* start = cur;
const char* end = cur;
const char* buffer_end = buffer.data() + buffer.size();
while (until(*end) && end < buffer_end)
end++;

output.append(std::string_view(start, end - start));
cur = end;
}

template <typename T> void operator>>(T& value) {
eat_spaces();
if constexpr (std::is_floating_point<T>::value) {
Expand Down Expand Up @@ -1010,15 +1021,21 @@ auto forward_tuple_as_metamap(std::tuple<S...> keys, const std::tuple<V...>& val
namespace li {

template <typename O> inline decltype(auto) wrap_json_output_stream(O&& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::ostringstream& s) {
return mmm(s::append = [&s](char c) { s << c; });
return mmm(s::append = [&s](auto c) { s << c; });
}

inline decltype(auto) wrap_json_output_stream(std::string& s) {
return mmm(s::append = [&s](char c) { s.append(1, c); });
return mmm(s::append = [&s](auto c) {
using C = std::remove_reference_t<decltype(c)>;
if constexpr(std::is_same_v<C, char> || std::is_same_v<C, unsigned char> || std::is_same_v<C, int>)
s.append(1, c);
else
s.append(c);
});
}

inline decltype(auto) wrap_json_input_stream(std::istringstream& s) { return s; }
Expand Down Expand Up @@ -1052,7 +1069,7 @@ enum json_encodings { UTF32BE, UTF32LE, UTF16BE, UTF16LE, UTF8 };

// Detection of encoding depending on the pattern of the
// first fourth characters.
auto detect_encoding(char a, char b, char c, char d) {
inline auto detect_encoding(char a, char b, char c, char d) {
// 00 00 00 xx UTF-32BE
// xx 00 00 00 UTF-32LE
// 00 xx 00 xx UTF-16BE
Expand Down Expand Up @@ -1245,6 +1262,9 @@ template <typename S, typename T> auto utf8_to_json(S&& s, T&& o) {

while (!s.eof()) {
// 7-bits codepoint
if constexpr(std::is_same_v<std::remove_reference_t<S>, decode_stringstream>)
s.copy_until(o, [] (char c) { return c > '"' && c <= '~' && c != '\\'; });

while (s.good() and s.peek() <= 0x7F and s.peek() != EOF) {
switch (s.peek()) {
case '"':
Expand Down

0 comments on commit 8032668

Please sign in to comment.