Communicate the panic string through heritage too.

bin/varnishd/common/common.h

@@ -50,8 +50,6 @@ extern pid_t mgt_pid;
 
 /* mgt_shmem.c */
 #define PAN_CLASS "Panic"
-extern char *PAN_panicstr;
-extern unsigned PAN_panicstr_len;
 
 /* varnishd.c */
 extern struct vsb *vident;		// XXX: -> heritage ?

bin/varnishd/common/heritage.h

@@ -64,6 +64,10 @@ struct heritage {
 
 	char				*name;
 	char                            identity[1024];
+
+	char				*panic_str;
+	ssize_t				panic_str_len;
+	
 };
 
 extern struct heritage heritage;

bin/varnishd/mgt/mgt_child.c

@@ -427,10 +427,10 @@ mgt_handle_panicstr(pid_t r)
 {
 	char time_str[30];
 
-	if (PAN_panicstr[0] == '\0')
+	if (heritage.panic_str[0] == '\0')
 		return;
 	REPORT(LOG_ERR, "Child (%jd) Panic message: %s",
-	    (intmax_t)r, PAN_panicstr);
+	    (intmax_t)r, heritage.panic_str);
 
 	if (child_panic)
 		VSB_delete(child_panic);
@@ -438,7 +438,7 @@ mgt_handle_panicstr(pid_t r)
 	XXXAN(child_panic);
 	VTIM_format(VTIM_real(), time_str);
 	VSB_printf(child_panic, "Last panic at: %s\n", time_str);
-	VSB_cat(child_panic, PAN_panicstr);
+	VSB_cat(child_panic, heritage.panic_str);
 	AZ(VSB_finish(child_panic));
 }
 

bin/varnishd/mgt/mgt_shmem.c

@@ -215,7 +215,8 @@ mgt_SHM_Init(void)
 	AN(heritage.param);
 	*heritage.param = mgt_param;
 
-	PAN_panicstr_len = 64 * 1024;
-	PAN_panicstr = VSM_Alloc(PAN_panicstr_len, PAN_CLASS, "", "");
-	AN(PAN_panicstr);
+	heritage.panic_str_len = 64 * 1024;
+	heritage.panic_str =
+	    VSM_Alloc(heritage.panic_str_len, PAN_CLASS, "", "");
+	AN(heritage.panic_str);
 }