From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 15 Apr 2016 17:12:50 +0000 (+0100)
Subject: [Feature] Allow to disable pthread mutexes on broken platforms
X-Git-Tag: 1.2.4~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f1be0542301d5b37166225b68bf2d98c926baab;p=thirdparty%2Frspamd.git

[Feature] Allow to disable pthread mutexes on broken platforms
---

diff --git a/config.h.in b/config.h.in
index d06c133f9d..9cc046c956 100644
--- a/config.h.in
+++ b/config.h.in
@@ -131,6 +131,8 @@
 #cmakedefine WITH_SQLITE         1
 #cmakedefine WITH_SYSTEM_HIREDIS 1
 
+#cmakedefine DISABLE_PTHREAD_MUTEX 1
+
 /* Detect endiannes */
 
 #ifdef HAVE_ENDIAN_H
diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 0d1a737fb7..2b6b4ec960 100644
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -625,7 +625,7 @@ rspamd_mempool_suggest_size (void)
 #endif
 }
 
-#ifndef HAVE_PTHREAD_PROCESS_SHARED
+#if !defined(HAVE_PTHREAD_PROCESS_SHARED) || defined(DISABLE_PTHREAD_MUTEX)
 /*
  * Own emulation
  */
diff --git a/src/libutil/mem_pool.h b/src/libutil/mem_pool.h
index 6f631e35d8..d9ca55c5a1 100644
--- a/src/libutil/mem_pool.h
+++ b/src/libutil/mem_pool.h
@@ -13,7 +13,7 @@
 #define RSPAMD_MEM_POOL_H
 
 #include "config.h"
-#ifdef HAVE_PTHREAD_PROCESS_SHARED
+#if defined(HAVE_PTHREAD_PROCESS_SHARED) && !defined(DISABLE_PTHREAD_MUTEX)
 #include <pthread.h>
 #endif
 
@@ -40,7 +40,7 @@ typedef void (*rspamd_mempool_destruct_t)(void *ptr);
 /**
  * Pool mutex structure
  */
-#ifndef HAVE_PTHREAD_PROCESS_SHARED
+#if !defined(HAVE_PTHREAD_PROCESS_SHARED) || defined(DISABLE_PTHREAD_MUTEX)
 typedef struct memory_pool_mutex_s {
 	gint lock;
 	pid_t owner;