Elminiate pthread poisoning of manager process.

b4ef285f · Poul-Henning Kamp · Tollef Fog Heen · f697e673 · b4ef285f · b4ef285f
Commit b4ef285f authored Oct 07, 2011 by Poul-Henning Kamp Committed by Tollef Fog Heen Feb 24, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

heritage.h bin/varnishd/heritage.h +0 -1

mgt.h bin/varnishd/mgt.h +4 -0

varnishd.c bin/varnishd/varnishd.c +4 -0

No files found.
--- a/bin/varnishd/heritage.h
+++ b/bin/varnishd/heritage.h
@@ -29,7 +29,6 @@
 * This file contains the heritage passed when mgt forks cache
 */

-#include <pthread.h>
 #include "vre.h"

 struct listen_sock {

--- a/bin/varnishd/mgt.h
+++ b/bin/varnishd/mgt.h
@@ -108,3 +108,7 @@ extern unsigned mgt_vcc_err_unref;
 #define VSM_Free(a)		VSM__Free(a)
 #define VSM_Clean()		VSM__Clean()

+
+#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
+#error "Keep pthreads out of in manager process"
+#endif
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -653,3 +653,7 @@ main(int argc, char * const *argv)
 		(void)VPF_Remove(pfh);
 	exit(exit_status);
 }
+
+#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
+#error "Keep pthreads out of in manager process"
+#endif