Mailing List Archive

Author: des
Date: 2006-10-09 11:58:58 +0200 (Mon, 09 Oct 2006)
New Revision: 1145

Added:
trunk/varnish-cache/include/compat/clock_gettime.h
trunk/varnish-cache/lib/libcompat/clock_gettime.c
Modified:
trunk/varnish-cache/bin/varnishd/cache_acceptor.c
trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c
trunk/varnish-cache/bin/varnishd/cache_ban.c
trunk/varnish-cache/bin/varnishd/cache_center.c
trunk/varnish-cache/bin/varnishd/cache_pass.c
trunk/varnish-cache/bin/varnishd/cache_pipe.c
trunk/varnish-cache/bin/varnishd/cache_response.c
trunk/varnish-cache/bin/varnishd/cache_vrt.c
trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c
trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
trunk/varnish-cache/bin/varnishd/hash_simple_list.c
trunk/varnish-cache/bin/varnishd/mgt_event.c
trunk/varnish-cache/bin/varnishd/rfc2616.c
trunk/varnish-cache/bin/varnishd/storage_malloc.c
trunk/varnish-cache/bin/varnishstat/varnishstat.c
trunk/varnish-cache/configure.ac
trunk/varnish-cache/include/Makefile.am
trunk/varnish-cache/lib/libcompat/Makefile.am
Log:
Fix build on MacOS X: add a fake clock_gettime() and fix some includes.

WARNING: varnish will build and run, but the lack of a monotonic clock
may lead to strange behaviour if the clock is stepped (rather than skewed)
while varnish is running.

Thanks to Niklas Saers for providing a test environment.

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -43,6 +43,10 @@
#include <sys/types.h>
#include <sys/socket.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#ifndef HAVE_SRANDOMDEV
#include "compat/srandomdev.h"
#endif

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_epoll.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -41,6 +41,10 @@

#include <sys/epoll.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "heritage.h"
#include "shmlog.h"
#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -43,6 +43,10 @@

#include <sys/event.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "heritage.h"
#include "shmlog.h"
#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor_poll.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -42,6 +42,10 @@
#include <unistd.h>
#include <poll.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "heritage.h"
#include "shmlog.h"
#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -31,6 +31,8 @@
* Ban processing
*/

+#include <sys/types.h>
+
#include <stdlib.h>
#include <string.h>
#include <regex.h>

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -60,6 +60,10 @@
#include <string.h>
#include <unistd.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "shmlog.h"
#include "vcl.h"
#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_pass.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pass.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_pass.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -41,6 +41,10 @@
#include <sys/socket.h>
#include <netdb.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "shmlog.h"
#include "cache.h"


Modified: trunk/varnish-cache/bin/varnishd/cache_pipe.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pipe.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_pipe.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -38,6 +38,10 @@
#include <stdlib.h>
#include <sys/socket.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "shmlog.h"
#include "heritage.h"
#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -34,6 +34,10 @@
#include <sys/types.h>
#include <sys/time.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "shmlog.h"
#include "heritage.h"
#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -31,6 +31,7 @@
* Runtime support for compiled VCL programs
*/

+#include <sys/types.h>

#include <stdio.h>
#include <string.h>

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -34,6 +34,8 @@
* XXX: a refresh facility.
*/

+#include <sys/types.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_re.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_re.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -31,6 +31,8 @@
* Runtime support for compiled VCL programs, regexps
*/

+#include <sys/types.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>

Modified: trunk/varnish-cache/bin/varnishd/hash_simple_list.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_simple_list.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/hash_simple_list.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -31,6 +31,8 @@
* This is the reference hash(/lookup) implementation
*/

+#include <sys/types.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

Modified: trunk/varnish-cache/bin/varnishd/mgt_event.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_event.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/mgt_event.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -37,6 +37,10 @@
#include <string.h>
#include <stdlib.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "mgt.h"
#include "mgt_event.h"
#include "miniobj.h"

Modified: trunk/varnish-cache/bin/varnishd/rfc2616.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/rfc2616.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/rfc2616.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -29,6 +29,8 @@
* $Id$
*/

+#include <sys/types.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>

Modified: trunk/varnish-cache/bin/varnishd/storage_malloc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_malloc.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishd/storage_malloc.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -31,6 +31,8 @@
* Storage method based on malloc(3)
*/

+#include <sys/types.h>
+
#include <stdlib.h>

#include "cache.h"

Modified: trunk/varnish-cache/bin/varnishstat/varnishstat.c
===================================================================
--- trunk/varnish-cache/bin/varnishstat/varnishstat.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/bin/varnishstat/varnishstat.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -39,6 +39,10 @@
#include <curses.h>
#include <time.h>

+#ifndef HAVE_CLOCK_GETTIME
+#include "compat/clock_gettime.h"
+#endif
+
#include "libvarnish.h"
#include "shmlog.h"
#include "varnishapi.h"

Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/configure.ac 2006-10-09 09:58:58 UTC (rev 1145)
@@ -78,6 +78,7 @@
AC_CHECK_FUNCS([strlcat strlcpy])
AC_CHECK_FUNCS([strndup])
AC_CHECK_FUNCS([vis strvis strvisx])
+AC_CHECK_FUNCS([clock_gettime])

# Check which mechanism to use for the acceptor
AC_CHECK_FUNCS([kqueue])

Modified: trunk/varnish-cache/include/Makefile.am
===================================================================
--- trunk/varnish-cache/include/Makefile.am 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/include/Makefile.am 2006-10-09 09:58:58 UTC (rev 1145)
@@ -6,6 +6,7 @@
cli_common.h \
cli_priv.h \
compat/asprintf.h \
+ compat/clock_gettime.h \
compat/setproctitle.h \
compat/srandomdev.h \
compat/strlcat.h \

Added: trunk/varnish-cache/include/compat/clock_gettime.h
===================================================================
--- trunk/varnish-cache/include/compat/clock_gettime.h 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/include/compat/clock_gettime.h 2006-10-09 09:58:58 UTC (rev 1145)
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Dag-Erling Sm?rgrav <des at linpro.no>
+ *
+ * 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 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.
+ *
+ * $Id$
+ */
+
+#ifndef COMPAT_CLOCK_GETTIME_H_INCLUDED
+#define COMPAT_CLOCK_GETTIME_H_INCLUDED
+
+#ifndef HAVE_CLOCK_GETTIME
+typedef enum {
+ CLOCK_REALTIME,
+ CLOCK_MONOTONIC,
+} clockid_t;
+
+int clock_gettime(clockid_t clk_id, struct timespec *tp);
+#endif
+
+#endif


Property changes on: trunk/varnish-cache/include/compat/clock_gettime.h
___________________________________________________________________
Name: svn:keywords
+ Id

Modified: trunk/varnish-cache/lib/libcompat/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libcompat/Makefile.am 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/lib/libcompat/Makefile.am 2006-10-09 09:58:58 UTC (rev 1145)
@@ -6,6 +6,7 @@

libcompat_a_SOURCES = \
asprintf.c \
+ clock_gettime.c \
vasprintf.c \
setproctitle.c \
srandomdev.c \

Added: trunk/varnish-cache/lib/libcompat/clock_gettime.c
===================================================================
--- trunk/varnish-cache/lib/libcompat/clock_gettime.c 2006-10-06 16:26:22 UTC (rev 1144)
+++ trunk/varnish-cache/lib/libcompat/clock_gettime.c 2006-10-09 09:58:58 UTC (rev 1145)
@@ -0,0 +1,60 @@
+/*-
+ * Copyright (c) 2006 Verdens Gang AS
+ * Copyright (c) 2006 Linpro AS
+ * All rights reserved.
+ *
+ * Author: Dag-Erling Sm?rgrav <des at linpro.no>
+ *
+ * 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 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.
+ *
+ * $Id$
+ *
+ */
+
+#ifndef HAVE_CLOCK_GETTIME
+
+#include <sys/time.h>
+
+#include <errno.h>
+#include <time.h>
+
+#include "compat/clock_gettime.h"
+
+int
+clock_gettime(clockid_t clk_id, struct timespec *tp)
+{
+ struct timeval tv;
+
+ switch (clk_id) {
+ case CLOCK_REALTIME:
+ case CLOCK_MONOTONIC:
+ if (gettimeofday(&tv, NULL) != 0)
+ return (-1);
+ tp->tv_sec = tv.tv_sec;
+ tp->tv_nsec = tv.tv_usec * 1000;
+ return (0);
+ default:
+ errno = EINVAL;
+ return (-1);
+ }
+}
+#endif


Property changes on: trunk/varnish-cache/lib/libcompat/clock_gettime.c
___________________________________________________________________
Name: svn:keywords
+ Id