Skip to content

Use a mutex in Regex operations to make it thread safe #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NotHyper-474 wants to merge 1 commit into from
Closed

Use a mutex in Regex operations to make it thread safe #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions src/hx/libs/regexp/RegExp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <hxcpp.h>
#include <string.h>
#include <hx/Thread.h>

#define PCRE2_STATIC
#define PCRE2_CODE_UNIT_WIDTH 0
Expand Down Expand Up @@ -33,6 +34,8 @@ struct pcredata : public hx::Object
String string;
String expr;

HxMutex mutex;

void create8(pcre2_code_8 *inR, String inExpr, int inFlags)
{
rUtf8 = inR;
Expand Down Expand Up @@ -75,6 +78,7 @@ struct pcredata : public hx::Object

bool run(String string,int pos,int len)
{
mutex.Lock();
#ifdef HX_SMART_STRINGS
if (string.isUTF16Encoded())
{
Expand Down Expand Up @@ -110,16 +114,25 @@ struct pcredata : public hx::Object
}

#endif
return pcre2_match_8(rUtf8,(PCRE2_SPTR8)string.utf8_str(),pos+len,pos,PCRE2_NO_UTF_CHECK,match_data8,NULL) >= 0;
bool result = pcre2_match_8(rUtf8,(PCRE2_SPTR8)string.utf8_str(),pos+len,pos,PCRE2_NO_UTF_CHECK,match_data8,NULL) >= 0;
mutex.Unlock();
return result;
}

size_t* get_matches() {
size_t* result;
mutex.Lock();
#ifdef HX_SMART_STRINGS
if (string.isUTF16Encoded()) {
return pcre2_get_ovector_pointer_16(match_data16);
result = pcre2_get_ovector_pointer_16(match_data16);
}
else
#endif
return pcre2_get_ovector_pointer_8(match_data8);
{
result = pcre2_get_ovector_pointer_8(match_data8);
}
mutex.Unlock();
return result;
}

void destroy()
Expand Down