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
5cc0e270
Commit
5cc0e270
authored
May 23, 2017
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert debugging which snug into previous commit
parent
e1cde638
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
33 deletions
+5
-33
vsc.c
lib/libvarnishapi/vsc.c
+5
-33
No files found.
lib/libvarnishapi/vsc.c
View file @
5cc0e270
...
...
@@ -34,7 +34,6 @@
#include <fnmatch.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
...
...
@@ -42,9 +41,7 @@
#include "vas.h"
#include "miniobj.h"
#include "vqueue.h"
#include "vjsn.h"
#include "vsb.h"
#include "vend.h"
#include "vapi/vsc.h"
#include "vapi/vsm.h"
...
...
@@ -316,26 +313,10 @@ vsc_add_pt(struct vsc *vsc, const volatile void *ptr,
/*--------------------------------------------------------------------
*/
static
void
vsc_build_old_vf_list
(
struct
vsc
*
vsc
)
{
#define VSC_TYPE_F(n,t,l,e,d) \
if (!strcmp(vsc->iter_fantom.type, t)) \
vsc_add_vf(vsc, &vsc->iter_fantom, \
&VSC_type_desc_##n, VSC_type_order_##n);
#include "tbl/vsc_types.h"
}
#include <stdio.h>
static
void
vsc_build_vf_list
(
struct
VSM_data
*
vd
)
{
uint64_t
u
;
struct
vsc
*
vsc
=
vsc_setup
(
vd
);
struct
vjsn
*
vj
;
const
char
*
p
;
const
char
*
e
;
vsc_delete_pt_list
(
&
vsc
->
pt_list
);
vsc_delete_vf_list
(
&
vsc
->
vf_list
);
...
...
@@ -343,20 +324,11 @@ vsc_build_vf_list(struct VSM_data *vd)
VSM_FOREACH
(
&
vsc
->
iter_fantom
,
vd
)
{
if
(
strcmp
(
vsc
->
iter_fantom
.
class
,
VSC_CLASS
))
continue
;
u
=
vbe64dec
(
vsc
->
iter_fantom
.
b
);
vsc_build_old_vf_list
(
vsc
);
if
(
u
==
0
)
{
fprintf
(
stderr
,
"%s has no JSON
\n
"
,
vsc
->
iter_fantom
.
type
);
exit
(
2
);
}
p
=
(
char
*
)
vsc
->
iter_fantom
.
b
+
u
;
vj
=
vjsn_parse
(
p
,
&
e
);
if
(
e
!=
NULL
)
{
fprintf
(
stderr
,
"%s
\n
"
,
p
);
fprintf
(
stderr
,
"JSON ERROR %s
\n
"
,
e
);
}
AZ
(
e
);
//vjsn_dump(vj, stdout);
#define VSC_TYPE_F(n,t,l,e,d) \
if (!strcmp(vsc->iter_fantom.type, t)) \
vsc_add_vf(vsc, &vsc->iter_fantom, \
&VSC_type_desc_##n, VSC_type_order_##n);
#include "tbl/vsc_types.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