[master] ef56a0d Rename struct "VSM_data" to just "vsm", to definitively break the API.
Poul-Henning Kamp
phk at FreeBSD.org
Thu Jun 8 15:42:05 CEST 2017
commit ef56a0d60eb862ca624c80306abfb6b5b6d141d6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Jun 8 13:41:06 2017 +0000
Rename struct "VSM_data" to just "vsm", to definitively break the API.
diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index efca881..7e0c15b 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -393,7 +393,7 @@ n_arg_sock(const char *n_arg)
{
char *T_arg = NULL, *T_start = NULL;
char *S_arg = NULL;
- struct VSM_data *vsm;
+ struct vsm *vsm;
char *p;
int sock;
struct VSM_fantom vt;
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index 7f6bd33..1290408 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -76,7 +76,7 @@ do_xml_cb(void *priv, const struct VSC_point * const pt)
}
static void
-do_xml(struct VSM_data *vd)
+do_xml(struct vsm *vd)
{
char time_stamp[20];
time_t now;
@@ -130,7 +130,7 @@ do_json_cb(void *priv, const struct VSC_point * const pt)
}
static void
-do_json(struct VSM_data *vd)
+do_json(struct vsm *vd)
{
char time_stamp[20];
time_t now;
@@ -206,7 +206,7 @@ do_once_cb(void *priv, const struct VSC_point * const pt)
}
static void
-do_once(struct VSM_data *vd)
+do_once(struct vsm *vd)
{
struct once_priv op;
@@ -242,7 +242,7 @@ do_list_cb(void *priv, const struct VSC_point * const pt)
}
static void
-list_fields(struct VSM_data *vd)
+list_fields(struct vsm *vd)
{
printf("Varnishstat -f option fields:\n");
printf("Field name Description\n");
@@ -268,7 +268,7 @@ usage(int status)
int
main(int argc, char * const *argv)
{
- struct VSM_data *vd;
+ struct vsm *vd;
double t_arg = 5.0, t_start = NAN;
int once = 0, xml = 0, json = 0, f_list = 0, curses = 0;
signed char opt;
diff --git a/bin/varnishstat/varnishstat.h b/bin/varnishstat/varnishstat.h
index 18d3def..54fd0ba 100644
--- a/bin/varnishstat/varnishstat.h
+++ b/bin/varnishstat/varnishstat.h
@@ -35,4 +35,4 @@
#include "vas.h"
#include "vcs.h"
-void do_curses(struct VSM_data *vd, double delay);
+void do_curses(struct vsm *vd, double delay);
diff --git a/bin/varnishstat/varnishstat_curses.c b/bin/varnishstat/varnishstat_curses.c
index 97995dd..f3b7449 100644
--- a/bin/varnishstat/varnishstat_curses.c
+++ b/bin/varnishstat/varnishstat_curses.c
@@ -334,7 +334,7 @@ build_pt_list_cb(void *priv, const struct VSC_point *vpt)
}
static void
-build_pt_list(struct VSM_data *vd, struct VSM_fantom *fantom)
+build_pt_list(struct vsm *vd, struct VSM_fantom *fantom)
{
struct pt_priv pt_priv;
int i;
@@ -1065,7 +1065,7 @@ handle_keypress(int ch)
}
void
-do_curses(struct VSM_data *vd, double delay)
+do_curses(struct vsm *vd, double delay)
{
struct pollfd pollfd;
long t;
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 45e856e..6b79933 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -155,7 +155,7 @@ struct logexp {
int g_arg;
char *query;
- struct VSM_data *vsm;
+ struct vsm *vsm;
struct vsb *n_arg;
struct VSL_data *vsl;
struct VSLQ *vslq;
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 82d8444..4cf7edd 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -76,7 +76,7 @@ struct varnish {
char *jail;
char *proto;
- struct VSM_data *vd; /* vsc use */
+ struct vsm *vd; /* vsc use */
unsigned vsl_tag_count[256];
@@ -197,7 +197,7 @@ varnishlog_thread(void *priv)
{
struct varnish *v;
struct VSL_data *vsl;
- struct VSM_data *vsm;
+ struct vsm *vsm;
struct VSL_cursor *c;
enum VSL_tag_e tag;
uint32_t vxid;
diff --git a/include/vapi/vsc.h b/include/vapi/vsc.h
index c53d388..5b08446 100644
--- a/include/vapi/vsc.h
+++ b/include/vapi/vsc.h
@@ -37,14 +37,14 @@
#include "vapi/vsc_int.h"
-struct VSM_data;
+struct vsm;
struct VSM_fantom;
/*---------------------------------------------------------------------
* VSC level access functions
*/
-int VSC_Arg(struct VSM_data *vd, int arg, const char *opt);
+int VSC_Arg(struct vsm *vd, int arg, const char *opt);
/*
* Handle standard stat-presenter arguments
* Return:
@@ -53,7 +53,7 @@ int VSC_Arg(struct VSM_data *vd, int arg, const char *opt);
* 1 Handled.
*/
-void *VSC_Get(const struct VSM_data *vd, struct VSM_fantom *fantom,
+void *VSC_Get(const struct vsm *vd, struct VSM_fantom *fantom,
const char *type, const char *ident);
/*
* Looks up the given VSC type and identifier. If fantom is
@@ -61,7 +61,7 @@ void *VSC_Get(const struct VSM_data *vd, struct VSM_fantom *fantom,
* VSM_StillValid.
*
* Arguments:
- * vd: The VSM_data context
+ * vd: The vsm context
* fantom: Pointer to a fantom. Can be NULL.
* type: The type of the counter segment
* ident: The identifier of the counter segment
@@ -107,7 +107,7 @@ struct VSC_point {
typedef int VSC_iter_f(void *priv, const struct VSC_point *const pt);
-int VSC_Iter(struct VSM_data *vd, struct VSM_fantom *fantom, VSC_iter_f *func,
+int VSC_Iter(struct vsm *vd, struct VSM_fantom *fantom, VSC_iter_f *func,
void *priv);
/*
* Iterate over all statistics counters, calling "func" for
@@ -126,7 +126,7 @@ int VSC_Iter(struct VSM_data *vd, struct VSM_fantom *fantom, VSC_iter_f *func,
* change (child restart, allocations/deallocations)
*
* Arguments:
- * vd: The VSM_data context
+ * vd: The vsm context
* fantom: Pointer to a fantom. Can be NULL.
* func: The callback function
* priv: Passed as argument to func
diff --git a/include/vapi/vsl.h b/include/vapi/vsl.h
index 03d98d7..caa3443 100644
--- a/include/vapi/vsl.h
+++ b/include/vapi/vsl.h
@@ -38,7 +38,7 @@
#include "vapi/vsl_int.h"
-struct VSM_data;
+struct vsm;
/*
* enum VSL_tag_e enumerates the SHM log tags, where the identifiers are
@@ -266,7 +266,7 @@ void VSL_ResetError(struct VSL_data *vsl);
#define VSL_COPT_TAIL (1 << 0)
#define VSL_COPT_BATCH (1 << 1)
#define VSL_COPT_TAILSTOP (1 << 2)
-struct VSL_cursor *VSL_CursorVSM(struct VSL_data *vsl, struct VSM_data *vsm,
+struct VSL_cursor *VSL_CursorVSM(struct VSL_data *vsl, struct vsm *vsm,
unsigned options);
/*
* Set the cursor pointed to by cursor up as a raw cursor in the
diff --git a/include/vapi/vsm.h b/include/vapi/vsm.h
index bd26bc9..4037c50 100644
--- a/include/vapi/vsm.h
+++ b/include/vapi/vsm.h
@@ -37,7 +37,7 @@
#define VAPI_VSM_H_INCLUDED
struct VSM_chunk;
-struct VSM_data;
+struct vsm;
/*
* This structure is used to reference a VSM chunk
@@ -59,36 +59,36 @@ struct VSM_fantom {
* VSM level access functions
*/
-struct VSM_data *VSM_New(void);
+struct vsm *VSM_New(void);
/*
* Allocate and initialize a VSL_data handle structure.
* This is the first thing you will have to do, always.
- * You can have multiple active VSM_data handles at the same time
+ * You can have multiple active vsm handles at the same time
* referencing the same or different shared memory files.
* Returns:
* Pointer to usable VSL_data handle.
* NULL: malloc failed.
*/
-void VSM_Delete(struct VSM_data *vd);
+void VSM_Delete(struct vsm *vd);
/*
* Close and deallocate all storage and mappings.
* (including any VSC and VSL "sub-classes")
*/
-const char *VSM_Error(const struct VSM_data *vd);
+const char *VSM_Error(const struct vsm *vd);
/*
* Return the latest error message.
*/
-void VSM_ResetError(struct VSM_data *vd);
+void VSM_ResetError(struct vsm *vd);
/*
* Reset any error message.
*/
#define VSM_n_USAGE "[-n varnish_name]"
-int VSM_n_Arg(struct VSM_data *vd, const char *n_arg);
+int VSM_n_Arg(struct vsm *vd, const char *n_arg);
/*
* Configure which varnishd instance to access.
* Uses hostname if n_arg is NULL or "".
@@ -98,12 +98,12 @@ int VSM_n_Arg(struct VSM_data *vd, const char *n_arg);
* <0 on failure, VSM_Error() returns diagnostic string
*/
-const char *VSM_Name(const struct VSM_data *vd);
+const char *VSM_Name(const struct vsm *vd);
/*
* Return the instance name (-i argument to varnishd)
*/
-int VSM_Open(struct VSM_data *vd);
+int VSM_Open(struct vsm *vd);
/*
* Attempt to open and map the VSM file.
*
@@ -112,7 +112,7 @@ int VSM_Open(struct VSM_data *vd);
* <0 on failure, VSM_Error() returns diagnostic string
*/
-int VSM_IsOpen(const struct VSM_data *vd);
+int VSM_IsOpen(const struct vsm *vd);
/*
* Check if the VSM is open.
*
@@ -121,7 +121,7 @@ int VSM_IsOpen(const struct VSM_data *vd);
* 0: Is closed
*/
-int VSM_Abandoned(struct VSM_data *vd);
+int VSM_Abandoned(struct vsm *vd);
/*
* Find out if the VSM file has been abandoned or closed and should
* be reopened. This function calls stat(2) and should only be
@@ -133,7 +133,7 @@ int VSM_Abandoned(struct VSM_data *vd);
* 1 VSM abandoned.
*/
-void VSM_Close(struct VSM_data *vd);
+void VSM_Close(struct vsm *vd);
/*
* Close and unmap shared memory, if open. Any reference to
* previously returned memory areas will cause segmentation
@@ -142,15 +142,15 @@ void VSM_Close(struct VSM_data *vd);
*/
-void VSM__iter0(const struct VSM_data *vd, struct VSM_fantom *vf);
-int VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf);
+void VSM__iter0(const struct vsm *vd, struct VSM_fantom *vf);
+int VSM__itern(const struct vsm *vd, struct VSM_fantom *vf);
#define VSM_FOREACH(vf, vd) \
for (VSM__iter0((vd), (vf)); VSM__itern((vd), (vf));)
/*
* Iterate over all chunks in shared memory
* vf = "struct VSM_fantom *"
- * vd = "struct VSM_data *"
+ * vd = "struct vsm *"
*/
struct vsm_valid {
@@ -161,7 +161,7 @@ extern const struct vsm_valid VSM_invalid[];
extern const struct vsm_valid VSM_valid[];
extern const struct vsm_valid VSM_similar[];
-const struct vsm_valid *VSM_StillValid(const struct VSM_data *vd,
+const struct vsm_valid *VSM_StillValid(const struct vsm *vd,
struct VSM_fantom *vf);
/*
* Check the validity of a previously looked up VSM_fantom.
@@ -193,7 +193,7 @@ const struct vsm_valid *VSM_StillValid(const struct VSM_data *vd,
* VSM_similar: a fantom with same dimensions exist in same position.
*/
-int VSM_Get(const struct VSM_data *vd, struct VSM_fantom *vf,
+int VSM_Get(const struct vsm *vd, struct VSM_fantom *vf,
const char *class, const char *type, const char *ident);
/*
* Find a chunk, produce fantom for it.
diff --git a/include/vut.h b/include/vut.h
index fb9b873..981524e 100644
--- a/include/vut.h
+++ b/include/vut.h
@@ -49,7 +49,7 @@ struct VUT {
/* State */
struct VSL_data *vsl;
- struct VSM_data *vsm;
+ struct vsm *vsm;
struct VSLQ *vslq;
struct vpf_fh *pfh;
int sighup;
diff --git a/lib/libvarnishapi/vsc.c b/lib/libvarnishapi/vsc.c
index 339b588..3e6bf0b 100644
--- a/lib/libvarnishapi/vsc.c
+++ b/lib/libvarnishapi/vsc.c
@@ -109,7 +109,7 @@ static const size_t nlevels =
/*--------------------------------------------------------------------*/
static struct vsc *
-vsc_setup(struct VSM_data *vd)
+vsc_setup(struct vsm *vd)
{
struct vsc *vsc;
@@ -184,7 +184,7 @@ VSC_Delete(struct vsc *vsc)
/*--------------------------------------------------------------------*/
static int
-vsc_f_arg(struct VSM_data *vd, const char *opt)
+vsc_f_arg(struct vsm *vd, const char *opt)
{
struct vsc *vsc = vsc_setup(vd);
struct vsc_sf *sf;
@@ -215,7 +215,7 @@ vsc_f_arg(struct VSM_data *vd, const char *opt)
/*--------------------------------------------------------------------*/
int
-VSC_Arg(struct VSM_data *vd, int arg, const char *opt)
+VSC_Arg(struct vsm *vd, int arg, const char *opt)
{
switch (arg) {
@@ -230,7 +230,7 @@ VSC_Arg(struct VSM_data *vd, int arg, const char *opt)
*/
void *
-VSC_Get(const struct VSM_data *vd, struct VSM_fantom *fantom, const char *type,
+VSC_Get(const struct vsm *vd, struct VSM_fantom *fantom, const char *type,
const char *ident)
{
struct VSM_fantom f2 = VSM_FANTOM_NULL;
@@ -297,7 +297,7 @@ vsc_add_pt(struct vsc *vsc, const volatile void *ptr,
*/
static void
-vsc_build_vf_list(struct VSM_data *vd)
+vsc_build_vf_list(struct vsm *vd)
{
uint64_t u;
struct vsc *vsc = vsc_setup(vd);
@@ -335,7 +335,7 @@ vsc_build_vf_list(struct VSM_data *vd)
}
static void
-vsc_build_pt_list(struct VSM_data *vd)
+vsc_build_pt_list(struct vsm *vd)
{
struct vsc *vsc = vsc_setup(vd);
struct vsc_vf *vf;
@@ -419,7 +419,7 @@ vsc_filter_match_pt(struct vsb *vsb, const struct vsc_sf *sf, const
}
static void
-vsc_filter_pt_list(struct VSM_data *vd)
+vsc_filter_pt_list(struct vsm *vd)
{
struct vsc *vsc = vsc_setup(vd);
struct vsc_pt_head tmplist;
@@ -475,7 +475,7 @@ vsc_filter_pt_list(struct VSM_data *vd)
*/
int
-VSC_Iter(struct VSM_data *vd, struct VSM_fantom *fantom, VSC_iter_f *func,
+VSC_Iter(struct vsm *vd, struct VSM_fantom *fantom, VSC_iter_f *func,
void *priv)
{
struct vsc *vsc = vsc_setup(vd);
diff --git a/lib/libvarnishapi/vsc_priv.h b/lib/libvarnishapi/vsc_priv.h
index 363f6cc..48e24c6 100644
--- a/lib/libvarnishapi/vsc_priv.h
+++ b/lib/libvarnishapi/vsc_priv.h
@@ -29,8 +29,8 @@
*/
struct vsc;
-struct VSM_data;
+struct vsm;
-void VSM_SetVSC(struct VSM_data *, struct vsc *);
-struct vsc *VSM_GetVSC(const struct VSM_data *);
+void VSM_SetVSC(struct vsm *, struct vsc *);
+struct vsc *VSM_GetVSC(const struct vsm *);
void VSC_Delete(struct vsc *);
diff --git a/lib/libvarnishapi/vsl_cursor.c b/lib/libvarnishapi/vsl_cursor.c
index 1c9b2ba..eb223a2 100644
--- a/lib/libvarnishapi/vsl_cursor.c
+++ b/lib/libvarnishapi/vsl_cursor.c
@@ -63,7 +63,7 @@ struct vslc_vsm {
unsigned options;
- struct VSM_data *vsm;
+ struct vsm *vsm;
struct VSM_fantom vf;
const struct VSL_head *head;
@@ -238,7 +238,7 @@ static const struct vslc_tbl vslc_vsm_tbl = {
};
struct VSL_cursor *
-VSL_CursorVSM(struct VSL_data *vsl, struct VSM_data *vsm, unsigned options)
+VSL_CursorVSM(struct VSL_data *vsl, struct vsm *vsm, unsigned options)
{
struct vslc_vsm *c;
struct VSM_fantom vf;
diff --git a/lib/libvarnishapi/vsm.c b/lib/libvarnishapi/vsm.c
index b7b96b2..4740b5e 100644
--- a/lib/libvarnishapi/vsm.c
+++ b/lib/libvarnishapi/vsm.c
@@ -66,7 +66,7 @@ const struct vsm_valid VSM_similar[1] = {{"similar"}};
struct vsc;
-struct VSM_data {
+struct vsm {
unsigned magic;
#define VSM_MAGIC 0x6e3bd69b
@@ -90,10 +90,10 @@ struct VSM_data {
/*--------------------------------------------------------------------*/
-struct VSM_data *
+struct vsm *
VSM_New(void)
{
- struct VSM_data *vd;
+ struct vsm *vd;
ALLOC_OBJ(vd, VSM_MAGIC);
if (vd == NULL)
@@ -108,7 +108,7 @@ VSM_New(void)
/*--------------------------------------------------------------------*/
void
-VSM_SetVSC(struct VSM_data *vd, struct vsc *vsc)
+VSM_SetVSC(struct vsm *vd, struct vsc *vsc)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -116,7 +116,7 @@ VSM_SetVSC(struct VSM_data *vd, struct vsc *vsc)
}
struct vsc *
-VSM_GetVSC(const struct VSM_data *vd)
+VSM_GetVSC(const struct vsm *vd)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -126,7 +126,7 @@ VSM_GetVSC(const struct VSM_data *vd)
/*--------------------------------------------------------------------*/
static int
-vsm_diag(struct VSM_data *vd, const char *fmt, ...)
+vsm_diag(struct vsm *vd, const char *fmt, ...)
{
va_list ap;
@@ -146,7 +146,7 @@ vsm_diag(struct VSM_data *vd, const char *fmt, ...)
/*--------------------------------------------------------------------*/
const char *
-VSM_Error(const struct VSM_data *vd)
+VSM_Error(const struct vsm *vd)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -160,7 +160,7 @@ VSM_Error(const struct VSM_data *vd)
/*--------------------------------------------------------------------*/
void
-VSM_ResetError(struct VSM_data *vd)
+VSM_ResetError(struct vsm *vd)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -173,7 +173,7 @@ VSM_ResetError(struct VSM_data *vd)
/*--------------------------------------------------------------------*/
int
-VSM_n_Arg(struct VSM_data *vd, const char *arg)
+VSM_n_Arg(struct vsm *vd, const char *arg)
{
char *dname = NULL;
struct vsb *vsb;
@@ -203,7 +203,7 @@ VSM_n_Arg(struct VSM_data *vd, const char *arg)
/*--------------------------------------------------------------------*/
const char *
-VSM_Name(const struct VSM_data *vd)
+VSM_Name(const struct vsm *vd)
{
struct VSM_fantom vt;
@@ -216,7 +216,7 @@ VSM_Name(const struct VSM_data *vd)
/*--------------------------------------------------------------------*/
void
-VSM_Delete(struct VSM_data *vd)
+VSM_Delete(struct vsm *vd)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -241,7 +241,7 @@ VSM_Delete(struct VSM_data *vd)
/*--------------------------------------------------------------------*/
int
-VSM_Open(struct VSM_data *vd)
+VSM_Open(struct vsm *vd)
{
int i;
struct VSM_head slh;
@@ -310,7 +310,7 @@ VSM_Open(struct VSM_data *vd)
/*--------------------------------------------------------------------*/
int
-VSM_IsOpen(const struct VSM_data *vd)
+VSM_IsOpen(const struct vsm *vd)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -320,7 +320,7 @@ VSM_IsOpen(const struct VSM_data *vd)
/*--------------------------------------------------------------------*/
void
-VSM_Close(struct VSM_data *vd)
+VSM_Close(struct vsm *vd)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -339,7 +339,7 @@ VSM_Close(struct VSM_data *vd)
/*--------------------------------------------------------------------*/
int
-VSM_Abandoned(struct VSM_data *vd)
+VSM_Abandoned(struct vsm *vd)
{
struct stat st;
double now;
@@ -376,7 +376,7 @@ VSM_Abandoned(struct VSM_data *vd)
/*--------------------------------------------------------------------*/
void
-VSM__iter0(const struct VSM_data *vd, struct VSM_fantom *vf)
+VSM__iter0(const struct vsm *vd, struct VSM_fantom *vf)
{
CHECK_OBJ_NOTNULL(vd, VSM_MAGIC);
@@ -386,7 +386,7 @@ VSM__iter0(const struct VSM_data *vd, struct VSM_fantom *vf)
}
int
-VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf)
+VSM__itern(const struct vsm *vd, struct VSM_fantom *vf)
{
struct VSM_chunk *c = NULL;
@@ -438,7 +438,7 @@ VSM__itern(const struct VSM_data *vd, struct VSM_fantom *vf)
/*--------------------------------------------------------------------*/
const struct vsm_valid *
-VSM_StillValid(const struct VSM_data *vd, struct VSM_fantom *vf)
+VSM_StillValid(const struct vsm *vd, struct VSM_fantom *vf)
{
struct VSM_fantom f2;
@@ -468,7 +468,7 @@ VSM_StillValid(const struct VSM_data *vd, struct VSM_fantom *vf)
}
int
-VSM_Get(const struct VSM_data *vd, struct VSM_fantom *vf,
+VSM_Get(const struct vsm *vd, struct VSM_fantom *vf,
const char *class, const char *type, const char *ident)
{
More information about the varnish-commit
mailing list