[master] 1a78b80 Ditch aborted stack-space monitoring code.

Poul-Henning Kamp phk at FreeBSD.org
Thu Oct 26 14:02:05 UTC 2017


commit 1a78b8022a9152b36c0994053d743e9bf4d927f9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Oct 26 14:00:51 2017 +0000

    Ditch aborted stack-space monitoring code.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index ff66738..a1d6155 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -288,9 +288,6 @@ struct worker {
 	unsigned		cur_method;
 	unsigned		seen_methods;
 	unsigned		handling;
-
-	uintptr_t		stack_start;
-	uintptr_t		stack_end;
 };
 
 /* Stored object -----------------------------------------------------
diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index e778d78..e84c4b7 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -318,8 +318,6 @@ pan_wrk(struct vsb *vsb, const struct worker *wrk)
 		return;
 	VSB_indent(vsb, 2);
 	PAN_CheckMagic(vsb, wrk, WORKER_MAGIC);
-	VSB_printf(vsb, "stack = {0x%jx -> 0x%jx},\n",
-	    (uintmax_t)wrk->stack_start, (uintmax_t)wrk->stack_end);
 	pan_ws(vsb, wrk->aws);
 
 	m = wrk->cur_method;
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 167481f..af65011 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -99,7 +99,6 @@ WRK_Thread(struct pool *qp, size_t stacksize, unsigned thread_workspace)
 	struct worker *w, ww;
 	struct VSC_main ds;
 	unsigned char ws[thread_workspace];
-	uintptr_t u;
 
 	AN(qp);
 	AN(stacksize);
@@ -115,14 +114,6 @@ WRK_Thread(struct pool *qp, size_t stacksize, unsigned thread_workspace)
 
 	WS_Init(w->aws, "wrk", ws, thread_workspace);
 
-	u = getpagesize();
-	AN(u);
-	u -= 1U;
-	w->stack_start = (((uintptr_t)&qp) + u) & ~u;
-
-	/* XXX: assuming stack grows down. */
-	w->stack_end = w->stack_start - stacksize;
-
 	VSL(SLT_WorkThread, 0, "%p start", w);
 
 	Pool_Work_Thread(qp, w);


More information about the varnish-commit mailing list