diff --git a/src/threadpool.c b/src/threadpool.c index e4fe9b6855afc603a248a2fd2eaaa8116996d119..4a6d783651fe52ee568728c2abb18f2c2652e0af 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 1bb30e4de7040fcc263b2804add8f757a5c75727..eef434ffad56e1c2f5cd0f329c2c833a3eb1a7df 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 d3fe09f016453a82bee667b0a3f7c9cabe6d16fe..2251437edaa4916f10c799edfab1db1f9c328e27 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 7852461564fb63899581ede801094a4dc7300a27..e841f88afc96cc4d9fa6d228179baa2fdeff0822 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 1076260c464c32b90f178b317ac56fee5edcd8ff..3fe8bc6ec67e06ffd469bbff0be68ad992813453 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 61378f58b68a21a0c1fea8f9a12017db1aff07f2..aeeab7d891fecfe3a5edf78138d30a8d6b0025d8 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 5a34476e101b4be841fd568e98d5d8c896337ecf..09ba63918f8168f677e38e7485e2dd74e9e0e0f6 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__)