From: Victor Julien <victor@inliniac.net>
Date: Fri, 4 Jul 2014 07:02:20 +0000 (+0200)
Subject: AC: reduce realloc for new states
X-Git-Tag: suricata-2.1beta1~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04c9db398e4ff1ccac0bbf9a5ce3f62ffe935794;p=thirdparty%2Fsuricata.git

AC: reduce realloc for new states

Don't realloc per state add, but grow by larger blocks per realloc.
---

diff --git a/src/util-mpm-ac.c b/src/util-mpm-ac.c
index a181da102c..fffebf0f45 100644
--- a/src/util-mpm-ac.c
+++ b/src/util-mpm-ac.c
@@ -374,15 +374,13 @@ error:
  *
  * \retval The state id, of the newly created state.
  */
-static inline int SCACInitNewState(MpmCtx *mpm_ctx)
+static inline int SCACReallocState(SCACCtx *ctx, uint32_t cnt)
 {
     void *ptmp;
-    SCACCtx *ctx = (SCACCtx *)mpm_ctx->ctx;
-    int ascii_code = 0;
     int size = 0;
 
     /* reallocate space in the goto table to include a new state */
-    size = (ctx->state_count + 1) * ctx->single_state_size;
+    size = cnt * ctx->single_state_size;
     ptmp = SCRealloc(ctx->goto_table, size);
     if (ptmp == NULL) {
         SCFree(ctx->goto_table);
@@ -392,13 +390,12 @@ static inline int SCACInitNewState(MpmCtx *mpm_ctx)
     }
     ctx->goto_table = ptmp;
 
-    /* set all transitions for the newly assigned state as FAIL transitions */
-    for (ascii_code = 0; ascii_code < 256; ascii_code++) {
-        ctx->goto_table[ctx->state_count][ascii_code] = SC_AC_FAIL;
-    }
-
     /* reallocate space in the output table for the new state */
-    size = (ctx->state_count + 1) * sizeof(SCACOutputTable);
+    int oldsize = ctx->state_count * sizeof(SCACOutputTable);
+    size = cnt * sizeof(SCACOutputTable);
+    SCLogDebug("oldsize %d size %d cnt %u ctx->state_count %u",
+            oldsize, size, cnt, ctx->state_count);
+
     ptmp = SCRealloc(ctx->output_table, size);
     if (ptmp == NULL) {
         SCFree(ctx->output_table);
@@ -408,7 +405,7 @@ static inline int SCACInitNewState(MpmCtx *mpm_ctx)
     }
     ctx->output_table = ptmp;
 
-    memset(ctx->output_table + ctx->state_count, 0, sizeof(SCACOutputTable));
+    memset(((uint8_t *)ctx->output_table + oldsize), 0, (size - oldsize));
 
     /* \todo using it temporarily now during dev, since I have restricted
      *       state var in SCACCtx->state_table to uint16_t. */
@@ -417,6 +414,35 @@ static inline int SCACInitNewState(MpmCtx *mpm_ctx)
     //    exit(EXIT_FAILURE);
     //}
 
+    return 0;//ctx->state_count++;
+}
+
+static inline int SCACInitNewState(MpmCtx *mpm_ctx)
+{
+    SCACCtx *ctx = (SCACCtx *)mpm_ctx->ctx;;
+
+    /* Exponentially increase the allocated space when needed. */
+    if (ctx->allocated_state_count < ctx->state_count + 1) {
+        if (ctx->allocated_state_count == 0)
+            ctx->allocated_state_count = 256;
+        else
+            ctx->allocated_state_count *= 2;
+
+        SCACReallocState(ctx, ctx->allocated_state_count);
+
+    }
+#if 0
+    if (ctx->allocated_state_count > 260) {
+        SCACOutputTable *output_state = &ctx->output_table[260];
+        SCLogInfo("output_state %p %p %u", output_state, output_state->pids, output_state->no_of_entries);
+    }
+#endif
+    int ascii_code = 0;
+    /* set all transitions for the newly assigned state as FAIL transitions */
+    for (ascii_code = 0; ascii_code < 256; ascii_code++) {
+        ctx->goto_table[ctx->state_count][ascii_code] = SC_AC_FAIL;
+    }
+
     return ctx->state_count++;
 }
 
diff --git a/src/util-mpm-ac.h b/src/util-mpm-ac.h
index e2319528d1..7b6b83ecf2 100644
--- a/src/util-mpm-ac.h
+++ b/src/util-mpm-ac.h
@@ -92,6 +92,8 @@ typedef struct SCACCtx_ {
     uint16_t single_state_size;
     uint16_t max_pat_id;
 
+    uint32_t allocated_state_count;
+
 #ifdef __SC_CUDA_SUPPORT__
     CUdeviceptr state_table_u16_cuda;
     CUdeviceptr state_table_u32_cuda;