From 6d00452c7c3576e2d36338bcf56408bfdbcd2c64 Mon Sep 17 00:00:00 2001 From: kosako Date: Tue, 29 Mar 2016 16:46:57 +0900 Subject: [PATCH] remove codes in USE_PARSE_TREE_NODE_RECYCLE --- src/regcomp.c | 4 ---- src/regint.h | 1 - src/regparse.c | 58 -------------------------------------------------- src/regparse.h | 1 - 4 files changed, 64 deletions(-) diff --git a/src/regcomp.c b/src/regcomp.c index 6ff34e6..49de8f3 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -5594,10 +5594,6 @@ onig_end(void) onig_free_shared_cclass_table(); #endif -#ifdef USE_PARSE_TREE_NODE_RECYCLE - onig_free_node_list(); -#endif - onig_inited = 0; THREAD_ATOMIC_END; diff --git a/src/regint.h b/src/regint.h index e2e9517..09fe2bc 100644 --- a/src/regint.h +++ b/src/regint.h @@ -65,7 +65,6 @@ /* !!! moved to regenc.h. */ /* #define USE_CRNL_AS_LINE_TERMINATOR */ /* internal config */ -#define USE_PARSE_TREE_NODE_RECYCLE #define USE_OP_PUSH_OR_JUMP_EXACT #define USE_QTFR_PEEK_NEXT #define USE_ST_LIBRARY diff --git a/src/regparse.c b/src/regparse.c index 48488cd..0f382b5 100644 --- a/src/regparse.c +++ b/src/regparse.c @@ -994,14 +994,6 @@ scan_env_set_mem_node(ScanEnv* env, int num, Node* node) } -#ifdef USE_PARSE_TREE_NODE_RECYCLE -typedef struct _FreeNode { - struct _FreeNode* next; -} FreeNode; - -static FreeNode* FreeNodeList = (FreeNode* )NULL; -#endif - extern void onig_node_free(Node* node) { @@ -1022,18 +1014,7 @@ onig_node_free(Node* node) { Node* next_node = NCDR(node); -#ifdef USE_PARSE_TREE_NODE_RECYCLE - { - FreeNode* n = (FreeNode* )node; - - THREAD_ATOMIC_START; - n->next = FreeNodeList; - FreeNodeList = n; - THREAD_ATOMIC_END; - } -#else xfree(node); -#endif node = next_node; goto start; } @@ -1070,53 +1051,14 @@ onig_node_free(Node* node) break; } -#ifdef USE_PARSE_TREE_NODE_RECYCLE - { - FreeNode* n = (FreeNode* )node; - - THREAD_ATOMIC_START; - n->next = FreeNodeList; - FreeNodeList = n; - THREAD_ATOMIC_END; - } -#else xfree(node); -#endif -} - -#ifdef USE_PARSE_TREE_NODE_RECYCLE -extern int -onig_free_node_list(void) -{ - FreeNode* n; - - /* THREAD_ATOMIC_START; */ - while (IS_NOT_NULL(FreeNodeList)) { - n = FreeNodeList; - FreeNodeList = FreeNodeList->next; - xfree(n); - } - /* THREAD_ATOMIC_END; */ - return 0; } -#endif static Node* node_new(void) { Node* node; -#ifdef USE_PARSE_TREE_NODE_RECYCLE - THREAD_ATOMIC_START; - if (IS_NOT_NULL(FreeNodeList)) { - node = (Node* )FreeNodeList; - FreeNodeList = FreeNodeList->next; - THREAD_ATOMIC_END; - return node; - } - THREAD_ATOMIC_END; -#endif - node = (Node* )xmalloc(sizeof(Node)); /* xmemset(node, 0, sizeof(Node)); */ return node; diff --git a/src/regparse.h b/src/regparse.h index 0c5c2c9..fff707a 100644 --- a/src/regparse.h +++ b/src/regparse.h @@ -337,7 +337,6 @@ extern Node* onig_node_new_list P_((Node* left, Node* right)); extern Node* onig_node_list_add P_((Node* list, Node* x)); extern Node* onig_node_new_alt P_((Node* left, Node* right)); extern void onig_node_str_clear P_((Node* node)); -extern int onig_free_node_list P_((void)); extern int onig_names_free P_((regex_t* reg)); extern int onig_parse_make_tree P_((Node** root, const UChar* pattern, const UChar* end, regex_t* reg, ScanEnv* env)); extern int onig_free_shared_cclass_table P_((void)); -- 2.40.0