Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
varnishevent
Commits
eb95c8bd
Unverified
Commit
eb95c8bd
authored
Oct 12, 2021
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move gloabl variables to their likely home source
The previous commit broke "make check"
parent
d7dc0556
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
21 deletions
+33
-21
config.c
src/config.c
+4
-0
data.c
src/data.c
+10
-0
format.c
src/format.c
+9
-0
varnishevent.c
src/varnishevent.c
+0
-20
writer.c
src/writer.c
+9
-0
writer.h
src/writer.h
+1
-1
No files found.
src/config.c
View file @
eb95c8bd
...
...
@@ -46,6 +46,10 @@
#include "vas.h"
/* global variables, see varnishevent.h */
struct
config
config
;
struct
logconf
logconf
;
static
const
int
facilitynum
[
8
]
=
{
LOG_LOCAL0
,
LOG_LOCAL1
,
LOG_LOCAL2
,
LOG_LOCAL3
,
LOG_LOCAL4
,
LOG_LOCAL5
,
LOG_LOCAL6
,
LOG_LOCAL7
};
...
...
src/data.c
View file @
eb95c8bd
...
...
@@ -47,6 +47,16 @@
#include "vsb.h"
#include "vmb.h"
/* global variables, see varnishevent.h */
chunk_t
*
chunks
;
unsigned
nchunks
;
rec_t
*
records
;
unsigned
nrecords
;
rec_node_t
*
rec_nodes
;
tx_t
*
txn
;
unsigned
tx_occ
,
rec_occ
,
chunk_occ
,
tx_occ_hi
,
rec_occ_hi
,
chunk_occ_hi
,
global_nfree_tx
,
global_nfree_rec
,
global_nfree_chunk
;
#define __offsetof(st, m) offsetof(st,m)
/* Preprend head2 before head1, result in head1, head2 empty afterward */
...
...
src/format.c
View file @
eb95c8bd
...
...
@@ -55,6 +55,15 @@
#define OBUF_SIZE 4096
#endif
/* global variables, see varnishevent.h */
int
max_idx
;
int
tag2idx
[
MAX_VSL_TAG
];
int
nonrecs_wanted
[
VSL_t__MAX
];
struct
vbitmap
*
tag_no_hdr
[
VSL_t__MAX
];
struct
hdrt_node
*
hdr_trie
[
MAX_VSL_TAG
];
typedef
struct
compiled_fmt_t
{
char
**
str
;
formatter_f
**
formatter
;
...
...
src/varnishevent.c
View file @
eb95c8bd
...
...
@@ -90,26 +90,6 @@
/* global variables, see varnishevent.h */
struct
sigaction
default_action
;
int
tag2idx
[
MAX_VSL_TAG
];
int
max_idx
;
chunk_t
*
chunks
;
unsigned
nchunks
;
rec_t
*
records
;
unsigned
nrecords
;
rec_node_t
*
rec_nodes
;
tx_t
*
txn
;
unsigned
tx_occ
,
rec_occ
,
chunk_occ
,
tx_occ_hi
,
rec_occ_hi
,
chunk_occ_hi
,
global_nfree_tx
,
global_nfree_rec
,
global_nfree_chunk
;
struct
hdrt_node
*
hdr_trie
[
MAX_VSL_TAG
];
int
nonrecs_wanted
[
VSL_t__MAX
];
struct
vbitmap
*
tag_no_hdr
[
VSL_t__MAX
];
pthread_cond_t
spscq_ready_cond
;
pthread_mutex_t
spscq_ready_lock
;
pthread_cond_t
data_ready_cond
;
pthread_mutex_t
data_ready_lock
;
struct
config
config
;
struct
logconf
logconf
;
/* static */
...
...
src/writer.c
View file @
eb95c8bd
...
...
@@ -49,6 +49,15 @@
#include "vmb.h"
#include "vtim.h"
/* global variables, see varnishevent.h */
pthread_cond_t
spscq_ready_cond
;
pthread_mutex_t
spscq_ready_lock
;
pthread_cond_t
data_ready_cond
;
pthread_mutex_t
data_ready_lock
;
/* global variables, see writer.h */
struct
txhead_s
wrt_freetx
;
typedef
enum
{
WRT_NOTSTARTED
=
0
,
WRT_INITIALIZING
,
...
...
src/writer.h
View file @
eb95c8bd
...
...
@@ -32,6 +32,6 @@
#include "varnishevent.h"
/* local freelist - return space in chunks */
struct
txhead_s
wrt_freetx
;
extern
struct
txhead_s
wrt_freetx
;
void
wrt_write
(
tx_t
*
tx
);
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