[master] 6147338 Avoid having two files called "params.h"
Poul-Henning Kamp
phk at FreeBSD.org
Thu Jan 5 12:28:05 CET 2017
commit 61473385913dae03d0e3655bfae0a8eac356a019
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Jan 5 11:27:28 2017 +0000
Avoid having two files called "params.h"
diff --git a/bin/varnishd/Makefile.am b/bin/varnishd/Makefile.am
index 41fcf85..7ab414a 100644
--- a/bin/varnishd/Makefile.am
+++ b/bin/varnishd/Makefile.am
@@ -136,7 +136,7 @@ nobase_pkginclude_HEADERS = \
cache/cache_backend.h \
cache/cache_director.h \
common/common.h \
- common/params.h \
+ common/com_params.h \
waiter/waiter.h
varnishd_CFLAGS = \
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index ebf5eb2..a1564e5 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -54,7 +54,7 @@
#include <unistd.h>
#include <math.h>
-#include "common/params.h"
+#include "common/com_params.h"
/*--------------------------------------------------------------------*/
diff --git a/bin/varnishd/common/com_params.h b/bin/varnishd/common/com_params.h
new file mode 100644
index 0000000..269f188
--- /dev/null
+++ b/bin/varnishd/common/com_params.h
@@ -0,0 +1,110 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006-2011 Varnish Software AS
+ * All rights reserved.
+ *
+ * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file contains the heritage passed when mgt forks cache
+ */
+
+#ifdef COMMON_PARAMS_H
+#error "Multiple includes of common/params.h"
+#endif
+#define COMMON_PARAMS_H
+
+#include <stdint.h>
+
+#include "vre.h"
+
+#define VSM_CLASS_PARAM "Params"
+
+enum debug_bits {
+#define DEBUG_BIT(U, l, d) DBG_##U,
+#include "tbl/debug_bits.h"
+ DBG_Reserved
+};
+
+enum feature_bits {
+#define FEATURE_BIT(U, l, d, ld) FEATURE_##U,
+#include "tbl/feature_bits.h"
+ FEATURE_Reserved
+};
+
+struct poolparam {
+ unsigned min_pool;
+ unsigned max_pool;
+ double max_age;
+};
+
+struct params {
+
+#define ptyp_bool unsigned
+#define ptyp_bytes ssize_t
+#define ptyp_bytes_u unsigned
+#define ptyp_double double
+#define ptyp_poolparam struct poolparam
+#define ptyp_timeout double
+#define ptyp_uint unsigned
+#define ptyp_vsl_buffer unsigned
+#define ptyp_vsl_reclen unsigned
+#define PARAM(nm, ty, mi, ma, de, un, fl, st, lt, fn) ptyp_##ty nm;
+#include <tbl/params.h>
+#undef ptyp_bool
+#undef ptyp_bytes
+#undef ptyp_bytes_u
+#undef ptyp_double
+#undef ptyp_poolparam
+#undef ptyp_timeout
+#undef ptyp_uint
+#undef ptyp_vsl_buffer
+#undef ptyp_vsl_reclen
+
+ /* Unprivileged user / group */
+ uid_t uid;
+ gid_t gid;
+
+ /* Worker threads and pool */
+ unsigned wthread_min;
+ unsigned wthread_max;
+ unsigned wthread_reserve;
+ double wthread_timeout;
+ unsigned wthread_pools;
+ double wthread_add_delay;
+ double wthread_fail_delay;
+ double wthread_destroy_delay;
+ unsigned wthread_stats_rate;
+ ssize_t wthread_stacksize;
+ unsigned wthread_queue_limit;
+
+ struct vre_limits vre_limits;
+
+ struct poolparam req_pool;
+ struct poolparam sess_pool;
+ struct poolparam vbo_pool;
+
+ uint8_t vsl_mask[256>>3];
+ uint8_t debug_bits[(DBG_Reserved+7)>>3];
+ uint8_t feature_bits[(FEATURE_Reserved+7)>>3];
+};
diff --git a/bin/varnishd/common/common_vsm.c b/bin/varnishd/common/common_vsm.c
index 860b32c..9a09e07 100644
--- a/bin/varnishd/common/common_vsm.c
+++ b/bin/varnishd/common/common_vsm.c
@@ -41,7 +41,7 @@
#include <unistd.h>
#include "common.h"
-#include "common/params.h"
+#include "common/com_params.h"
#include "vsm_priv.h"
#include "vmb.h"
diff --git a/bin/varnishd/common/params.h b/bin/varnishd/common/params.h
deleted file mode 100644
index 269f188..0000000
--- a/bin/varnishd/common/params.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * Copyright (c) 2006 Verdens Gang AS
- * Copyright (c) 2006-2011 Varnish Software AS
- * All rights reserved.
- *
- * Author: Poul-Henning Kamp <phk at phk.freebsd.dk>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file contains the heritage passed when mgt forks cache
- */
-
-#ifdef COMMON_PARAMS_H
-#error "Multiple includes of common/params.h"
-#endif
-#define COMMON_PARAMS_H
-
-#include <stdint.h>
-
-#include "vre.h"
-
-#define VSM_CLASS_PARAM "Params"
-
-enum debug_bits {
-#define DEBUG_BIT(U, l, d) DBG_##U,
-#include "tbl/debug_bits.h"
- DBG_Reserved
-};
-
-enum feature_bits {
-#define FEATURE_BIT(U, l, d, ld) FEATURE_##U,
-#include "tbl/feature_bits.h"
- FEATURE_Reserved
-};
-
-struct poolparam {
- unsigned min_pool;
- unsigned max_pool;
- double max_age;
-};
-
-struct params {
-
-#define ptyp_bool unsigned
-#define ptyp_bytes ssize_t
-#define ptyp_bytes_u unsigned
-#define ptyp_double double
-#define ptyp_poolparam struct poolparam
-#define ptyp_timeout double
-#define ptyp_uint unsigned
-#define ptyp_vsl_buffer unsigned
-#define ptyp_vsl_reclen unsigned
-#define PARAM(nm, ty, mi, ma, de, un, fl, st, lt, fn) ptyp_##ty nm;
-#include <tbl/params.h>
-#undef ptyp_bool
-#undef ptyp_bytes
-#undef ptyp_bytes_u
-#undef ptyp_double
-#undef ptyp_poolparam
-#undef ptyp_timeout
-#undef ptyp_uint
-#undef ptyp_vsl_buffer
-#undef ptyp_vsl_reclen
-
- /* Unprivileged user / group */
- uid_t uid;
- gid_t gid;
-
- /* Worker threads and pool */
- unsigned wthread_min;
- unsigned wthread_max;
- unsigned wthread_reserve;
- double wthread_timeout;
- unsigned wthread_pools;
- double wthread_add_delay;
- double wthread_fail_delay;
- double wthread_destroy_delay;
- unsigned wthread_stats_rate;
- ssize_t wthread_stacksize;
- unsigned wthread_queue_limit;
-
- struct vre_limits vre_limits;
-
- struct poolparam req_pool;
- struct poolparam sess_pool;
- struct poolparam vbo_pool;
-
- uint8_t vsl_mask[256>>3];
- uint8_t debug_bits[(DBG_Reserved+7)>>3];
- uint8_t feature_bits[(FEATURE_Reserved+7)>>3];
-};
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 30b120a..7f7f17f 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -31,7 +31,7 @@
#include <stdint.h>
#include "common/common.h"
-#include "common/params.h"
+#include "common/com_params.h"
struct cli;
struct parspec;
More information about the varnish-commit
mailing list