strtok in more places

lib/http/request.cpp

@@ -1,48 +1,52 @@
 #include "request.hpp"
 #include "../log/log.hpp"
 #include "constants.hpp"
+#include <cstring>
 #include <stdio.h>
 
 namespace anthracite::http {
 
-void request::parse_header(std::string& raw_line) {
+void request::parse_header(char* raw_line) {
-    auto delim_pos = raw_line.find_first_of(':');
+    uint32_t delim_pos = strstr(raw_line, ":") - raw_line + 1;
-    auto value_pos = raw_line.find_first_not_of(' ', delim_pos+1);
 
-    std::string header_name = raw_line.substr(0,delim_pos);
+    std::string query_val((char*)(raw_line + delim_pos));
-    std::string header_val = raw_line.substr(value_pos);
+    std::string query_name(raw_line, delim_pos - 1);
 
-    _headers[header_name] = header(header_name, header_val);
+    _headers[query_name] = header(query_name, query_val);
 }
 
-void request::parse_query_param(std::string& raw_param) {
+void request::parse_query_param(char* raw_param) {
-    auto delim_pos = raw_param.find_first_of('=');
+    uint32_t delim_pos = strstr(raw_param, "=") - raw_param + 1;
-    auto value_pos = delim_pos+1;
 
-    std::string query_name = raw_param.substr(0,delim_pos);
+    std::string query_val((char*)(raw_param + delim_pos));
-    std::string query_val = raw_param.substr(value_pos);
+    std::string query_name(raw_param, delim_pos - 1);
 
     _query_params[query_name] = query_param(query_name, query_val);
 }
 
-void request::parse_path(std::string& raw_path) {
+void request::parse_path(char* raw_path) {
-    std::stringstream ss(raw_path);
+    char* saveptr = nullptr;
-    std::string tok;
+    char* tok = strtok_r(raw_path, "?", &saveptr);
 
-    if (getline(ss, tok, '?')){
+    if (tok){
         _path = tok;
     }
 
-    while(getline(ss, tok, '&')) {
+    tok = strtok_r(nullptr, "&", &saveptr);
+    while(tok) {
         parse_query_param(tok);
+        tok = strtok_r(nullptr, "&", &saveptr);
     }
 }
 
 void request::parse_request_line(std::string& raw_line) {
         request_line_parser_state state = METHOD;
         std::stringstream ss(raw_line);
-        std::string tok;
+
-        while(getline(ss, tok, ' ')){
+        char* saveptr = nullptr;
+        char* tok = strtok_r(raw_line.data(), " ", &saveptr);
+
+        while(tok){
             switch(state) {
                 case METHOD: {
                     auto search = method_map.find(tok);
@@ -72,6 +76,7 @@ void request::parse_request_line(std::string& raw_line) {
                     return;
                 };
             }
+            tok = strtok_r(nullptr, " ", &saveptr);
         }
 }
 
@@ -97,7 +102,7 @@ request::request(std::string& raw_data, const std::string& client_ip)
                 if (line.length() == 0) {
                     state = BODY_CONTENT;
                 } else {
-                    parse_header(line); 
+                    parse_header(line.data()); 
                 }
                 break;
             };

lib/http/request.hpp

@@ -28,9 +28,9 @@ private:
     std::unordered_map<std::string, query_param> _query_params; // kinda goofy, whatever
                                                                 //
     void parse_request_line(std::string& raw_line);
-    void parse_header(std::string& raw_line);
+    void parse_header(char* raw_line);
-    void parse_path(std::string& raw_path);
+    void parse_path(char* raw_path);
-    void parse_query_param(std::string& raw_param);
+    void parse_query_param(char* raw_param);
 
 public:
     request(std::string& raw_data, const std::string& client_ip);

tests/speed_tests.cpp

@@ -2,6 +2,7 @@
 #include <fstream>
 #include <chrono>
 #include "../lib/http/request.hpp"
+#include <boost/beast.hpp>
 
 
 TEST(speed_tests, request_parse) {
@@ -16,13 +17,48 @@ TEST(speed_tests, request_parse) {
     std::string raw_req = buffer.str();
 
     auto t1 = high_resolution_clock::now();
-    for(int i = 0; i < 1000000; ++i) {
+    for(int i = 0; i < 10000000; ++i) {
         volatile anthracite::http::request req (raw_req, "0.0.0.0");
     }
     auto t2 = high_resolution_clock::now();
 
-    /* Getting number of milliseconds as an integer. */
     auto ms_int = duration_cast<milliseconds>(t2 - t1);
 
     std::cout << "Parsed 1 Million requests in " << ms_int << "ms" << std::endl;
 }
+
+TEST(speed_tests, boost) {
+    using std::chrono::high_resolution_clock;
+    using std::chrono::duration_cast;
+    using std::chrono::duration;
+    using std::chrono::milliseconds;
+
+    std::ifstream t("./test_files/test_request.http");
+    std::stringstream buffer;
+    buffer << t.rdbuf();
+    std::string raw_req = buffer.str();
+
+    auto t1 = high_resolution_clock::now();
+    for(int i = 0; i < 10000000; ++i) {
+        boost::system::error_code ec;
+        boost::beast::http::request_parser<boost::beast::http::string_body> p;
+        p.put(boost::asio::buffer(raw_req), ec);
+        boost::beast::http::request<boost::beast::http::string_body> r = p.get();
+    }
+    auto t2 = high_resolution_clock::now();
+
+    auto ms_int = duration_cast<milliseconds>(t2 - t1);
+
+    std::cout << "Parsed 1 Million requests in " << ms_int << "ms" << std::endl;
+}
+
+TEST(speed_tests, single_request_parse) {
+    std::ifstream t("./test_files/test_request.http");
+    std::stringstream buffer;
+    buffer << t.rdbuf();
+    std::string raw_req = buffer.str();
+
+    anthracite::http::request req (raw_req, "0.0.0.0");
+
+    std::cout << req.to_string() << std::endl;
+}