diff options
| author | Max Romanov <max.romanov@nginx.com> | 2020-11-18 22:33:53 +0300 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2020-11-18 22:33:53 +0300 |
| commit | 8340ca0b9c7ad4109033ccb028f87cc1b73396bc (patch) | |
| tree | 08c5c76b11c3271ce2dff14c61c3b7535cf014e8 | |
| parent | fb80502513bf0140c5e595714967f75ea3e1e5d3 (diff) | |
| download | unit-8340ca0b9c7ad4109033ccb028f87cc1b73396bc.tar.gz unit-8340ca0b9c7ad4109033ccb028f87cc1b73396bc.tar.bz2 | |
Libunit: improving logging consistency.
Debug logging depends on macros defined in nxt_auto_config.h.
| -rw-r--r-- | auto/make | 2 | ||||
| -rw-r--r-- | src/nxt_unit.c | 4 | ||||
| -rw-r--r-- | src/nxt_unit.h | 1 | ||||
| -rw-r--r-- | src/test/nxt_unit_app_test.c | 2 | ||||
| -rw-r--r-- | src/test/nxt_unit_websocket_chat.c | 8 |
5 files changed, 11 insertions, 6 deletions
@@ -379,6 +379,7 @@ libunit-install: $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC src/nxt_unit_sptr.h \ src/nxt_unit_typedefs.h \ src/nxt_unit_websocket.h \ + $NXT_BUILD_DIR/nxt_auto_config.h \ $NXT_BUILD_DIR/nxt_version.h \ src/nxt_websocket_header.h \ \$(DESTDIR)$NXT_INCDIR/ @@ -393,6 +394,7 @@ libunit-uninstall: \$(DESTDIR)$NXT_INCDIR/nxt_unit_sptr.h \ \$(DESTDIR)$NXT_INCDIR/nxt_unit_typedefs.h \ \$(DESTDIR)$NXT_INCDIR/nxt_unit_websocket.h \ + \$(DESTDIR)$NXT_INCDIR/nxt_auto_config.h \ \$(DESTDIR)$NXT_INCDIR/nxt_version.h \ \$(DESTDIR)$NXT_INCDIR/nxt_websocket_header.h @rmdir -p \$(DESTDIR)$NXT_INCDIR 2>/dev/null || true diff --git a/src/nxt_unit.c b/src/nxt_unit.c index 7230552d..564fd094 100644 --- a/src/nxt_unit.c +++ b/src/nxt_unit.c @@ -6527,7 +6527,9 @@ nxt_unit_malloc(nxt_unit_ctx_t *ctx, size_t size) p = malloc(size); if (nxt_fast_path(p != NULL)) { +#if (NXT_DEBUG_ALLOC) nxt_unit_debug(ctx, "malloc(%d): %p", (int) size, p); +#endif } else { nxt_unit_alert(ctx, "malloc(%d) failed: %s (%d)", @@ -6541,7 +6543,9 @@ nxt_unit_malloc(nxt_unit_ctx_t *ctx, size_t size) void nxt_unit_free(nxt_unit_ctx_t *ctx, void *p) { +#if (NXT_DEBUG_ALLOC) nxt_unit_debug(ctx, "free(%p)", p); +#endif free(p); } diff --git a/src/nxt_unit.h b/src/nxt_unit.h index cb78e862..90cba2a3 100644 --- a/src/nxt_unit.h +++ b/src/nxt_unit.h @@ -12,6 +12,7 @@ #include <sys/uio.h> #include <string.h> +#include "nxt_auto_config.h" #include "nxt_version.h" #include "nxt_unit_typedefs.h" diff --git a/src/test/nxt_unit_app_test.c b/src/test/nxt_unit_app_test.c index b6dd13d2..a5f3728c 100644 --- a/src/test/nxt_unit_app_test.c +++ b/src/test/nxt_unit_app_test.c @@ -3,8 +3,6 @@ * Copyright (C) NGINX, Inc. */ -#include <nxt_auto_config.h> -#include <nxt_version.h> #include <nxt_unit.h> #include <nxt_unit_request.h> #include <nxt_clang.h> diff --git a/src/test/nxt_unit_websocket_chat.c b/src/test/nxt_unit_websocket_chat.c index 6e274722..39f8a440 100644 --- a/src/test/nxt_unit_websocket_chat.c +++ b/src/test/nxt_unit_websocket_chat.c @@ -30,7 +30,7 @@ typedef struct { static int ws_chat_root(nxt_unit_request_info_t *req); -static void ws_chat_broadcast(const void *buf, size_t size); +static void ws_chat_broadcast(const char *buf, size_t size); static const char ws_chat_index_html[]; @@ -139,18 +139,18 @@ ws_chat_root(nxt_unit_request_info_t *req) static void -ws_chat_broadcast(const void *buf, size_t size) +ws_chat_broadcast(const char *buf, size_t size) { ws_chat_request_data_t *data; nxt_unit_request_info_t *req; - nxt_unit_debug(NULL, "broadcast: %s", buf); + nxt_unit_debug(NULL, "broadcast: %*.s", (int) size, buf); nxt_queue_each(data, &ws_chat_sessions, ws_chat_request_data_t, link) { req = nxt_unit_get_request_info_from_data(data); - nxt_unit_req_debug(req, "broadcast: %s", buf); + nxt_unit_req_debug(req, "send: %*.s", (int) size, buf); nxt_unit_websocket_send(req, NXT_WEBSOCKET_OP_TEXT, 1, buf, size); } nxt_queue_loop; |