From f80f8c5f99f6b5949d14ee62261a7dd448e9b0fe Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Wed, 7 Aug 2019 11:59:39 +0200 Subject: [PATCH] s3:mdssvc: move debug macro to header file This is going to be used from other parts of the code soon. Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- source3/rpc_server/mdssvc/mdssvc.c | 20 -------------------- source3/rpc_server/mdssvc/mdssvc.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c index 41aa089bf20..85da89d4ef0 100644 --- a/source3/rpc_server/mdssvc/mdssvc.c +++ b/source3/rpc_server/mdssvc/mdssvc.c @@ -33,26 +33,6 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV -#define SLQ_DEBUG(lvl, _slq, state) do { if (CHECK_DEBUGLVL(lvl)) { \ - const struct sl_query *__slq = _slq; \ - struct timeval_buf start_buf; \ - const char *start; \ - struct timeval_buf last_used_buf; \ - const char *last_used; \ - struct timeval_buf expire_buf; \ - const char *expire; \ - start = timeval_str_buf(&__slq->start_time, false, \ - true, &start_buf); \ - last_used = timeval_str_buf(&__slq->last_used, false, \ - true, &last_used_buf); \ - expire = timeval_str_buf(&__slq->expire_time, false, \ - true, &expire_buf); \ - DEBUG(lvl,("%s slq[0x%jx,0x%jx], start: %s, last_used: %s, " \ - "expires: %s, query: '%s'\n", state, \ - (uintmax_t)__slq->ctx1, (uintmax_t)__slq->ctx2, \ - start, last_used, expire, __slq->query_string)); \ -}} while(0) - struct slrpc_cmd { const char *name; bool (*function)(struct mds_ctx *mds_ctx, diff --git a/source3/rpc_server/mdssvc/mdssvc.h b/source3/rpc_server/mdssvc/mdssvc.h index baf0e92f8f2..2260a38e6d2 100644 --- a/source3/rpc_server/mdssvc/mdssvc.h +++ b/source3/rpc_server/mdssvc/mdssvc.h @@ -45,6 +45,26 @@ #define MAX_SL_RUNTIME 30 #define MDS_TRACKER_ASYNC_TIMEOUT_MS 250 +#define SLQ_DEBUG(lvl, _slq, state) do { if (CHECK_DEBUGLVL(lvl)) { \ + const struct sl_query *__slq = _slq; \ + struct timeval_buf start_buf; \ + const char *start; \ + struct timeval_buf last_used_buf; \ + const char *last_used; \ + struct timeval_buf expire_buf; \ + const char *expire; \ + start = timeval_str_buf(&__slq->start_time, false, \ + true, &start_buf); \ + last_used = timeval_str_buf(&__slq->last_used, false, \ + true, &last_used_buf); \ + expire = timeval_str_buf(&__slq->expire_time, false, \ + true, &expire_buf); \ + DEBUG(lvl,("%s slq[0x%jx,0x%jx], start: %s, last_used: %s, " \ + "expires: %s, query: '%s'\n", state, \ + (uintmax_t)__slq->ctx1, (uintmax_t)__slq->ctx2, \ + start, last_used, expire, __slq->query_string)); \ +}} while(0) + /****************************************************************************** * Some helper stuff dealing with queries ******************************************************************************/ -- 2.47.3