Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
874655c0
Commit
874655c0
authored
Oct 09, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get the rest of the stuff in there too.
parent
1c2a1b34
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
26 additions
and
19 deletions
+26
-19
cache_panic.c
bin/varnishd/cache_panic.c
+2
-1
cache_shmlog.c
bin/varnishd/cache_shmlog.c
+3
-1
mgt_child.c
bin/varnishd/mgt_child.c
+1
-1
mgt_shmem.c
bin/varnishd/mgt_shmem.c
+1
-1
vsm.c
bin/varnishd/vsm.c
+1
-1
Makefile.am
include/Makefile.am
+2
-2
vsm_int.h
include/vapi/vsm_int.h
+11
-8
vin.c
lib/libvarnish/vin.c
+2
-1
vsc.c
lib/libvarnishapi/vsc.c
+1
-1
vsl.c
lib/libvarnishapi/vsl.c
+1
-1
vsm.c
lib/libvarnishapi/vsm.c
+1
-1
No files found.
bin/varnishd/cache_panic.c
View file @
874655c0
...
@@ -29,6 +29,8 @@
...
@@ -29,6 +29,8 @@
#include "config.h"
#include "config.h"
#include "vapi/vsm_int.h"
#include <stdio.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdlib.h>
...
@@ -40,7 +42,6 @@
...
@@ -40,7 +42,6 @@
#include "cache.h"
#include "cache.h"
#include "vsm.h"
#include "cache_backend.h"
#include "cache_backend.h"
#include "cache_waiter.h"
#include "cache_waiter.h"
#include "vcl.h"
#include "vcl.h"
...
...
bin/varnishd/cache_shmlog.c
View file @
874655c0
...
@@ -29,11 +29,13 @@
...
@@ -29,11 +29,13 @@
#include "config.h"
#include "config.h"
#include <stdio.h>
#include <stdio.h>
#include "cache.h"
#include "cache.h"
#include "vapi/vsm_int.h"
#include "vmb.h"
#include "vmb.h"
#include "vsm.h"
#include "vtim.h"
#include "vtim.h"
/* These cannot be struct lock, which depends on vsm/vsl working */
/* These cannot be struct lock, which depends on vsm/vsl working */
...
...
bin/varnishd/mgt_child.c
View file @
874655c0
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
#include <sys/wait.h>
#include <sys/wait.h>
#include "mgt.h"
#include "mgt.h"
#include "v
sm
.h"
#include "v
api/vsm_int
.h"
#include "heritage.h"
#include "heritage.h"
#include "vcli.h"
#include "vcli.h"
#include "cli_priv.h"
#include "cli_priv.h"
...
...
bin/varnishd/mgt_shmem.c
View file @
874655c0
...
@@ -101,7 +101,7 @@
...
@@ -101,7 +101,7 @@
#include "mgt.h"
#include "mgt.h"
#include "heritage.h"
#include "heritage.h"
#include "vmb.h"
#include "vmb.h"
#include "v
sm
.h"
#include "v
api/vsm_int
.h"
#include "vav.h"
#include "vav.h"
#include "vnum.h"
#include "vnum.h"
#include "flopen.h"
#include "flopen.h"
...
...
bin/varnishd/vsm.c
View file @
874655c0
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
#include "common.h"
#include "common.h"
#include "vmb.h"
#include "vmb.h"
#include "v
sm
.h"
#include "v
api/vsm_int
.h"
#include "vtim.h"
#include "vtim.h"
/* These two come from beyond (mgt_shmem.c actually) */
/* These two come from beyond (mgt_shmem.c actually) */
...
...
include/Makefile.am
View file @
874655c0
...
@@ -16,12 +16,12 @@ pkginclude_HEADERS = \
...
@@ -16,12 +16,12 @@ pkginclude_HEADERS = \
tbl/vsc_fields.h
\
tbl/vsc_fields.h
\
tbl/vsl_tags.h
\
tbl/vsl_tags.h
\
vapi/vsm.h
\
vapi/vsm.h
\
vapi/vsm_int.h
\
vapi/vsc.h
\
vapi/vsc.h
\
vapi/vsc_int.h
\
vapi/vsc_int.h
\
vapi/vsl.h
\
vapi/vsl.h
\
vapi/vsl_int.h
\
vapi/vsl_int.h
\
vcli.h
\
vcli.h
vsm.h
nobase_noinst_HEADERS
=
\
nobase_noinst_HEADERS
=
\
binary_heap.h
\
binary_heap.h
\
...
...
include/vapi/vsm_int.h
View file @
874655c0
...
@@ -31,13 +31,12 @@
...
@@ -31,13 +31,12 @@
* NB: THIS IS NOT A PUBLIC API TO VARNISH!
* NB: THIS IS NOT A PUBLIC API TO VARNISH!
*/
*/
#ifndef VSM_H_INCLUDED
#ifndef VSM_
INT_
H_INCLUDED
#define VSM_H_INCLUDED
#define VSM_
INT_
H_INCLUDED
#define VSM_FILENAME "_.vsm"
#define VSM_FILENAME "_.vsm"
#include <time.h>
#include <stdint.h>
#include <sys/types.h>
/*
/*
* This structure describes each allocation from the shmlog
* This structure describes each allocation from the shmlog
...
@@ -62,9 +61,9 @@ struct VSM_head {
...
@@ -62,9 +61,9 @@ struct VSM_head {
unsigned
hdrsize
;
unsigned
hdrsize
;
time_t
starttime
;
uint64_t
starttime
;
pid
_t
master_pid
;
int64
_t
master_pid
;
pid
_t
child_pid
;
int64
_t
child_pid
;
unsigned
shm_size
;
unsigned
shm_size
;
...
@@ -107,6 +106,10 @@ vsm_iter_n(struct VSM_chunk **pp)
...
@@ -107,6 +106,10 @@ vsm_iter_n(struct VSM_chunk **pp)
#define VSM_ITER(vd) for ((vd) = vsm_iter_0(); (vd) != NULL; vsm_iter_n(&vd))
#define VSM_ITER(vd) for ((vd) = vsm_iter_0(); (vd) != NULL; vsm_iter_n(&vd))
#else
#define VSM_ITER(vd) while (YOU_NEED_MINIOBJ_TO_USE_VSM_ITER)
#endif
/* CHECK_OBJ_NOTNULL */
#endif
/* CHECK_OBJ_NOTNULL */
#endif
#endif
/* VSM_INT_H_INCLUDED */
lib/libvarnish/vin.c
View file @
874655c0
...
@@ -30,6 +30,8 @@
...
@@ -30,6 +30,8 @@
#include "config.h"
#include "config.h"
#include "vapi/vsm_int.h"
#include <errno.h>
#include <errno.h>
#include <limits.h>
#include <limits.h>
#include <stdio.h>
#include <stdio.h>
...
@@ -39,7 +41,6 @@
...
@@ -39,7 +41,6 @@
#include "vas.h"
#include "vas.h"
#include "vdef.h"
#include "vdef.h"
#include "vin.h"
#include "vin.h"
#include "vsm.h"
int
int
VIN_N_Arg
(
const
char
*
n_arg
,
char
**
name
,
char
**
dir
,
char
**
vsl
)
VIN_N_Arg
(
const
char
*
n_arg
,
char
**
name
,
char
**
dir
,
char
**
vsl
)
...
...
lib/libvarnishapi/vsc.c
View file @
874655c0
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
#include "config.h"
#include "config.h"
#include "vapi/vsm.h"
#include "vapi/vsm.h"
#include "vapi/vsm_int.h"
#include "vapi/vsc.h"
#include "vapi/vsc.h"
#include <sys/types.h>
#include <sys/types.h>
...
@@ -39,7 +40,6 @@
...
@@ -39,7 +40,6 @@
#include "vas.h"
#include "vas.h"
#include "vav.h"
#include "vav.h"
#include "vsm.h"
#include "vqueue.h"
#include "vqueue.h"
#include "miniobj.h"
#include "miniobj.h"
...
...
lib/libvarnishapi/vsl.c
View file @
874655c0
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
#include "config.h"
#include "config.h"
#include "vapi/vsm.h"
#include "vapi/vsm.h"
#include "vapi/vsm_int.h"
#include "vapi/vsl.h"
#include "vapi/vsl.h"
#include <sys/types.h>
#include <sys/types.h>
...
@@ -41,7 +42,6 @@
...
@@ -41,7 +42,6 @@
#include <unistd.h>
#include <unistd.h>
#include "vas.h"
#include "vas.h"
#include "vsm.h"
#include "vre.h"
#include "vre.h"
#include "vbm.h"
#include "vbm.h"
#include "miniobj.h"
#include "miniobj.h"
...
...
lib/libvarnishapi/vsm.c
View file @
874655c0
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
#include "config.h"
#include "config.h"
#include "vapi/vsm.h"
#include "vapi/vsm.h"
#include "vapi/vsm_int.h"
#include <stdint.h>
#include <stdint.h>
#include <sys/types.h>
#include <sys/types.h>
...
@@ -45,7 +46,6 @@
...
@@ -45,7 +46,6 @@
#include "vas.h"
#include "vas.h"
#include "vin.h"
#include "vin.h"
#include "vsm.h"
#include "vbm.h"
#include "vbm.h"
#include "miniobj.h"
#include "miniobj.h"
...
...
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