Skip to content

V
varnish-cache
Commit cd0e1daf authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Report sys/usr time for varnishd processes

parent 15d6c830
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
bin/varnishtest/vtc_varnish.c
View file @ cd0e1daf
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/resource.h>
#include <fcntl.h> #include <fcntl.h>
#include <inttypes.h> #include <inttypes.h>
...@@ -571,6 +572,7 @@ varnish_wait(struct varnish *v) ...@@ -571,6 +572,7 @@ varnish_wait(struct varnish *v)
{ {
void *p; void *p;
int status, r; int status, r;
struct rusage ru;
if (v->cli_fd < 0) if (v->cli_fd < 0)
return; return;
...@@ -585,9 +587,12 @@ varnish_wait(struct varnish *v) ...@@ -585,9 +587,12 @@ varnish_wait(struct varnish *v)
AZ(pthread_join(v->tp, &p)); AZ(pthread_join(v->tp, &p));
AZ(close(v->fds[0])); AZ(close(v->fds[0]));
r = wait4(v->pid, &status, 0, NULL); r = wait4(v->pid, &status, 0, &ru);
v->pid = 0; v->pid = 0;
vtc_log(v->vl, 2, "R %d Status: %04x", r, status); vtc_log(v->vl, 2, "R %d Status: %04x (u %.6f s %.6f)", r, status,
ru.ru_utime.tv_sec + 1e-6 * ru.ru_utime.tv_usec,
ru.ru_stime.tv_sec + 1e-6 * ru.ru_stime.tv_usec
);
AZ(pthread_join(v->tp_vsl, &p)); AZ(pthread_join(v->tp_vsl, &p));
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment