Mailing List Archive

commit 37d1f705de2d7d28e548e4e435bb6824a397585a
Author: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue Oct 26 20:13:35 2021 +0000

Also give up on pthread_condattr_setclock(2) here: OSX does not support it

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index e9803d8d1..f35b0ab69 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -685,7 +685,6 @@ int Lck__Trylock(struct lock *lck, const char *p, int l);
void Lck__New(struct lock *lck, struct VSC_lck *, const char *);
int Lck__Held(const struct lock *lck);
int Lck__Owned(const struct lock *lck);
-extern pthread_condattr_t condattr_monotime;
extern pthread_mutexattr_t mtxattr_errorcheck;

/* public interface: */
diff --git a/bin/varnishd/cache/cache_main.c b/bin/varnishd/cache/cache_main.c
index 0e81c3928..645bfbd04 100644
--- a/bin/varnishd/cache/cache_main.c
+++ b/bin/varnishd/cache/cache_main.c
@@ -58,7 +58,6 @@ volatile struct params *cache_param;
static pthread_mutex_t cache_vrnd_mtx;

pthread_mutexattr_t mtxattr_errorcheck;
-pthread_condattr_t condattr_monotime;

static void
cache_vrnd_lock(void)
@@ -368,8 +367,6 @@ child_main(int sigmagic, size_t altstksz)
/* Before anything uses pthreads in anger */
AZ(pthread_mutexattr_init(&mtxattr_errorcheck));
AZ(pthread_mutexattr_settype(&mtxattr_errorcheck, PTHREAD_MUTEX_ERRORCHECK));
- AZ(pthread_condattr_init(&condattr_monotime));
- AZ(pthread_condattr_setclock(&condattr_monotime, CLOCK_MONOTONIC));

cache_param = heritage.param;

_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit