Merge pull request #1 from sfxfs/v1.1.0-dev

Add hash function to improve function name search efficiency

Author: sfxfs

src/mjsonrpc.c

@@ -27,6 +27,21 @@
 #include <stdlib.h>
 #include <string.h>
 
+// FNV-1a 32-bit hash function
+static uint32_t hash_fnv1a_32(const char* str)
+{
+    uint32_t hash = 2166136261u;
+    int c;
+
+    while ((c = (int) *str++))
+    {
+        hash ^= (uint32_t) c;
+        hash *= 16777619u;
+    }
+
+    return hash;
+}
+
 cJSON* mjrpc_response_ok(cJSON* result, cJSON* id)
 {
     if (id == NULL)
@@ -100,8 +115,9 @@ static cJSON* invoke_callback(const mjrpc_handle_t* handle, const char* method_n
     ctx.error_code = 0;
     ctx.error_message = NULL;
     int i = handle->cb_count;
+    const uint32_t hash = hash_fnv1a_32(method_name);
     while (i--)
-        if (!strcmp(handle->cb_array[i].name, method_name))
+        if (handle->cb_array[i].hash == hash)
         {
             procedure_found = 1;
             ctx.data = handle->cb_array[i].arg;
@@ -201,7 +217,7 @@ int mjrpc_add_method(mjrpc_handle_t* handle, mjrpc_func function_pointer, const
     if (function_pointer == NULL || method_name == NULL)
         return MJRPC_RET_ERROR_INVALID_PARAM;
 
-    int i = handle->cb_count++;
+    const int i = handle->cb_count++;
     if (!handle->cb_array)
     {
         handle->cb_array = malloc(sizeof(struct mjrpc_cb));
@@ -216,8 +232,7 @@ int mjrpc_add_method(mjrpc_handle_t* handle, mjrpc_func function_pointer, const
             return MJRPC_RET_ERROR_MEM_ALLOC_FAILED;
         handle->cb_array = ptr;
     }
-    if ((handle->cb_array[i].name = strdup(method_name)) == NULL)
-        return MJRPC_RET_ERROR_MEM_ALLOC_FAILED;
+    handle->cb_array[i].hash = hash_fnv1a_32(method_name);
     handle->cb_array[i].function = function_pointer;
     handle->cb_array[i].arg = arg2func;
 
@@ -226,11 +241,6 @@ int mjrpc_add_method(mjrpc_handle_t* handle, mjrpc_func function_pointer, const
 
 static void cb_info_destroy(struct mjrpc_cb* info)
 {
-    if (info->name)
-    {
-        free(info->name);
-        info->name = NULL;
-    }
     if (info->arg)
     {
         free(info->arg);
@@ -254,14 +264,15 @@ int mjrpc_del_method(mjrpc_handle_t* handle, const char* name)
 
     if (handle->cb_array)
     {
+        const uint32_t hash = hash_fnv1a_32(name);
         int found = 0;
         for (int i = 0; i < handle->cb_count; i++)
         {
             if (found)
             {
                 handle->cb_array[i - 1] = handle->cb_array[i];
             }
-            else if (!strcmp(name, handle->cb_array[i].name))
+            else if (hash == handle->cb_array[i].hash)
             {
                 found = 1;
                 cb_info_destroy(&(handle->cb_array[i]));

src/mjsonrpc.h

@@ -26,6 +26,7 @@
 #define MJSONRPC_H_
 
 #include "cJSON.h"
+#include <stdint.h>
 
 #define JSON_RPC_CODE_PARSE_ERROR (-32700)
 #define JSON_RPC_CODE_INVALID_REQUEST (-32600)
@@ -56,7 +57,7 @@ enum mjrpc_error_return
 typedef struct
 {
     void* data;
-    int error_code;
+    int32_t error_code;
     char* error_message;
 } mjrpc_ctx_t;
 
@@ -67,7 +68,7 @@ typedef cJSON* (*mjrpc_func)(mjrpc_ctx_t* context, cJSON* params, cJSON* id);
  */
 struct mjrpc_cb
 {
-    char* name;
+    uint32_t hash;
     mjrpc_func function;
     void* arg;
 };
@@ -77,7 +78,7 @@ struct mjrpc_cb
  */
 typedef struct mjrpc_handle
 {
-    int cb_count;
+    uint16_t cb_count;
     struct mjrpc_cb* cb_array;
 } mjrpc_handle_t;