ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2633 from evan-charmworks/utils-regex-context

Browse Source 
Make regex code in utils thread-safe
This commit is contained in:
Axel Kohlmeyer
2021-02-26 20:22:12 -05:00
committed by GitHub
parent aea0ceac03 a89f0f332d
commit 15c5aa9bc1
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/utils.cpp
View File

@ -1280,24 +1280,14 @@ extern "C" {
/* Typedef'd pointer to get abstract datatype. */ /* Typedef'd pointer to get abstract datatype. */
typedef struct regex_t *re_t; typedef struct regex_t *re_t;
typedef struct regex_context_t *re_ctx_t;
/* Compile regex string pattern to a regex_t-array. */ /* Compile regex string pattern to a regex_t-array. */
static re_t re_compile(const char *pattern); static re_t re_compile(re_ctx_t context, const char *pattern);
/* Find matches of the compiled pattern inside text. */ /* Find matches of the compiled pattern inside text. */
static int re_matchp(const char *text, re_t pattern, int *matchlen); static int re_matchp(const char *text, re_t pattern, int *matchlen);
int re_match(const char *text, const char *pattern)
{
int dummy;
return re_matchp(text, re_compile(pattern), &dummy);
}
int re_find(const char *text, const char *pattern, int *matchlen)
{
return re_matchp(text, re_compile(pattern), matchlen);
}
/* Definitions: */ /* Definitions: */
#define MAX_REGEXP_OBJECTS 30 /* Max number of regex symbols in expression. */ #define MAX_REGEXP_OBJECTS 30 /* Max number of regex symbols in expression. */
@ -1317,6 +1307,26 @@ extern "C" {
} u; } u;
} regex_t; } regex_t;
typedef struct regex_context_t {
/* MAX_REGEXP_OBJECTS is the max number of symbols in the expression.
MAX_CHAR_CLASS_LEN determines the size of buffer for chars in all char-classes in the expression. */
regex_t re_compiled[MAX_REGEXP_OBJECTS];
unsigned char ccl_buf[MAX_CHAR_CLASS_LEN];
} regex_context_t;
int re_match(const char *text, const char *pattern)
{
regex_context_t context;
int dummy;
return re_matchp(text, re_compile(&context, pattern), &dummy);
}
int re_find(const char *text, const char *pattern, int *matchlen)
{
regex_context_t context;
return re_matchp(text, re_compile(&context, pattern), matchlen);
}
/* Private function declarations: */ /* Private function declarations: */
static int matchpattern(regex_t *pattern, const char *text, int *matchlen); static int matchpattern(regex_t *pattern, const char *text, int *matchlen);
static int matchcharclass(char c, const char *str); static int matchcharclass(char c, const char *str);
@ -1359,13 +1369,10 @@ extern "C" {
return -1; return -1;
} }
re_t re_compile(const char *pattern) re_t re_compile(re_ctx_t context, const char *pattern)
{ {
/* The sizes of the two static arrays below substantiates the static RAM usage of this module. regex_t * const re_compiled = context->re_compiled;
MAX_REGEXP_OBJECTS is the max number of symbols in the expression. unsigned char * const ccl_buf = context->ccl_buf;
MAX_CHAR_CLASS_LEN determines the size of buffer for chars in all char-classes in the expression. */
static regex_t re_compiled[MAX_REGEXP_OBJECTS];
static unsigned char ccl_buf[MAX_CHAR_CLASS_LEN];
int ccl_bufidx = 1; int ccl_bufidx = 1;
char c; /* current char in pattern */ char c; /* current char in pattern */