diff --git a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp index 53b68c4e52b07f96a2c7eae8b0cc77f018761237..f6045c376673746310729787f4d415a07e73f60e 100644 --- a/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp +++ b/base/test/benchmarktest/event_benchmark_test/event_benchmark_test.cpp @@ -356,8 +356,7 @@ bool TimerFdHandler::Initialize(uint32_t interval) newValue.it_interval.tv_nsec = (interval % MILLI_TO_BASE) * MILLI_TO_NANO; if (timerfd_settime(GetFd(), TFD_TIMER_ABSTIME, &newValue, nullptr) == INVALID_FD) { - BENCHMARK_LOGD("Set timerFd failed-%{public}s timer_fd:%{public}d, next_time:%{public}lld, "\ - "interval:%{public}lld", strerror(errno), GetFd(), newValue.it_value.tv_sec, newValue.it_interval.tv_sec); + BENCHMARK_LOGD("Set timerFd failed-%{public}s timer_fd:%{public}d", strerror(errno), GetFd()); return false; } @@ -1028,7 +1027,7 @@ void TimerEventHandler::TimeOut() const size_t expirationSize = sizeof(expirations); ssize_t n = ::read(handler_->GetFd(), &expirations, expirationSize); if (n != expirationSize) { - BENCHMARK_LOGD("||%{public}d||Reads %{public}d bytes instead of %{public}d from timer fd.", + BENCHMARK_LOGD("||%{public}d||Reads %{public}d bytes instead of %{public}zu from timer fd.", gettid(), static_cast(n), expirationSize); } @@ -1086,8 +1085,8 @@ BENCHMARK_F(BenchmarkEventTest, testNewTimer002)(benchmark::State& state) { BENCHMARK_LOGD("EventTest testNewTimer002 start."); constexpr uint32_t sleepDurationMs = 200; - constexpr uint32_t expectedData1 = 8; - constexpr uint32_t expectedData2 = 2; + constexpr int expectedData1 = 8; + constexpr int expectedData2 = 2; while (state.KeepRunning()) { g_data1 = 0; g_data2 = 0; @@ -1114,7 +1113,7 @@ BENCHMARK_F(BenchmarkEventTest, testNewTimer003)(benchmark::State& state) { BENCHMARK_LOGD("EventTest testNewTimer003 start."); constexpr uint32_t sleepDurationMs = 30; - constexpr uint32_t expectedData = 5; + constexpr int expectedData = 5; while (state.KeepRunning()) { g_data1 = 0; Timer timer("test_timer", 100); @@ -1199,7 +1198,7 @@ BENCHMARK_F(BenchmarkEventTest, testNewTimer005)(benchmark::State& state) constexpr uint32_t loopCount = 10; constexpr uint32_t timeoutSeconds = 7; constexpr uint32_t sleepDurationMs = 10; - constexpr uint32_t expectedData = 5; + constexpr int expectedData = 5; while (state.KeepRunning()) { g_data1 = 0; Timer timer("test_timer", INVALID_FD); diff --git a/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp b/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp index 0331d5280bd1629c6a9e15685438e365341f6ef3..2c4114cba916d172a67c4e1a21df55cbcdd6671f 100644 --- a/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp +++ b/base/test/benchmarktest/mapped_benchmark_test/mapped_benchmark_test.cpp @@ -52,8 +52,6 @@ public: } else { BENCHMARK_LOGD("Create test dir Failed: %{public}s", dir.c_str()); } - - BENCHMARK_LOGD("Page size: %{public}lld", MappedFile::PageSize()); } void TearDown(const ::benchmark::State& state) override @@ -74,17 +72,11 @@ void PrintStatus(MappedFile& mf) BENCHMARK_LOGD("Mapped Region Start: %{public}p\n" "Mapped Region End: %{public}p\n" "View start: %{public}p\n" - "View End: %{public}p\n" - "View Size: %{public}lld\n" - "File Offset Start: %{public}lld\n" - "File Offset End: %{public}lld", + "View End: %{public}p\n", reinterpret_cast(mf.RegionStart()), reinterpret_cast(mf.RegionEnd()), reinterpret_cast(mf.Begin()), - reinterpret_cast(mf.End()), - mf.Size(), - mf.StartOffset(), - mf.EndOffset()); + reinterpret_cast(mf.End())); } bool CreateTestFile(const std::string& path, const std::string& content) diff --git a/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp b/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp index 071cbc6fffb9644d270c51bdc7e1c05c7143e6f4..fab700611d88dd06034ffc71165b4af1d159eecd 100644 --- a/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp +++ b/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp @@ -93,7 +93,7 @@ const std::vector> if (shouldLock) { g_strongLock.LockWrite(); } - FUZZ_LOGI("thread = %{public}u, DecStrongRef, refState->strongCount = %{public}d", GetThreadId(), + FUZZ_LOGI("thread = %{public}u, DecStrongRef, refState->strongCount = %{public}zu", GetThreadId(), refState->strongCount); g_ref->DecStrongRef(nullptr); if (shouldLock) { @@ -111,7 +111,7 @@ const std::vector> if (shouldLock) { g_strongLock.LockWrite(); } - FUZZ_LOGI("thread = %{public}u, weakRef->DecWeakRefCount, refState->weakRefCount = %{public}d", + FUZZ_LOGI("thread = %{public}u, weakRef->DecWeakRefCount, refState->weakRefCount = %{public}zu", GetThreadId(), refState->weakRefCount); weakRef->DecWeakRefCount(nullptr); if (shouldLock) { @@ -128,7 +128,7 @@ const std::vector> if (shouldLock) { g_strongLock.LockWrite(); } - FUZZ_LOGI("thread = %{public}u, DecWeakRef, refState->weakCount = %{public}d", GetThreadId(), + FUZZ_LOGI("thread = %{public}u, DecWeakRef, refState->weakCount = %{public}zu", GetThreadId(), refState->weakCount); g_ref->DecWeakRef(nullptr); if (shouldLock) { @@ -262,7 +262,7 @@ void CleanUpWeakRefCounter(SingleThreadRefCounts& state, WeakRefCounter* newWeak if (shouldLock) { g_strongLock.LockWrite(); } - FUZZ_LOGI("thread = %{public}u, clean up DecWeakRefCount, refState->weakRefCount = %{public}d", + FUZZ_LOGI("thread = %{public}u, clean up DecWeakRefCount, refState->weakRefCount = %{public}zu", GetThreadId(), state.weakRefCount); newWeakRef->DecWeakRefCount(nullptr); if (shouldLock) { @@ -280,7 +280,7 @@ void CleanUpWeakCounter(SingleThreadRefCounts& state) if (shouldLock) { g_strongLock.LockWrite(); } - FUZZ_LOGI("thread = %{public}u, clean up DecWeakRef, refState->weakCount = %{public}d", GetThreadId(), + FUZZ_LOGI("thread = %{public}u, clean up DecWeakRef, refState->weakCount = %{public}zu", GetThreadId(), state.weakCount - 1); g_ref->DecWeakRef(nullptr); if (shouldLock) { @@ -297,7 +297,7 @@ void CleanUpStrongCounter(SingleThreadRefCounts& state) if (shouldLock) { g_strongLock.LockWrite(); } - FUZZ_LOGI("thread = %{public}u, clean up DecStrongRef, refState->strongCount = %{public}d", GetThreadId(), + FUZZ_LOGI("thread = %{public}u, clean up DecStrongRef, refState->strongCount = %{public}zu", GetThreadId(), state.strongCount - 1); g_ref->DecStrongRef(nullptr); if (shouldLock) {