performance - remove switch and check fro callback

Author: pdeltour-syna

fuzzing/Http.cpp

@@ -135,6 +135,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
             /* Return ok */
             return user;
 
+        }, [](uWS::HttpRequest */*req*/, unsigned int /*errorCode*/) {
         });
 
         if (!returnedUser) {

src/HttpContext.h

@@ -256,20 +256,7 @@ struct HttpContext {
                 /* Call the high-level error handler if one is registered */
                 if (httpContextData->httpParsingErrorHandler) {
                     /* Map internal error codes to HTTP status codes and response bodies */
-                    int statusCode;
-                    switch (errorCode) {
-                        case HTTP_ERROR_505_HTTP_VERSION_NOT_SUPPORTED:
-                            statusCode = 505;
-                            break;
-                        case HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE:
-                            statusCode = 431;
-                            break;
-                        case HTTP_ERROR_400_BAD_REQUEST:
-                        default:
-                            statusCode = 400;
-                            break;
-                    }
-                    httpContextData->httpParsingErrorHandler(httpRequest, statusCode, httpErrorResponses[errorCode]);
+                    httpContextData->httpParsingErrorHandler(httpRequest, httpErrorStatusCodes[errorCode], httpErrorResponses[errorCode]);
                 }
             });
 

src/HttpErrors.h

@@ -30,6 +30,13 @@ enum HttpError {
 
 #ifndef UWS_HTTPRESPONSE_NO_WRITEMARK
 
+static const int httpErrorStatusCodes[] = {
+    400, /* Zeroth place (unused) */
+    505, /* HTTP_ERROR_505_HTTP_VERSION_NOT_SUPPORTED */
+    431, /* HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE */
+    400  /* HTTP_ERROR_400_BAD_REQUEST */
+};
+
 /* Returned parser errors match this LUT. */
 static const std::string_view httpErrorResponses[] = {
     "", /* Zeroth place is no error so don't use it */

src/HttpParser.h

@@ -614,7 +614,7 @@ struct HttpParser {
     }
 
 public:
-    std::pair<unsigned int, void *> consumePostPadded(char *data, unsigned int length, void *user, void *reserved, MoveOnlyFunction<void *(void *, HttpRequest *)> &&requestHandler, MoveOnlyFunction<void *(void *, std::string_view, bool)> &&dataHandler, MoveOnlyFunction<void(HttpRequest *, unsigned int)> &&errorHandler = nullptr) {
+    std::pair<unsigned int, void *> consumePostPadded(char *data, unsigned int length, void *user, void *reserved, MoveOnlyFunction<void *(void *, HttpRequest *)> &&requestHandler, MoveOnlyFunction<void *(void *, std::string_view, bool)> &&dataHandler, MoveOnlyFunction<void(HttpRequest *, unsigned int)> &&errorHandler) {
 
         /* This resets BloomFilter by construction, but later we also reset it again.
          * Optimize this to skip resetting twice (req could be made global) */
@@ -629,9 +629,7 @@ struct HttpParser {
                     dataHandler(user, chunk, chunk.length() == 0);
                 }
                 if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
-                    if (errorHandler) {
-                        errorHandler(&req, HTTP_ERROR_400_BAD_REQUEST);
-                    }
+                    errorHandler(&req, HTTP_ERROR_400_BAD_REQUEST);
                     return {HTTP_ERROR_400_BAD_REQUEST, FULLPTR};
                 }
                 data = (char *) dataToConsume.data();
@@ -669,9 +667,7 @@ struct HttpParser {
             // break here on break
             std::pair<unsigned int, void *> consumed = fenceAndConsumePostPadded<true>(fallback.data(), (unsigned int) fallback.length(), user, reserved, &req, requestHandler, dataHandler);
             if (consumed.second != user) {
-                if (errorHandler) {
-                    errorHandler(&req, consumed.first);
-                }
+                errorHandler(&req, consumed.first);
                 return consumed;
             }
 
@@ -692,9 +688,7 @@ struct HttpParser {
                             dataHandler(user, chunk, chunk.length() == 0);
                         }
                         if (isParsingInvalidChunkedEncoding(remainingStreamingBytes)) {
-                            if (errorHandler) {
-                              errorHandler(&req, HTTP_ERROR_400_BAD_REQUEST);
-                            }
+                            errorHandler(&req, HTTP_ERROR_400_BAD_REQUEST);
                             return {HTTP_ERROR_400_BAD_REQUEST, FULLPTR};
                         }
                         data = (char *) dataToConsume.data();
@@ -722,9 +716,7 @@ struct HttpParser {
 
             } else {
                 if (fallback.length() == MAX_FALLBACK_SIZE) {
-                    if (errorHandler) {
-                        errorHandler(&req, HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE);
-                    }
+                    errorHandler(&req, HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE);
                     return {HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE, FULLPTR};
                 }
                 return {0, user};
@@ -733,9 +725,7 @@ struct HttpParser {
 
         std::pair<unsigned int, void *> consumed = fenceAndConsumePostPadded<false>(data, length, user, reserved, &req, requestHandler, dataHandler);
         if (consumed.second != user) {
-            if (errorHandler) {
-                errorHandler(&req, consumed.first);
-            }
+            errorHandler(&req, consumed.first);
             return consumed;
         }
 
@@ -746,9 +736,7 @@ struct HttpParser {
             if (length < MAX_FALLBACK_SIZE) {
                 fallback.append(data, length);
             } else {
-                if (errorHandler) {
-                    errorHandler(&req, HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE);
-                }
+                errorHandler(&req, HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE);
                 return {HTTP_ERROR_431_REQUEST_HEADER_FIELDS_TOO_LARGE, FULLPTR};
             }
         }

tests/HttpParser.cpp

@@ -31,6 +31,7 @@ int main() {
         /* Return ok */
         return user;
 
+    }, [](uWS::HttpRequest */*req*/, unsigned int /*errorCode*/) {
     });
 
     std::cout << "HTTP DONE" << std::endl;