Merge pull request #3227 from eduar-hte/pm-operator-multithreading

Removed unnecessary lock to call acmp_process_quick in Pm::evaluate

configure.ac

@@ -316,23 +316,6 @@ AC_ARG_ENABLE(parser-generation,
     [buildParser=false]
     )
 
-# Mutex
-AC_ARG_ENABLE(mutex-on-pm,
-    [AS_HELP_STRING([--enable-mutex-on-pm],[Treats pm operations as a critical section])],
-
-    [case "${enableval}" in
-        yes) mutexPm=true ;;
-        no)  mutexPm=false ;;
-        *) AC_MSG_ERROR(bad value ${enableval} for --enable-mutex-on-pm) ;;
-    esac],
-
-    [mutexPm=false]
-    )
-if test "$mutexPm" == "true"; then
-    MODSEC_MUTEX_ON_PM="-DMUTEX_ON_PM=1"
-    AC_SUBST(MODSEC_MUTEX_ON_PM)
-fi
-
 
 if test $buildParser = true; then
     AC_PROG_YACC

src/Makefile.am

@@ -321,7 +321,6 @@ libmodsecurity_la_CPPFLAGS = \
 	$(GEOIP_CFLAGS) \
 	$(GLOBAL_CPPFLAGS) \
 	$(MODSEC_NO_LOGS) \
-	$(MODSEC_MUTEX_ON_PM) \
 	$(YAJL_CFLAGS) \
 	$(LMDB_CFLAGS) \
 	$(PCRE_CFLAGS) \

src/operators/pm.cc

@@ -85,14 +85,7 @@ bool Pm::evaluate(Transaction *transaction, RuleWithActions *rule,
     pt.parser = m_p;
     pt.ptr = NULL;
     const char *match = NULL;
-#ifdef MODSEC_MUTEX_ON_PM
-    {
-    const std::lock_guard lock(m_mutex);
-#endif
     rc = acmp_process_quick(&pt, &match, input.c_str(), input.length());
-#ifdef MODSEC_MUTEX_ON_PM
-    }
-#endif
 
     if (rc >= 0 && transaction) {
         std::string match_(match?match:"");

src/operators/pm.h

@@ -53,12 +53,6 @@ class Pm : public Operator {
 
  protected:
     ACMP *m_p;
-
-#ifdef MODSEC_MUTEX_ON_PM
-
- private:
-    std::mutex m_mutex;
-#endif
 };