fix(log): add missing LIBIPC_LOG() to all functions using log interface

mutouyun · mutouyun · commit 2ff5c9447934 · 2025-12-15T09:48:54.000Z
- Add LIBIPC_LOG() to functions in platform files that use log.error/warning/debug
- Fixed files:
  - POSIX platform: mutex.h, semaphore_impl.h, shm_posix.cpp
  - Windows platform: get_sa.h, mutex.h, semaphore.h, shm_win.cpp
  - Sync layer: condition.cpp, mutex.cpp, semaphore.cpp

All functions using the new log interface now properly initialize the logger with LIBIPC_LOG()
diff --git a/src/libipc/platform/posix/mutex.h b/src/libipc/platform/posix/mutex.h
@@ -149,6 +149,7 @@ class mutex {
     }
 
     void close() noexcept {
+        LIBIPC_LOG();
         if ((ref_ != nullptr) && (shm_ != nullptr) && (mutex_ != nullptr)) {
             if (shm_->name() != nullptr) {
                 release_mutex(shm_->name(), [this] {
@@ -179,6 +180,7 @@ class mutex {
     }
 
     void clear() noexcept {
+        LIBIPC_LOG();
         if ((shm_ != nullptr) && (mutex_ != nullptr)) {
             if (shm_->name() != nullptr) {
                 release_mutex(shm_->name(), [this] {
@@ -206,6 +208,7 @@ class mutex {
     }
 
     bool lock(std::uint64_t tm) noexcept {
+        LIBIPC_LOG();
         if (!valid()) return false;
         for (;;) {
             auto ts = posix_::detail::make_timespec(tm);
@@ -265,6 +268,7 @@ class mutex {
     }
 
     bool unlock() noexcept {
+        LIBIPC_LOG();
         if (!valid()) return false;
         int eno;
         if ((eno = ::pthread_mutex_unlock(mutex_)) != 0) {
diff --git a/src/libipc/platform/posix/semaphore_impl.h b/src/libipc/platform/posix/semaphore_impl.h
@@ -34,6 +34,7 @@ class semaphore {
     }
 
     bool open(char const *name, std::uint32_t count) noexcept {
+        LIBIPC_LOG();
         close();
         if (!shm_.acquire(name, 1)) {
             log.error("[open_semaphore] fail shm.acquire: ", name, "");
@@ -55,6 +56,7 @@ class semaphore {
     }
 
     void close() noexcept {
+        LIBIPC_LOG();
         if (!valid()) return;
         if (::sem_close(h_) != 0) {
             log.error("fail sem_close[%d]: ", errno, "");
@@ -71,6 +73,7 @@ class semaphore {
     }
 
     void clear() noexcept {
+        LIBIPC_LOG();
         if (valid()) {
             if (::sem_close(h_) != 0) {
                 log.error("fail sem_close[%d]: ", errno, "");
@@ -97,6 +100,7 @@ class semaphore {
     }
 
     bool wait(std::uint64_t tm) noexcept {
+        LIBIPC_LOG();
         if (!valid()) return false;
         if (tm == invalid_value) {
             if (::sem_wait(h_) != 0) {
@@ -116,6 +120,7 @@ class semaphore {
     }
 
     bool post(std::uint32_t count) noexcept {
+        LIBIPC_LOG();
         if (!valid()) return false;
         for (std::uint32_t i = 0; i < count; ++i) {
             if (::sem_post(h_) != 0) {
diff --git a/src/libipc/platform/posix/shm_posix.cpp b/src/libipc/platform/posix/shm_posix.cpp
@@ -105,6 +105,7 @@ std::int32_t get_ref(id_t id) {
 }
 
 void sub_ref(id_t id) {
+    LIBIPC_LOG();
     if (id == nullptr) {
         log.error("fail sub_ref: invalid id (null)");
         return;
@@ -165,6 +166,7 @@ void * get_mem(id_t id, std::size_t * size) {
 }
 
 std::int32_t release(id_t id) noexcept {
+    LIBIPC_LOG();
     if (id == nullptr) {
         log.error("fail release: invalid id (null)");
         return -1;
@@ -189,6 +191,7 @@ std::int32_t release(id_t id) noexcept {
 }
 
 void remove(id_t id) noexcept {
+    LIBIPC_LOG();
     if (id == nullptr) {
         log.error("fail remove: invalid id (null)");
         return;
@@ -205,6 +208,7 @@ void remove(id_t id) noexcept {
 }
 
 void remove(char const * name) noexcept {
+    LIBIPC_LOG();
     if (!is_valid_string(name)) {
         log.error("fail remove: name is empty");
         return;
diff --git a/src/libipc/platform/win/get_sa.h b/src/libipc/platform/win/get_sa.h
@@ -6,6 +6,7 @@ namespace ipc {
 namespace detail {
 
 inline LPSECURITY_ATTRIBUTES get_sa() {
+    LIBIPC_LOG();
     static struct initiator {
 
         SECURITY_DESCRIPTOR sd_;
diff --git a/src/libipc/platform/win/mutex.h b/src/libipc/platform/win/mutex.h
@@ -36,6 +36,7 @@ class mutex {
     }
 
     bool open(char const *name) noexcept {
+        LIBIPC_LOG();
         close();
         h_ = ::CreateMutex(detail::get_sa(), FALSE, detail::to_tchar(name).c_str());
         if (h_ == NULL) {
@@ -59,6 +60,7 @@ class mutex {
     }
 
     bool lock(std::uint64_t tm) noexcept {
+        LIBIPC_LOG();
         DWORD ret, ms = (tm == invalid_value) ? INFINITE : static_cast<DWORD>(tm);
         for(;;) {
             switch ((ret = ::WaitForSingleObject(h_, ms))) {
@@ -96,6 +98,7 @@ class mutex {
     }
 
     bool unlock() noexcept {
+        LIBIPC_LOG();
         if (!::ReleaseMutex(h_)) {
             log.error("fail ReleaseMutex[", ::GetLastError(), "]");
             return false;
diff --git a/src/libipc/platform/win/semaphore.h b/src/libipc/platform/win/semaphore.h
@@ -33,6 +33,7 @@ class semaphore {
     }
 
     bool open(char const *name, std::uint32_t count) noexcept {
+        LIBIPC_LOG();
         close();
         h_ = ::CreateSemaphore(detail::get_sa(), 
                                static_cast<LONG>(count), LONG_MAX, 
@@ -58,6 +59,7 @@ class semaphore {
     }
 
     bool wait(std::uint64_t tm) noexcept {
+        LIBIPC_LOG();
         DWORD ret, ms = (tm == invalid_value) ? INFINITE : static_cast<DWORD>(tm);
         switch ((ret = ::WaitForSingleObject(h_, ms))) {
         case WAIT_OBJECT_0:
@@ -72,6 +74,7 @@ class semaphore {
     }
 
     bool post(std::uint32_t count) noexcept {
+        LIBIPC_LOG();
         if (!::ReleaseSemaphore(h_, static_cast<LONG>(count), NULL)) {
             log.error("fail ReleaseSemaphore[", ::GetLastError(), "]");"}]
             return false;
diff --git a/src/libipc/platform/win/shm_win.cpp b/src/libipc/platform/win/shm_win.cpp
@@ -94,6 +94,7 @@ std::int32_t get_ref(id_t id) {
 }
 
 void sub_ref(id_t id) {
+    LIBIPC_LOG();
     if (id == nullptr) {
         log.error("fail sub_ref: invalid id (null)");
         return;
@@ -144,6 +145,7 @@ void * get_mem(id_t id, std::size_t * size) {
 }
 
 std::int32_t release(id_t id) noexcept {
+    LIBIPC_LOG();
     if (id == nullptr) {
         log.error("fail release: invalid id (null)");
         return -1;
@@ -166,6 +168,7 @@ std::int32_t release(id_t id) noexcept {
 }
 
 void remove(id_t id) noexcept {
+    LIBIPC_LOG();
     if (id == nullptr) {
         log.error("fail release: invalid id (null)");
         return;
@@ -174,6 +177,7 @@ void remove(id_t id) noexcept {
 }
 
 void remove(char const * name) noexcept {
+    LIBIPC_LOG();
     if (!is_valid_string(name)) {
         log.error("fail remove: name is empty");
         return;
diff --git a/src/libipc/sync/condition.cpp b/src/libipc/sync/condition.cpp
@@ -50,6 +50,7 @@ bool condition::valid() const noexcept {
 }
 
 bool condition::open(char const *name) noexcept {
+    LIBIPC_LOG();
     if (!is_valid_string(name)) {
         log.error("fail condition open: name is empty");
         return false;
diff --git a/src/libipc/sync/mutex.cpp b/src/libipc/sync/mutex.cpp
@@ -50,6 +50,7 @@ bool mutex::valid() const noexcept {
 }
 
 bool mutex::open(char const *name) noexcept {
+    LIBIPC_LOG();
     if (!is_valid_string(name)) {
         log.error("fail mutex open: name is empty");
         return false;
diff --git a/src/libipc/sync/semaphore.cpp b/src/libipc/sync/semaphore.cpp
@@ -49,6 +49,7 @@ bool semaphore::valid() const noexcept {
 }
 
 bool semaphore::open(char const *name, std::uint32_t count) noexcept {
+    LIBIPC_LOG();
     if (!is_valid_string(name)) {
         log.error("fail semaphore open: name is empty");
         return false;

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ class mutex {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`bool open(char const *name) noexcept {`
	`39`	`+ LIBIPC_LOG();`
`39`	`40`	`close();`
`40`	`41`	`h_ = ::CreateMutex(detail::get_sa(), FALSE, detail::to_tchar(name).c_str());`
`41`	`42`	`if (h_ == NULL) {`
`@@ -59,6 +60,7 @@ class mutex {`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`bool lock(std::uint64_t tm) noexcept {`
	`63`	`+ LIBIPC_LOG();`
`62`	`64`	`DWORD ret, ms = (tm == invalid_value) ? INFINITE : static_cast<DWORD>(tm);`
`63`	`65`	`for(;;) {`
`64`	`66`	`switch ((ret = ::WaitForSingleObject(h_, ms))) {`
`@@ -96,6 +98,7 @@ class mutex {`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`bool unlock() noexcept {`
	`101`	`+ LIBIPC_LOG();`
`99`	`102`	`if (!::ReleaseMutex(h_)) {`
`100`	`103`	`log.error("fail ReleaseMutex[", ::GetLastError(), "]");`
`101`	`104`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ class semaphore {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`bool open(char const *name, std::uint32_t count) noexcept {`
	`36`	`+ LIBIPC_LOG();`
`36`	`37`	`close();`
`37`	`38`	`h_ = ::CreateSemaphore(detail::get_sa(),`
`38`	`39`	`static_cast<LONG>(count), LONG_MAX,`
`@@ -58,6 +59,7 @@ class semaphore {`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`bool wait(std::uint64_t tm) noexcept {`
	`62`	`+ LIBIPC_LOG();`
`61`	`63`	`DWORD ret, ms = (tm == invalid_value) ? INFINITE : static_cast<DWORD>(tm);`
`62`	`64`	`switch ((ret = ::WaitForSingleObject(h_, ms))) {`
`63`	`65`	`case WAIT_OBJECT_0:`
`@@ -72,6 +74,7 @@ class semaphore {`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`bool post(std::uint32_t count) noexcept {`
	`77`	`+ LIBIPC_LOG();`
`75`	`78`	`if (!::ReleaseSemaphore(h_, static_cast<LONG>(count), NULL)) {`
`76`	`79`	`log.error("fail ReleaseSemaphore[", ::GetLastError(), "]");"}]`
`77`	`80`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ bool condition::valid() const noexcept {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`bool condition::open(char const *name) noexcept {`
	`53`	`+ LIBIPC_LOG();`
`53`	`54`	`if (!is_valid_string(name)) {`
`54`	`55`	`log.error("fail condition open: name is empty");`
`55`	`56`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ bool mutex::valid() const noexcept {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`bool mutex::open(char const *name) noexcept {`
	`53`	`+ LIBIPC_LOG();`
`53`	`54`	`if (!is_valid_string(name)) {`
`54`	`55`	`log.error("fail mutex open: name is empty");`
`55`	`56`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ bool semaphore::valid() const noexcept {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`bool semaphore::open(char const *name, std::uint32_t count) noexcept {`
	`52`	`+ LIBIPC_LOG();`
`52`	`53`	`if (!is_valid_string(name)) {`
`53`	`54`	`log.error("fail semaphore open: name is empty");`
`54`	`55`	`return false;`