On Mon, 13 Aug 2012 12:31:08 +0300 Lauri Kasanen <[email protected]> wrote:
> On Sun, 12 Aug 2012 18:18:31 +0200 > Sonny Karlsson <[email protected]> wrote: > > > Current master causes build warnings when configured with --trace. It > > may be possible to solve this by changing the order of include > > statements or adding an extern declaration somewhere, but I have not > > found a way to do so yet. > > I'll take a look at building with trace today. But not inlining this function > is bad, as it's called extremely often (~9 times per request in my test - for > 200k requests I had 1.8M calls to this). > > So NAK this patch from me. Here's a patch for building with --trace enabled. Please test whether it works for you. - Lauri
>From 48d93ff9cbaed8b0f5630dab2705c696303d7029 Mon Sep 17 00:00:00 2001 From: Lauri Kasanen <[email protected]> Date: Mon, 13 Aug 2012 12:50:57 +0300 Subject: [PATCH] iov, utils: Fix build with trace Signed-off-by: Lauri Kasanen <[email protected]> --- src/include/mk_utils.h | 2 -- src/mk_iov.c | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/include/mk_utils.h b/src/include/mk_utils.h index 3f38b71..ae323c0 100644 --- a/src/include/mk_utils.h +++ b/src/include/mk_utils.h @@ -54,8 +54,6 @@ struct mk_gmt_cache { #define MK_TRACE(...) mk_utils_trace(MK_TRACE_COMP_CORE, MK_TRACE_CORE, \ __FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) -#include "mk_plugin.h" - char *env_trace_filter; pthread_mutex_t mutex_trace; diff --git a/src/mk_iov.c b/src/mk_iov.c index 8b8f5cc..1c5e782 100644 --- a/src/mk_iov.c +++ b/src/mk_iov.c @@ -26,6 +26,7 @@ #include <sys/mman.h> #include <errno.h> #include <stdio.h> +#include <string.h> #include "monkey.h" -- 1.7.2.1
_______________________________________________ Monkey mailing list [email protected] http://lists.monkey-project.com/listinfo/monkey
