aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updates to ac-gfbs search. Optimize pointer de-referencing for frequently used pointers

Browse Source
remotes/origin/master-1.2.x
Anoop Saldanha 14 years ago committed by Victor Julien
parent ffb925e3b3
commit 991f6d2d83
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

38
src/util-mpm-ac-gfbs.c
Unescape Escape View File

@ -1266,7 +1266,7 @@ uint32_t SCACGfbsSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
} else { } else {
/* \todo Change it for stateful MPM. Supply the state using mpm_thread_ctx */ /* \todo Change it for stateful MPM. Supply the state using mpm_thread_ctx */
int32_t temp_state = 0; int32_t temp_state = 0;
uint32_t *no_of_entries = NULL; uint32_t no_of_entries;
uint32_t *ascii_codes = NULL; uint32_t *ascii_codes = NULL;
uint8_t **goto_table_mod_pointers = ctx->goto_table_mod_pointers; uint8_t **goto_table_mod_pointers = ctx->goto_table_mod_pointers;
int32_t *failure_table = ctx->failure_table; int32_t *failure_table = ctx->failure_table;
@ -1276,31 +1276,31 @@ uint32_t SCACGfbsSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
register int32_t state = 0; register int32_t state = 0;
for (i = 0; i < buflen; i++) { for (i = 0; i < buflen; i++) {
/* get the goto state transition */ /* get the goto state transition */
no_of_entries = (uint32_t *)goto_table_mod_pointers[state]; no_of_entries = *((uint32_t *)goto_table_mod_pointers[state]);
if (no_of_entries[0] == 0) { if (no_of_entries == 0) {
temp_state = SC_AC_GFBS_FAIL; temp_state = SC_AC_GFBS_FAIL;
} else { } else {
if (no_of_entries[0] == 1) { if (no_of_entries == 1) {
ascii_codes = no_of_entries + 1; ascii_codes = (uint32_t *)goto_table_mod_pointers[state] + 1;
buf_local = u8_tolower(buf[i]); buf_local = u8_tolower(buf[i]);
if (buf_local == ascii_codes[0]) if (buf_local == ascii_codes[0])
temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries[0]))[0]; temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries))[0];
else else
temp_state = SC_AC_GFBS_FAIL; temp_state = SC_AC_GFBS_FAIL;
} else { } else {
ascii_codes = no_of_entries + 1; ascii_codes = (uint32_t *)goto_table_mod_pointers[state] + 1;
buf_local = u8_tolower(buf[i]); buf_local = u8_tolower(buf[i]);
if (state == 0) { if (state == 0) {
temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries[0]))[buf_local]; temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries))[buf_local];
} else { } else {
int low = 0; int low = 0;
int high = no_of_entries[0]; int high = no_of_entries;
int mid; int mid;
temp_state = SC_AC_GFBS_FAIL; temp_state = SC_AC_GFBS_FAIL;
while (low <= high) { while (low <= high) {
mid = (low + high) / 2; mid = (low + high) / 2;
if (ascii_codes[mid] == buf_local) { if (ascii_codes[mid] == buf_local) {
temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries[0]))[mid]; temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries))[mid];
break; break;
} else if (ascii_codes[mid] < buf_local) { } else if (ascii_codes[mid] < buf_local) {
low = mid + 1; low = mid + 1;
@ -1315,31 +1315,31 @@ uint32_t SCACGfbsSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
state = failure_table[state]; state = failure_table[state];
/* get the goto state transition */ /* get the goto state transition */
no_of_entries = (uint32_t *)goto_table_mod_pointers[state]; no_of_entries = *((uint32_t *)goto_table_mod_pointers[state]);
if (no_of_entries[0] == 0) { if (no_of_entries == 0) {
temp_state = SC_AC_GFBS_FAIL; temp_state = SC_AC_GFBS_FAIL;
} else { } else {
if (no_of_entries[0] == 1) { if (no_of_entries == 1) {
ascii_codes = no_of_entries + 1; ascii_codes = (uint32_t *)goto_table_mod_pointers[state] + 1;
buf_local = u8_tolower(buf[i]); buf_local = u8_tolower(buf[i]);
if (buf_local == ascii_codes[0]) if (buf_local == ascii_codes[0])
temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries[0]))[0]; temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries))[0];
else else
temp_state = SC_AC_GFBS_FAIL; temp_state = SC_AC_GFBS_FAIL;
} else { } else {
ascii_codes = no_of_entries + 1; ascii_codes = (uint32_t *)goto_table_mod_pointers[state] + 1;
buf_local = u8_tolower(buf[i]); buf_local = u8_tolower(buf[i]);
if (state == 0) { if (state == 0) {
temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries[0]))[buf_local]; temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries))[buf_local];
} else { } else {
int low = 0; int low = 0;
int high = no_of_entries[0]; int high = no_of_entries;
int mid; int mid;
temp_state = SC_AC_GFBS_FAIL; temp_state = SC_AC_GFBS_FAIL;
while (low <= high) { while (low <= high) {
mid = (low + high) / 2; mid = (low + high) / 2;
if (ascii_codes[mid] == buf_local) { if (ascii_codes[mid] == buf_local) {
temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries[0]))[mid]; temp_state = ((SC_AC_GFBS_STATE_TYPE_U32 *)(ascii_codes + no_of_entries))[mid];
break; break;
} else if (ascii_codes[mid] < buf_local) { } else if (ascii_codes[mid] < buf_local) {
low = mid + 1; low = mid + 1;

Write Preview
Loading…
Cancel
Save