UseSpanToReduceAllocations

Author: kiroxas

core/io/http_client_tcp.cpp

@@ -482,7 +482,6 @@ Error HTTPClientTCP::poll() {
 						(rs >= 2 && response_str[rs - 2] == '\n' && response_str[rs - 1] == '\n') ||
 						(rs >= 4 && response_str[rs - 4] == '\r' && response_str[rs - 3] == '\n' && response_str[rs - 2] == '\r' && response_str[rs - 1] == '\n')) {
 					// End of response, parse.
-					response_str.push_back(0);
 					String response = String::utf8((const char *)response_str.ptr(), response_str.size());
 					Vector<String> responses = response.split("\n");
 					body_size = -1;
@@ -506,13 +505,20 @@ Error HTTPClientTCP::poll() {
 						if (s.length() == 0) {
 							continue;
 						}
-						if (s.begins_with("content-length:")) {
-							body_size = s.substr(s.find_char(':') + 1).strip_edges().to_int();
+						const char content_length_label[] = "content-length:";
+						const char transfer_encoding_label[] = "transfer-encoding:";
+						if (s.begins_with(content_length_label)) {
+							const int index = std::size(content_length_label) - 1;
+							Span<char32_t> sp = Span<char32_t>(s.ptr() + index, s.length() - index);
+							sp = String::strip_edges_span(sp, true, true);
+							body_size = String::to_int(sp.begin(), sp.size());
 							body_left = body_size;
 
-						} else if (s.begins_with("transfer-encoding:")) {
-							String encoding = header.substr(header.find_char(':') + 1).strip_edges();
-							if (encoding == "chunked") {
+						} else if (s.begins_with(transfer_encoding_label)) {
+							const int index = std::size(transfer_encoding_label) - 1;
+							Span<char32_t> sp = Span<char32_t>(s.ptr() + index, s.length() - index);
+							sp = String::strip_edges_span(sp, true, true);
+							if (String("chunked") == sp) {
 								chunked = true;
 							}
 						} else if (s.begins_with("connection: close")) {

core/string/ustring.cpp

@@ -4345,35 +4345,38 @@ String String::dedent() const {
 	return new_string;
 }
 
-String String::strip_edges(bool left, bool right) const {
-	int len = length();
-	int beg = 0, end = len;
+Span<char32_t> String::strip_edges_span(Span<char32_t> p_span, bool p_left, bool p_right) {
+	uint64_t beg = 0;
+	uint64_t end = p_span.size();
 
-	if (left) {
-		for (int i = 0; i < len; i++) {
-			if (operator[](i) <= 32) {
+	if (p_left) {
+		for (uint64_t i = 0; i < end; i++) {
+			if (p_span[i] <= 32) {
 				beg++;
 			} else {
 				break;
 			}
 		}
 	}
 
-	if (right) {
-		for (int i = len - 1; i >= 0; i--) {
-			if (operator[](i) <= 32) {
+	if (p_right && (end > 0)) {
+		for (uint64_t i = end - 1; i > beg; i--) {
+			if (p_span[i] <= 32) {
 				end--;
 			} else {
 				break;
 			}
 		}
 	}
 
-	if (beg == 0 && end == len) {
-		return *this;
-	}
+	return Span(p_span.ptr() + beg, static_cast<uint64_t>(end - beg));
+}
+
+String String::strip_edges(bool left, bool right) const {
+	const char32_t *p = ptr();
+	Span<char32_t> sp = strip_edges_span(span(), left, right);
 
-	return substr(beg, end - beg);
+	return substr(sp.begin() - p, sp.size());
 }
 
 String String::strip_escapes() const {

core/string/ustring.h

@@ -293,6 +293,8 @@ class String {
 	_FORCE_INLINE_ operator Span<char32_t>() const { return Span(ptr(), length()); }
 	_FORCE_INLINE_ Span<char32_t> span() const { return Span(ptr(), length()); }
 
+	static Span<char32_t> strip_edges_span(Span<char32_t> p_span, bool p_left, bool p_right);
+
 	void remove_at(int p_index) { _cowdata.remove_at(p_index); }
 
 	_FORCE_INLINE_ void clear() { resize(0); }