Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
9c8609de
Commit
9c8609de
authored
Sep 26, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass ident via heritage.
parent
86ecb842
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
7 deletions
+8
-7
cache_panic.c
bin/varnishd/cache/cache_panic.c
+1
-1
common.h
bin/varnishd/common/common.h
+0
-6
heritage.h
bin/varnishd/common/heritage.h
+2
-0
mgt.h
bin/varnishd/mgt/mgt.h
+1
-0
mgt_child.c
bin/varnishd/mgt/mgt_child.c
+1
-0
mgt_stevedore.c
bin/varnishd/storage/mgt_stevedore.c
+3
-0
No files found.
bin/varnishd/cache/cache_panic.c
View file @
9c8609de
...
@@ -630,7 +630,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
...
@@ -630,7 +630,7 @@ pan_ic(const char *func, const char *file, int line, const char *cond,
VSB_printf
(
pan_vsb
,
"version = %s, vrt api = %u.%u
\n
"
,
VSB_printf
(
pan_vsb
,
"version = %s, vrt api = %u.%u
\n
"
,
VCS_version
,
VRT_MAJOR_VERSION
,
VRT_MINOR_VERSION
);
VCS_version
,
VRT_MAJOR_VERSION
,
VRT_MINOR_VERSION
);
VSB_printf
(
pan_vsb
,
"ident = %s,%s
\n
"
,
VSB_printf
(
pan_vsb
,
"ident = %s,%s
\n
"
,
VSB_data
(
vident
)
+
1
,
Waiter_GetName
());
heritage
.
ident
+
1
,
Waiter_GetName
());
VSB_printf
(
pan_vsb
,
"now = %f (mono), %f (real)
\n
"
,
VSB_printf
(
pan_vsb
,
"now = %f (mono), %f (real)
\n
"
,
VTIM_mono
(),
VTIM_real
());
VTIM_mono
(),
VTIM_real
());
...
...
bin/varnishd/common/common.h
View file @
9c8609de
...
@@ -50,15 +50,9 @@
...
@@ -50,15 +50,9 @@
# define MAX_THREAD_POOLS 32
# define MAX_THREAD_POOLS 32
#endif
#endif
/* Name of transient storage */
#define TRANSIENT_STORAGE "Transient"
extern
pid_t
mgt_pid
;
extern
pid_t
mgt_pid
;
#define ASSERT_MGT() do { assert(getpid() == mgt_pid);} while (0)
#define ASSERT_MGT() do { assert(getpid() == mgt_pid);} while (0)
/* varnishd.c */
extern
struct
vsb
*
vident
;
// XXX: -> heritage ?
/* Really belongs in mgt.h, but storage_file chokes on both */
/* Really belongs in mgt.h, but storage_file chokes on both */
void
MCH_Fd_Inherit
(
int
fd
,
const
char
*
what
);
void
MCH_Fd_Inherit
(
int
fd
,
const
char
*
what
);
...
...
bin/varnishd/common/heritage.h
View file @
9c8609de
...
@@ -84,6 +84,8 @@ struct heritage {
...
@@ -84,6 +84,8 @@ struct heritage {
ssize_t
panic_str_len
;
ssize_t
panic_str_len
;
struct
VCLS
*
cls
;
struct
VCLS
*
cls
;
const
char
*
ident
;
};
};
extern
struct
heritage
heritage
;
extern
struct
heritage
heritage
;
...
...
bin/varnishd/mgt/mgt.h
View file @
9c8609de
...
@@ -135,6 +135,7 @@ extern const struct jail_tech jail_tech_unix;
...
@@ -135,6 +135,7 @@ extern const struct jail_tech jail_tech_unix;
extern
const
struct
jail_tech
jail_tech_solaris
;
extern
const
struct
jail_tech
jail_tech_solaris
;
/* mgt_main.c */
/* mgt_main.c */
extern
struct
vsb
*
vident
;
extern
struct
VSC_mgt
*
VSC_C_mgt
;
extern
struct
VSC_mgt
*
VSC_C_mgt
;
struct
choice
{
struct
choice
{
const
char
*
name
;
const
char
*
name
;
...
...
bin/varnishd/mgt/mgt_child.c
View file @
9c8609de
...
@@ -366,6 +366,7 @@ mgt_launch_child(struct cli *cli)
...
@@ -366,6 +366,7 @@ mgt_launch_child(struct cli *cli)
mgt_ProcTitle
(
"Child"
);
mgt_ProcTitle
(
"Child"
);
heritage
.
cls
=
mgt_cls
;
heritage
.
cls
=
mgt_cls
;
heritage
.
ident
=
VSB_data
(
vident
)
+
1
;
if
(
mgt_param
.
sigsegv_handler
)
{
if
(
mgt_param
.
sigsegv_handler
)
{
memset
(
&
sa
,
0
,
sizeof
sa
);
memset
(
&
sa
,
0
,
sizeof
sa
);
...
...
bin/varnishd/storage/mgt_stevedore.c
View file @
9c8609de
...
@@ -46,6 +46,9 @@
...
@@ -46,6 +46,9 @@
static
VTAILQ_HEAD
(,
stevedore
)
stevedores
=
static
VTAILQ_HEAD
(,
stevedore
)
stevedores
=
VTAILQ_HEAD_INITIALIZER
(
stevedores
);
VTAILQ_HEAD_INITIALIZER
(
stevedores
);
/* Name of transient storage */
#define TRANSIENT_STORAGE "Transient"
struct
stevedore
*
stv_transient
;
struct
stevedore
*
stv_transient
;
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment