coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2026-01-01 03:12:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(log): fix malformed log calls and add missing LIBIPC_LOG() in shm files

Browse Source 
- src/libipc/platform/posix/shm_posix.cpp:
  * Add LIBIPC_LOG() to acquire() and get_mem() functions
  * Fix malformed log.error() calls: remove format specifiers (%d, %zd, %p)
  * Fix parentheses errors in log.error() calls (e.g., .c_str(, ""))
  * Use stream-based logging instead of printf-style formatting

- src/libipc/platform/win/shm_win.cpp:
  * Add LIBIPC_LOG() to acquire() and get_mem() functions
  * Fix malformed log.error() calls with GetLastError()
  * Fix parentheses errors in log.error() calls
  * Ensure consistent stream-based logging syntax

These fixes address syntax errors that would have caused compilation failures.
This commit is contained in:
木头云 2025-12-15 10:02:23 +00:00
parent 2ff5c94479
commit 1664526c40
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libipc/platform/posix/shm_posix.cpp
View File

@ -45,6 +45,7 @@ namespace ipc {
namespace shm {
id_t acquire(char const * name, std::size_t size, unsigned mode) {
LIBIPC_LOG();
if (!is_valid_string(name)) {
log.error("fail acquire: name is empty");
return nullptr;
@ -79,7 +80,7 @@ id_t acquire(char const * name, std::size_t size, unsigned mode) {
if (fd == -1) {
// only open shm not log error when file not exist
if (open != mode || ENOENT != errno) {
log.error("fail shm_open[%d]: ", errno, op_name.c_str(, ""));
log.error("fail shm_open[", errno, "]: ", op_name);
}
return nullptr;
}
@ -119,6 +120,7 @@ void sub_ref(id_t id) {
}
void * get_mem(id_t id, std::size_t * size) {
LIBIPC_LOG();
if (id == nullptr) {
log.error("fail get_mem: invalid id (null)");
return nullptr;
@ -136,25 +138,25 @@ void * get_mem(id_t id, std::size_t * size) {
if (ii->size_ == 0) {
struct stat st;
if (::fstat(fd, &st) != 0) {
log.error("fail fstat[%d]: ", errno, ii->name_.c_str(, ", size = %zd"), ii->size_);
log.error("fail fstat[", errno, "]: ", ii->name_, ", size = ", ii->size_);
return nullptr;
}
ii->size_ = static_cast<std::size_t>(st.st_size);
if ((ii->size_ <= sizeof(info_t)) || (ii->size_ % sizeof(info_t))) {
log.error("fail get_mem: ", ii->name_.c_str(, ", invalid size = %zd"), ii->size_);
log.error("fail get_mem: ", ii->name_, ", invalid size = ", ii->size_);
return nullptr;
}
}
else {
ii->size_ = calc_size(ii->size_);
if (::ftruncate(fd, static_cast<off_t>(ii->size_)) != 0) {
log.error("fail ftruncate[%d]: ", errno, ii->name_.c_str(, ", size = %zd"), ii->size_);
log.error("fail ftruncate[", errno, "]: ", ii->name_, ", size = ", ii->size_);
return nullptr;
}
}
void* mem = ::mmap(nullptr, ii->size_, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (mem == MAP_FAILED) {
log.error("fail mmap[%d]: ", errno, ii->name_.c_str(, ", size = %zd"), ii->size_);
log.error("fail mmap[", errno, "]: ", ii->name_, ", size = ", ii->size_);
return nullptr;
}
::close(fd);
@ -174,14 +176,14 @@ std::int32_t release(id_t id) noexcept {
std::int32_t ret = -1;
auto ii = static_cast<id_info_t*>(id);
if (ii->mem_ == nullptr || ii->size_ == 0) {
log.error("fail release: invalid id (mem = %p, size = %zd), name = ", ii->mem_, ii->size_, ii->name_.c_str(, ""));
log.error("fail release: invalid id (mem = ", ii->mem_, ", size = ", ii->size_, "), name = ", ii->name_);
}
else if ((ret = acc_of(ii->mem_, ii->size_).fetch_sub(1, std::memory_order_acq_rel)) <= 1) {
::munmap(ii->mem_, ii->size_);
if (!ii->name_.empty()) {
int unlink_ret = ::shm_unlink(ii->name_.c_str());
if (unlink_ret == -1) {
log.error("fail shm_unlink[%d]: ", errno, ii->name_.c_str(, ""));
log.error("fail shm_unlink[", errno, "]: ", ii->name_);
}
}
}
@ -202,7 +204,7 @@ void remove(id_t id) noexcept {
if (!name.empty()) {
int unlink_ret = ::shm_unlink(name.c_str());
if (unlink_ret == -1) {
log.error("fail shm_unlink[%d]: ", errno, name.c_str(, ""));
log.error("fail shm_unlink[", errno, "]: ", name);
}
}
}
@ -222,7 +224,7 @@ void remove(char const * name) noexcept {
}
int unlink_ret = ::shm_unlink(op_name.c_str());
if (unlink_ret == -1) {
log.error("fail shm_unlink[%d]: ", errno, op_name.c_str(, ""));
log.error("fail shm_unlink[", errno, "]: ", op_name);
}
}

10
src/libipc/platform/win/shm_win.cpp
View File

@ -45,6 +45,7 @@ namespace ipc {
namespace shm {
id_t acquire(char const * name, std::size_t size, unsigned mode) {
LIBIPC_LOG();
if (!is_valid_string(name)) {
log.error("fail acquire: name is empty");
return nullptr;
@ -55,7 +56,7 @@ id_t acquire(char const * name, std::size_t size, unsigned mode) {
if (mode == open) {
h = ::OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, fmt_name.c_str());
if (h == NULL) {
log.error("fail OpenFileMapping[%d]: ", static_cast<int>(::GetLastError(, "")), name);
log.error("fail OpenFileMapping[", static_cast<int>(::GetLastError()), "]: ", name);
return nullptr;
}
}
@ -72,7 +73,7 @@ id_t acquire(char const * name, std::size_t size, unsigned mode) {
h = NULL;
}
if (h == NULL) {
log.error("fail CreateFileMapping[%d]: ", static_cast<int>(err, ""), name);
log.error("fail CreateFileMapping[", static_cast<int>(err), "]: ", name);
return nullptr;
}
}
@ -108,6 +109,7 @@ void sub_ref(id_t id) {
}
void * get_mem(id_t id, std::size_t * size) {
LIBIPC_LOG();
if (id == nullptr) {
log.error("fail get_mem: invalid id (null)");
return nullptr;
@ -123,12 +125,12 @@ void * get_mem(id_t id, std::size_t * size) {
}
LPVOID mem = ::MapViewOfFile(ii->h_, FILE_MAP_ALL_ACCESS, 0, 0, 0);
if (mem == NULL) {
log.error("fail MapViewOfFile[", static_cast<int>(::GetLastError(, "]")));
log.error("fail MapViewOfFile[", static_cast<int>(::GetLastError()), "]");
return nullptr;
}
MEMORY_BASIC_INFORMATION mem_info;
if (::VirtualQuery(mem, &mem_info, sizeof(mem_info)) == 0) {
log.error("fail VirtualQuery[", static_cast<int>(::GetLastError(, "]")));
log.error("fail VirtualQuery[", static_cast<int>(::GetLastError()), "]");
return nullptr;
}
std::size_t actual_size = static_cast<std::size_t>(mem_info.RegionSize);