Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
varnishevent
Commits
611ef797
Commit
611ef797
authored
Apr 14, 2015
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add vtim from libvarnish and use it
parent
76e45857
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
344 additions
and
10 deletions
+344
-10
Makefile.am
src/Makefile.am
+4
-1
config.c
src/config.c
+2
-2
varnishevent.c
src/varnishevent.c
+4
-7
vtim.c
src/vtim.c
+295
-0
vtim.h
src/vtim.h
+39
-0
No files found.
src/Makefile.am
View file @
611ef797
...
...
@@ -16,6 +16,7 @@ varnishevent_SOURCES = \
base64.h
\
data.c
\
spscq.c
\
writer.h
\
writer.c
\
config.c
\
log.c
\
...
...
@@ -23,7 +24,9 @@ varnishevent_SOURCES = \
strfTIM.h
\
strfTIM.c
\
format.c
\
handler.c
handler.c
\
vtim.h
\
vtim.c
varnishevent_LDADD
=
\
${
PTHREAD_LIBS
}
${
RT_LIBS
}
${
LIBM
}
@VARNISH_LIBS@
\
...
...
src/config.c
View file @
611ef797
...
...
@@ -42,6 +42,7 @@
#include <pwd.h>
#include "varnishevent.h"
#include "vtim.h"
#include "vas.h"
...
...
@@ -161,8 +162,7 @@ CONF_Add(const char *lval, const char *rval)
return
errno
;
if
(
p
[
0
]
!=
'\0'
||
to
<
0
||
isnan
(
to
)
||
!
finite
(
to
))
return
EINVAL
;
config
.
output_timeout
.
tv_sec
=
trunc
(
to
);
config
.
output_timeout
.
tv_usec
=
(
int
)(
1e6
*
(
to
-
trunc
(
to
)));
config
.
output_timeout
=
VTIM_timeval
(
to
);
return
(
0
);
}
...
...
src/varnishevent.c
View file @
611ef797
...
...
@@ -72,6 +72,7 @@
#include "vcs.h"
#include "varnishevent.h"
#include "vtim.h"
#define DEFAULT_CONFIG "/etc/varnishevent.conf"
...
...
@@ -247,10 +248,8 @@ event(struct VSL_data *vsl, struct VSL_transaction * const pt[], void *priv)
assert
(
VSTAILQ_EMPTY
(
&
tx
->
lines
));
tx
->
type
=
t
->
type
;
tx
->
vxid
=
t
->
vxid
;
if
(
tx
->
type
==
VSL_t_raw
)
{
/* XXX: set tx->t */
;
}
if
(
tx
->
type
==
VSL_t_raw
)
tx
->
t
=
VTIM_real
();
if
(
logconf
.
level
==
LOG_DEBUG
)
LOG_Log
(
LOG_DEBUG
,
"Tx: [%u %c]"
,
tx
->
vxid
,
tx_type_name
[
tx
->
type
]);
...
...
@@ -658,9 +657,7 @@ main(int argc, char *argv[])
LOG_Log0
(
LOG_ALERT
,
"Writer thread not running, giving up"
);
exit
(
EXIT_FAILURE
);
}
#if 0
TIM_sleep(1);
#endif
VTIM_sleep
(
1
);
}
for
(
int
i
=
0
;
i
<
VSL_t__MAX
;
i
++
)
...
...
src/vtim.c
0 → 100644
View file @
611ef797
/*-
* Copyright (c) 2006 Verdens Gang AS
* Copyright (c) 2006-2011 Varnish Software AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk@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.
*
* Semi-trivial functions to handle HTTP header timestamps according to
* RFC 2616 section 3.3.
*
* In the highly unlikely event of performance trouble, handbuilt versions
* would likely be faster than relying on the OS time functions.
*
* We must parse three different formats:
* 000000000011111111112222222222
* 012345678901234567890123456789
* ------------------------------
* "Sun, 06 Nov 1994 08:49:37 GMT" RFC822 & RFC1123
* "Sunday, 06-Nov-94 08:49:37 GMT" RFC850
* "Sun Nov 6 08:49:37 1994" ANSI-C asctime()
*
* And always output the RFC1123 format.
*
*/
#include "config.h"
#include <sys/time.h>
#include <errno.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include "vas.h"
#include "vtim.h"
/*
* Note on Solaris: for some reason, clock_gettime(CLOCK_MONOTONIC, &ts) is not
* implemented in assembly, but falls into a syscall, while gethrtime() doesn't,
* so we save a syscall by using gethrtime() if it is defined.
*/
double
VTIM_mono
(
void
)
{
#ifdef HAVE_GETHRTIME
return
(
gethrtime
()
*
1e-9
);
#elif HAVE_CLOCK_GETTIME
struct
timespec
ts
;
AZ
(
clock_gettime
(
CLOCK_MONOTONIC
,
&
ts
));
return
(
ts
.
tv_sec
+
1e-9
*
ts
.
tv_nsec
);
#else
struct
timeval
tv
;
AZ
(
gettimeofday
(
&
tv
,
NULL
));
return
(
tv
.
tv_sec
+
1e-6
*
tv
.
tv_usec
);
#endif
}
double
VTIM_real
(
void
)
{
#ifdef HAVE_CLOCK_GETTIME
struct
timespec
ts
;
AZ
(
clock_gettime
(
CLOCK_REALTIME
,
&
ts
));
return
(
ts
.
tv_sec
+
1e-9
*
ts
.
tv_nsec
);
#else
struct
timeval
tv
;
AZ
(
gettimeofday
(
&
tv
,
NULL
));
return
(
tv
.
tv_sec
+
1e-6
*
tv
.
tv_usec
);
#endif
}
void
VTIM_format
(
double
t
,
char
*
p
)
{
struct
tm
tm
;
time_t
tt
;
tt
=
(
time_t
)
t
;
(
void
)
gmtime_r
(
&
tt
,
&
tm
);
AN
(
strftime
(
p
,
VTIM_FORMAT_SIZE
,
"%a, %d %b %Y %T GMT"
,
&
tm
));
}
/* XXX: add statistics ? */
static
const
char
*
fmts
[]
=
{
"%a, %d %b %Y %T GMT"
,
/* RFC 822 & RFC 1123 */
"%A, %d-%b-%y %T GMT"
,
/* RFC 850 */
"%a %b %d %T %Y"
,
/* ANSI-C asctime() */
"%F %T"
,
/* ISO 8601 (incorrect, only in 4.0) */
"%FT%T"
,
/* ISO 8601 */
NULL
};
double
VTIM_parse
(
const
char
*
p
)
{
double
t
;
struct
tm
tm
;
const
char
**
r
;
for
(
r
=
fmts
;
*
r
!=
NULL
;
r
++
)
{
memset
(
&
tm
,
0
,
sizeof
tm
);
if
(
strptime
(
p
,
*
r
,
&
tm
)
!=
NULL
)
{
/*
* Make sure this is initialized on the off-chance
* that some raving loonie would apply DST to UTC.
*/
tm
.
tm_isdst
=
-
1
;
#if defined(HAVE_TIMEGM)
t
=
timegm
(
&
tm
);
#else
/*
* Ahh, another POSIX_STUPIDITY, how unexpected.
* Instead of, as would have been logical, to have
* tm_timezone element, mktime() is standardized as
* always working in localtime. This brilliant idea
* came from the same people who said "leap-seconds ?
* Naah, screw it!".
*
* On broken systems without a working timegm(),
* it is the responsibility of the calling program
* to set the timezone to UTC. We check that.
*/
t
=
mktime
(
&
tm
);
AZ
(
strcmp
(
tzname
[
0
],
"UTC"
));
#endif
return
(
t
);
}
}
return
(
0
);
}
void
VTIM_sleep
(
double
t
)
{
#ifdef HAVE_NANOSLEEP
struct
timespec
ts
;
ts
=
VTIM_timespec
(
t
);
(
void
)
nanosleep
(
&
ts
,
NULL
);
#else
if
(
t
>=
1
.)
{
(
void
)
sleep
(
floor
(
t
));
t
-=
floor
(
t
);
}
/* XXX: usleep() is not mandated to be thread safe */
t
*=
1e6
;
if
(
t
>
0
)
(
void
)
usleep
(
floor
(
t
));
#endif
}
struct
timeval
VTIM_timeval
(
double
t
)
{
struct
timeval
tv
;
tv
.
tv_sec
=
(
time_t
)
trunc
(
t
);
tv
.
tv_usec
=
(
int
)(
1e6
*
(
t
-
tv
.
tv_sec
));
return
(
tv
);
}
struct
timespec
VTIM_timespec
(
double
t
)
{
struct
timespec
tv
;
tv
.
tv_sec
=
(
time_t
)
trunc
(
t
);
tv
.
tv_nsec
=
(
int
)(
1e9
*
(
t
-
tv
.
tv_sec
));
return
(
tv
);
}
#ifdef TEST_DRIVER
/*
* Compile with:
* cc -o foo -DTEST_DRIVER -I../.. -I../../include time.c assert.c
* (Solaris)
* cc -o foo -DTEST_DRIVER -I../.. -I../../include -lm time.c assert.c
* Test with:
* env TZ=UTC ./foo
* env TZ=CET ./foo
*/
static
void
tst
(
const
char
*
s
,
time_t
good
)
{
time_t
t
;
char
buf
[
BUFSIZ
];
t
=
VTIM_parse
(
s
);
VTIM_format
(
t
,
buf
);
printf
(
"%-30s -> %12jd -> %s
\n
"
,
s
,
(
intmax_t
)
t
,
buf
);
if
(
t
!=
good
)
{
printf
(
"Parse error! Got: %jd should have %jd diff %jd
\n
"
,
(
intmax_t
)
t
,
(
intmax_t
)
good
,
(
intmax_t
)(
t
-
good
));
exit
(
4
);
}
}
static
int
tst_delta_check
(
const
char
*
name
,
double
begin
,
double
end
,
double
ref
)
{
const
double
tol_max
=
1
.
1
;
const
double
tol_min
=
1
;
printf
(
"%s delta for %fs sleep: %f
\n
"
,
name
,
ref
,
(
end
-
begin
));
if
((
end
-
begin
)
>
tol_max
*
ref
)
{
printf
(
"%s delta above tolerance: ((%f - %f) = %f) > %f
\n
"
,
name
,
end
,
begin
,
(
end
-
begin
),
tol_max
);
return
(
1
);
}
else
if
((
end
-
begin
)
<
tol_min
*
ref
)
{
printf
(
"%s delta below tolerance: ((%f - %f) = %f) < %f
\n
"
,
name
,
end
,
begin
,
(
end
-
begin
),
tol_min
);
return
(
1
);
}
return
(
0
);
}
static
void
tst_delta
()
{
double
m_begin
,
m_end
;
double
r_begin
,
r_end
;
const
double
ref
=
1
;
int
err
=
0
;
r_begin
=
VTIM_real
();
m_begin
=
VTIM_mono
();
VTIM_sleep
(
ref
);
r_end
=
VTIM_real
();
m_end
=
VTIM_mono
();
err
+=
tst_delta_check
(
"VTIM_mono"
,
m_begin
,
m_end
,
ref
);
err
+=
tst_delta_check
(
"VTIM_real"
,
r_begin
,
r_end
,
ref
);
if
(
err
)
{
printf
(
"%d time delta test errrors
\n
"
,
err
);
exit
(
4
);
}
}
int
main
(
int
argc
,
char
**
argv
)
{
time_t
t
;
char
buf
[
BUFSIZ
];
time
(
&
t
);
memset
(
buf
,
0x55
,
sizeof
buf
);
VTIM_format
(
t
,
buf
);
printf
(
"scan = %d <%s>
\n
"
,
VTIM_parse
(
buf
),
buf
);
/* Examples from RFC2616 section 3.3.1 */
tst
(
"Sun, 06 Nov 1994 08:49:37 GMT"
,
784111777
);
tst
(
"Sunday, 06-Nov-94 08:49:37 GMT"
,
784111777
);
tst
(
"Sun Nov 6 08:49:37 1994"
,
784111777
);
tst_delta
();
return
(
0
);
}
#endif
src/vtim.h
0 → 100644
View file @
611ef797
/*-
* Copyright (c) 2006 Verdens Gang AS
* Copyright (c) 2006-2011 Varnish Software AS
* All rights reserved.
*
* Author: Poul-Henning Kamp <phk@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.
*
*/
/* from libvarnish/vtim.c */
#define VTIM_FORMAT_SIZE 30
void
VTIM_format
(
double
t
,
char
*
p
);
double
VTIM_parse
(
const
char
*
p
);
double
VTIM_mono
(
void
);
double
VTIM_real
(
void
);
void
VTIM_sleep
(
double
t
);
struct
timespec
VTIM_timespec
(
double
t
);
struct
timeval
VTIM_timeval
(
double
t
);
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