From 8df73941392ddef76bb4b9863fd5d6ccef814145 Mon Sep 17 00:00:00 2001 From: fuyongyuan Date: Sat, 2 Aug 2025 16:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=89=93=E5=8D=B0=E5=8C=BF?= =?UTF-8?q?=E5=90=8D=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fuyongyuan --- src/threadpool.c | 8 ++++---- src/unix/async.c | 6 +++--- src/unix/linux.c | 4 ++-- src/unix/loop.c | 4 ++-- src/unix/signal.c | 2 +- src/uv-common.c | 6 +++--- src/uv_log.h | 1 + 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/threadpool.c b/src/threadpool.c index e4fe9b6..4a6d783 100644 --- a/src/threadpool.c +++ b/src/threadpool.c @@ -95,7 +95,7 @@ int is_uv_loop_good_magic(const uv_loop_t* loop) { if (loop->magic == UV_LOOP_MAGIC) { return 1; } - UV_LOGE("loop:(%{public}zu:%{public}#x) invalid", (size_t)loop, loop->magic); + UV_LOGE("loop:(%{public}zu:%{public}#x) invalid", (size_t)loop % UV_ADDR_MOD, loop->magic); return 0; } #endif @@ -110,7 +110,7 @@ void on_uv_loop_close(uv_loop_t* loop) { uv_rwlock_wrunlock(&g_closed_uv_loop_rwlock); #endif time(&t2); - UV_LOGI("loop:(%{public}zu) closed in %{public}zds", (size_t)loop, (ssize_t)(t2 - t1)); + UV_LOGI("loop:(%{public}zu) closed in %{public}zds", (size_t)loop % UV_ADDR_MOD, (ssize_t)(t2 - t1)); } @@ -365,7 +365,7 @@ static void uv__print_active_reqs(uv_loop_t* loop, const char* flag) { unsigned int count = loop->active_reqs.count; if (count == MIN_REQS_THRESHOLD || count == MIN_REQS_THRESHOLD + CURSOR || count == MAX_REQS_THRESHOLD || count == MAX_REQS_THRESHOLD + CURSOR) { - UV_LOGW("loop:%{public}zu, flag:%{public}s, active reqs:%{public}u", (size_t)loop, flag, count); + UV_LOGW("loop:%{public}zu, flag:%{public}s, active reqs:%{public}u", (size_t)loop % UV_ADDR_MOD, flag, count); } #else return; @@ -394,7 +394,7 @@ void uv__work_submit_to_eventloop(uv_req_t* req, struct uv__work* w, int qos) { if (!is_uv_loop_good_magic(loop)) { rdunlock_closed_uv_loop_rwlock(); UV_LOGE("uv_loop(%{public}zu:%{public}#x), task is invalid", - (size_t)loop, loop->magic); + (size_t)loop % UV_ADDR_MOD, loop->magic); return; } diff --git a/src/unix/async.c b/src/unix/async.c index 1bb30e4..eef434f 100644 --- a/src/unix/async.c +++ b/src/unix/async.c @@ -229,7 +229,7 @@ static int uv__async_start(uv_loop_t* loop) { uv__io_init(&loop->async_io_watcher, uv__async_io, pipefd[0]); uv__io_start(loop, &loop->async_io_watcher, POLLIN); loop->async_wfd = pipefd[1]; - UV_LOGI("open:%{public}zu, pipefd[0]:%{public}d", (size_t)loop, pipefd[0]); + UV_LOGI("open:%{public}zu, pipefd[0]:%{public}d", (size_t)loop % UV_ADDR_MOD, pipefd[0]); return 0; } @@ -250,7 +250,7 @@ void uv__async_stop(uv_loop_t* loop) { if (loop->async_wfd != -1) { if (loop->async_wfd != loop->async_io_watcher.fd) { - UV_LOGI("close:%{public}zu, async_wfd:%{public}d", (size_t)loop, loop->async_wfd); + UV_LOGI("close:%{public}zu, async_wfd:%{public}d", (size_t)loop % UV_ADDR_MOD, loop->async_wfd); uv__close(loop->async_wfd); } loop->async_wfd = -1; @@ -268,7 +268,7 @@ void uv__async_stop(uv_loop_t* loop) { #else uv__close(loop->async_io_watcher.fd); #endif - UV_LOGI("close:%{public}zu, async_io_wfd:%{public}d", (size_t)loop, loop->async_io_watcher.fd); + UV_LOGI("close:%{public}zu, async_io_wfd:%{public}d", (size_t)loop % UV_ADDR_MOD, loop->async_io_watcher.fd); loop->async_io_watcher.fd = -1; } diff --git a/src/unix/linux.c b/src/unix/linux.c index d3fe09f..2251437 100644 --- a/src/unix/linux.c +++ b/src/unix/linux.c @@ -675,7 +675,7 @@ int uv__platform_loop_init(uv_loop_t* loop) { uv__iou_init(loop->backend_fd, &lfields->iou, 64, UV__IORING_SETUP_SQPOLL); uv__iou_init(loop->backend_fd, &lfields->ctl, 256, 0); - UV_LOGI("init:%{public}zu, backend_fd:%{public}d", (size_t)loop, loop->backend_fd); + UV_LOGI("init:%{public}zu, backend_fd:%{public}d", (size_t)loop % UV_ADDR_MOD, loop->backend_fd); return 0; } @@ -1551,7 +1551,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) { */ #ifdef USE_FFRT if (ffrt_get_cur_task() != NULL) { - UV_LOGF("fd %{public}d don't belong to loop %{public}zu", fd, (size_t)loop); + UV_LOGF("fd %{public}d don't belong to loop %{public}zu", fd, (size_t)loop % UV_ADDR_MOD); } #endif uv__epoll_ctl_prep(epollfd, ctl, &prep, EPOLL_CTL_DEL, fd, pe); diff --git a/src/unix/loop.c b/src/unix/loop.c index 7852461..e841f88 100644 --- a/src/unix/loop.c +++ b/src/unix/loop.c @@ -33,7 +33,7 @@ int uv_loop_init(uv_loop_t* loop) { void* saved_data; int err; - UV_LOGI("init:%{public}zu", (size_t)loop); + UV_LOGI("init:%{public}zu", (size_t)loop % UV_ADDR_MOD); saved_data = loop->data; memset(loop, 0, sizeof(*loop)); loop->data = saved_data; @@ -200,7 +200,7 @@ void uv__loop_close(uv_loop_t* loop) { #else uv__close(loop->backend_fd); #endif - UV_LOGI("close:%{public}zu, backend_fd:%{public}d", (size_t)loop, loop->backend_fd); + UV_LOGI("close:%{public}zu, backend_fd:%{public}d", (size_t)loop % UV_ADDR_MOD, loop->backend_fd); loop->backend_fd = -1; } diff --git a/src/unix/signal.c b/src/unix/signal.c index 1076260..3fe8bc6 100644 --- a/src/unix/signal.c +++ b/src/unix/signal.c @@ -557,7 +557,7 @@ static void uv__signal_event(uv_loop_t* loop, #ifdef USE_FFRT int ret = isAddressValid((void*)handle); if (ret == -1) { - UV_LOGE("signal handle %{public}zu is invalid", (size_t)handle); + UV_LOGE("signal handle %{public}zu is invalid", (size_t)handle % UV_ADDR_MOD); continue; } #endif diff --git a/src/uv-common.c b/src/uv-common.c index 61378f5..aeeab7d 100644 --- a/src/uv-common.c +++ b/src/uv-common.c @@ -548,7 +548,7 @@ void uv_walk(uv_loop_t* loop, uv_walk_cb walk_cb, void* arg) { struct uv__queue* q; uv_handle_t* h; - UV_LOGI("clean up handles in loop(%{public}zu)", (size_t)loop); + UV_LOGI("clean up handles in loop(%{public}zu)", (size_t)loop % UV_ADDR_MOD); uv__queue_move(&loop->handle_queue, &queue); while (!uv__queue_empty(&queue)) { q = uv__queue_head(&queue); @@ -870,7 +870,7 @@ int uv_loop_close(uv_loop_t* loop) { if (uv__has_active_reqs(loop)) { #ifdef USE_OHOS_DFX - UV_LOGI("loop:%{public}zu, active reqs:%{public}u", (size_t)loop, loop->active_reqs.count); + UV_LOGI("loop:%{public}zu, active reqs:%{public}u", (size_t)loop % UV_ADDR_MOD, loop->active_reqs.count); #endif return UV_EBUSY; } @@ -878,7 +878,7 @@ int uv_loop_close(uv_loop_t* loop) { h = uv__queue_data(q, uv_handle_t, handle_queue); if (!(h->flags & UV_HANDLE_INTERNAL)) { #ifdef USE_OHOS_DFX - UV_LOGI("loop:%{public}zu, active handle:%{public}zu", (size_t)loop, (size_t)h); + UV_LOGI("loop:%{public}zu, active handle:%{public}zu", (size_t)loop % UV_ADDR_MOD, (size_t)h); #endif return UV_EBUSY; } diff --git a/src/uv_log.h b/src/uv_log.h index 5a34476..09ba639 100644 --- a/src/uv_log.h +++ b/src/uv_log.h @@ -16,6 +16,7 @@ #ifndef UV_LOG_H #define UV_LOG_H +#define UV_ADDR_MOD 10000 #ifdef USE_OHOS_DFX #include "hilog/log.h" #define UV_LOGI(fmt, ...) HILOG_IMPL(LOG_CORE, LOG_INFO, 0xD003301, "LIBUV", fmt, ##__VA_ARGS__) -- Gitee