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
7a24aa37
Commit
7a24aa37
authored
Oct 08, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start #include reorg. The table-building #includes will all go into
the tbl/ subdirectory
parent
0e63559a
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
27 additions
and
23 deletions
+27
-23
cache.h
bin/varnishd/cache.h
+1
-1
cache_wrk.c
bin/varnishd/cache_wrk.c
+1
-1
Makefile.am
include/Makefile.am
+6
-6
README
include/tbl/README
+4
-0
vsc_all.h
include/tbl/vsc_all.h
+5
-5
vsc_fields.h
include/tbl/vsc_fields.h
+0
-0
vsl_tags.h
include/tbl/vsl_tags.h
+0
-0
vsc.h
include/vsc.h
+1
-1
vsl.h
include/vsl.h
+1
-1
vsc.c
lib/libvarnishapi/vsc.c
+2
-2
vsl.c
lib/libvarnishapi/vsl.c
+1
-1
vsc2rst.c
man/vsc2rst.c
+5
-5
No files found.
bin/varnishd/cache.h
View file @
7a24aa37
...
@@ -224,7 +224,7 @@ struct acct {
...
@@ -224,7 +224,7 @@ struct acct {
#define VSC_F(n, t, l, f, e,d) L##l(t, n)
#define VSC_F(n, t, l, f, e,d) L##l(t, n)
#define VSC_DO_MAIN
#define VSC_DO_MAIN
struct
dstat
{
struct
dstat
{
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
};
};
#undef VSC_F
#undef VSC_F
#undef VSC_DO_MAIN
#undef VSC_DO_MAIN
...
...
bin/varnishd/cache_wrk.c
View file @
7a24aa37
...
@@ -53,7 +53,7 @@ wrk_sumstat(struct worker *w)
...
@@ -53,7 +53,7 @@ wrk_sumstat(struct worker *w)
#define L1(n) (VSC_C_main->n += w->stats.n)
#define L1(n) (VSC_C_main->n += w->stats.n)
#define VSC_DO_MAIN
#define VSC_DO_MAIN
#define VSC_F(n, t, l, f, d, e) L##l(n);
#define VSC_F(n, t, l, f, d, e) L##l(n);
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_F
#undef VSC_F
#undef VSC_DO_MAIN
#undef VSC_DO_MAIN
#undef L0
#undef L0
...
...
include/Makefile.am
View file @
7a24aa37
#
#
pkginclude_HEADERS
=
\
pkginclude_HEADERS
=
\
vsm.h
\
tbl/vsc_all.h
\
vsl.h
\
tbl/vsc_fields.h
\
tbl/vsl_tags.h
\
varnishapi.h
\
vcli.h
\
vcli.h
\
vsl_tags.h
\
vsc_fields.h
\
vsc_all.h
\
vsc.h
\
vsc.h
\
varnishapi.h
vsl.h
\
vsm.h
nobase_noinst_HEADERS
=
\
nobase_noinst_HEADERS
=
\
ban_vars.h
\
ban_vars.h
\
...
...
include/tbl/README
0 → 100644
View file @
7a24aa37
The include files in this directory are special, they are used to
define sets of objects using macros, such that a list of all such
objects can be compiled into the code by including these files with
a properly defined macro.
include/vsc_all.h
→
include/
tbl/
vsc_all.h
View file @
7a24aa37
...
@@ -31,30 +31,30 @@
...
@@ -31,30 +31,30 @@
VSC_DO
(
LCK
,
lck
,
VSC_TYPE_LCK
)
VSC_DO
(
LCK
,
lck
,
VSC_TYPE_LCK
)
#define VSC_DO_LCK
#define VSC_DO_LCK
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_LCK
#undef VSC_DO_LCK
VSC_DONE
(
LCK
,
lck
,
VSC_TYPE_LCK
)
VSC_DONE
(
LCK
,
lck
,
VSC_TYPE_LCK
)
VSC_DO
(
MAIN
,
main
,
VSC_TYPE_MAIN
)
VSC_DO
(
MAIN
,
main
,
VSC_TYPE_MAIN
)
#define VSC_DO_MAIN
#define VSC_DO_MAIN
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_MAIN
#undef VSC_DO_MAIN
VSC_DONE
(
MAIN
,
main
,
VSC_TYPE_MAIN
)
VSC_DONE
(
MAIN
,
main
,
VSC_TYPE_MAIN
)
VSC_DO
(
SMA
,
sma
,
VSC_TYPE_SMA
)
VSC_DO
(
SMA
,
sma
,
VSC_TYPE_SMA
)
#define VSC_DO_SMA
#define VSC_DO_SMA
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_SMA
#undef VSC_DO_SMA
VSC_DONE
(
SMA
,
sma
,
VSC_TYPE_SMA
)
VSC_DONE
(
SMA
,
sma
,
VSC_TYPE_SMA
)
VSC_DO
(
SMF
,
smf
,
VSC_TYPE_SMF
)
VSC_DO
(
SMF
,
smf
,
VSC_TYPE_SMF
)
#define VSC_DO_SMF
#define VSC_DO_SMF
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_SMF
#undef VSC_DO_SMF
VSC_DONE
(
SMF
,
smf
,
VSC_TYPE_SMF
)
VSC_DONE
(
SMF
,
smf
,
VSC_TYPE_SMF
)
VSC_DO
(
VBE
,
vbe
,
VSC_TYPE_VBE
)
VSC_DO
(
VBE
,
vbe
,
VSC_TYPE_VBE
)
#define VSC_DO_VBE
#define VSC_DO_VBE
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_VBE
#undef VSC_DO_VBE
VSC_DONE
(
VBE
,
vbe
,
VSC_TYPE_VBE
)
VSC_DONE
(
VBE
,
vbe
,
VSC_TYPE_VBE
)
include/vsc_fields.h
→
include/
tbl/
vsc_fields.h
View file @
7a24aa37
File moved
include/vsl_tags.h
→
include/
tbl/
vsl_tags.h
View file @
7a24aa37
File moved
include/vsc.h
View file @
7a24aa37
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
#define VSC_DO(u,l,t) struct VSC_C_##l {
#define VSC_DO(u,l,t) struct VSC_C_##l {
#define VSC_DONE(u,l,t) };
#define VSC_DONE(u,l,t) };
#include "vsc_all.h"
#include "
tbl/
vsc_all.h"
#undef VSC_DO
#undef VSC_DO
#undef VSC_F
#undef VSC_F
...
...
include/vsl.h
View file @
7a24aa37
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
enum
VSL_tag_e
{
enum
VSL_tag_e
{
SLT_Bogus
=
0
,
SLT_Bogus
=
0
,
#define SLTM(foo) SLT_##foo,
#define SLTM(foo) SLT_##foo,
#include "vsl_tags.h"
#include "
tbl/
vsl_tags.h"
#undef SLTM
#undef SLTM
SLT_Reserved
=
255
SLT_Reserved
=
255
};
};
...
...
lib/libvarnishapi/vsc.c
View file @
7a24aa37
...
@@ -309,7 +309,7 @@ iter_call(const struct vsc *vsc, VSC_iter_f *func, void *priv,
...
@@ -309,7 +309,7 @@ iter_call(const struct vsc *vsc, VSC_iter_f *func, void *priv,
return (0); \
return (0); \
}
}
#include "vsc_all.h"
#include "
tbl/
vsc_all.h"
#undef VSC_DO
#undef VSC_DO
#undef VSC_F
#undef VSC_F
#undef VSC_DONE
#undef VSC_DONE
...
@@ -339,7 +339,7 @@ VSC_Iter(struct VSM_data *vd, VSC_iter_f *func, void *priv)
...
@@ -339,7 +339,7 @@ VSC_Iter(struct VSM_data *vd, VSC_iter_f *func, void *priv)
if (!i) \
if (!i) \
continue; \
continue; \
}
}
#include "vsc_all.h"
#include "
tbl/
vsc_all.h"
#undef VSC_F
#undef VSC_F
#undef VSC_DO
#undef VSC_DO
#undef VSC_DONE
#undef VSC_DONE
...
...
lib/libvarnishapi/vsl.c
View file @
7a24aa37
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
const
char
*
VSL_tags
[
256
]
=
{
const
char
*
VSL_tags
[
256
]
=
{
#define SLTM(foo) [SLT_##foo] = #foo,
#define SLTM(foo) [SLT_##foo] = #foo,
#include "vsl_tags.h"
#include "
tbl/
vsl_tags.h"
#undef SLTM
#undef SLTM
};
};
...
...
man/vsc2rst.c
View file @
7a24aa37
...
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
...
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
P
(
"============="
);
P
(
"============="
);
P
(
""
);
P
(
""
);
#define VSC_DO_MAIN
#define VSC_DO_MAIN
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_MAIN
#undef VSC_DO_MAIN
P
(
""
);
P
(
""
);
...
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
...
@@ -35,7 +35,7 @@ int main(int argc, char **argv)
P
(
"============="
);
P
(
"============="
);
P
(
""
);
P
(
""
);
#define VSC_DO_LCK
#define VSC_DO_LCK
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_LCK
#undef VSC_DO_LCK
P
(
""
);
P
(
""
);
...
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
...
@@ -43,7 +43,7 @@ int main(int argc, char **argv)
P
(
"==========================="
);
P
(
"==========================="
);
P
(
""
);
P
(
""
);
#define VSC_DO_SMA
#define VSC_DO_SMA
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_SMA
#undef VSC_DO_SMA
P
(
""
);
P
(
""
);
...
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
...
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
P
(
"========================="
);
P
(
"========================="
);
P
(
""
);
P
(
""
);
#define VSC_DO_SMF
#define VSC_DO_SMF
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_SMF
#undef VSC_DO_SMF
P
(
""
);
P
(
""
);
...
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
...
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
P
(
"===================="
);
P
(
"===================="
);
P
(
""
);
P
(
""
);
#define VSC_DO_VBE
#define VSC_DO_VBE
#include "vsc_fields.h"
#include "
tbl/
vsc_fields.h"
#undef VSC_DO_VBE
#undef VSC_DO_VBE
return
0
;
return
0
;
...
...
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