Skip to content

Commit 1664526

Browse files
mutouyunmutouyun
committed
fix(log): fix malformed log calls and add missing LIBIPC_LOG() in shm files
- 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.
1 parent 2ff5c94 commit 1664526

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

‎src/libipc/platform/posix/shm_posix.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ namespace ipc {
4545
namespace shm {
4646

4747
id_t acquire(char const * name, std::size_t size, unsigned mode) {
48+
LIBIPC_LOG();
4849
if (!is_valid_string(name)) {
4950
log.error("fail acquire: name is empty");
5051
return nullptr;
@@ -79,7 +80,7 @@ id_t acquire(char const * name, std::size_t size, unsigned mode) {
7980
if (fd == -1) {
8081
// only open shm not log error when file not exist
8182
if (open != mode || ENOENT != errno) {
82-
log.error("fail shm_open[%d]: ", errno, op_name.c_str(, ""));
83+
log.error("fail shm_open[", errno, "]: ", op_name);
8384
}
8485
return nullptr;
8586
}
@@ -119,6 +120,7 @@ void sub_ref(id_t id) {
119120
}
120121

121122
void * get_mem(id_t id, std::size_t * size) {
123+
LIBIPC_LOG();
122124
if (id == nullptr) {
123125
log.error("fail get_mem: invalid id (null)");
124126
return nullptr;
@@ -136,25 +138,25 @@ void * get_mem(id_t id, std::size_t * size) {
136138
if (ii->size_ == 0) {
137139
struct stat st;
138140
if (::fstat(fd, &st) != 0) {
139-
log.error("fail fstat[%d]: ", errno, ii->name_.c_str(, ", size = %zd"), ii->size_);
141+
log.error("fail fstat[", errno, "]: ", ii->name_, ", size = ", ii->size_);
140142
return nullptr;
141143
}
142144
ii->size_ = static_cast<std::size_t>(st.st_size);
143145
if ((ii->size_ <= sizeof(info_t)) || (ii->size_ % sizeof(info_t))) {
144-
log.error("fail get_mem: ", ii->name_.c_str(, ", invalid size = %zd"), ii->size_);
146+
log.error("fail get_mem: ", ii->name_, ", invalid size = ", ii->size_);
145147
return nullptr;
146148
}
147149
}
148150
else {
149151
ii->size_ = calc_size(ii->size_);
150152
if (::ftruncate(fd, static_cast<off_t>(ii->size_)) != 0) {
151-
log.error("fail ftruncate[%d]: ", errno, ii->name_.c_str(, ", size = %zd"), ii->size_);
153+
log.error("fail ftruncate[", errno, "]: ", ii->name_, ", size = ", ii->size_);
152154
return nullptr;
153155
}
154156
}
155157
void* mem = ::mmap(nullptr, ii->size_, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
156158
if (mem == MAP_FAILED) {
157-
log.error("fail mmap[%d]: ", errno, ii->name_.c_str(, ", size = %zd"), ii->size_);
159+
log.error("fail mmap[", errno, "]: ", ii->name_, ", size = ", ii->size_);
158160
return nullptr;
159161
}
160162
::close(fd);
@@ -174,14 +176,14 @@ std::int32_t release(id_t id) noexcept {
174176
std::int32_t ret = -1;
175177
auto ii = static_cast<id_info_t*>(id);
176178
if (ii->mem_ == nullptr || ii->size_ == 0) {
177-
log.error("fail release: invalid id (mem = %p, size = %zd), name = ", ii->mem_, ii->size_, ii->name_.c_str(, ""));
179+
log.error("fail release: invalid id (mem = ", ii->mem_, ", size = ", ii->size_, "), name = ", ii->name_);
178180
}
179181
else if ((ret = acc_of(ii->mem_, ii->size_).fetch_sub(1, std::memory_order_acq_rel)) <= 1) {
180182
::munmap(ii->mem_, ii->size_);
181183
if (!ii->name_.empty()) {
182184
int unlink_ret = ::shm_unlink(ii->name_.c_str());
183185
if (unlink_ret == -1) {
184-
log.error("fail shm_unlink[%d]: ", errno, ii->name_.c_str(, ""));
186+
log.error("fail shm_unlink[", errno, "]: ", ii->name_);
185187
}
186188
}
187189
}
@@ -202,7 +204,7 @@ void remove(id_t id) noexcept {
202204
if (!name.empty()) {
203205
int unlink_ret = ::shm_unlink(name.c_str());
204206
if (unlink_ret == -1) {
205-
log.error("fail shm_unlink[%d]: ", errno, name.c_str(, ""));
207+
log.error("fail shm_unlink[", errno, "]: ", name);
206208
}
207209
}
208210
}
@@ -222,7 +224,7 @@ void remove(char const * name) noexcept {
222224
}
223225
int unlink_ret = ::shm_unlink(op_name.c_str());
224226
if (unlink_ret == -1) {
225-
log.error("fail shm_unlink[%d]: ", errno, op_name.c_str(, ""));
227+
log.error("fail shm_unlink[", errno, "]: ", op_name);
226228
}
227229
}
228230

‎src/libipc/platform/win/shm_win.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ namespace ipc {
4545
namespace shm {
4646

4747
id_t acquire(char const * name, std::size_t size, unsigned mode) {
48+
LIBIPC_LOG();
4849
if (!is_valid_string(name)) {
4950
log.error("fail acquire: name is empty");
5051
return nullptr;
@@ -55,7 +56,7 @@ id_t acquire(char const * name, std::size_t size, unsigned mode) {
5556
if (mode == open) {
5657
h = ::OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, fmt_name.c_str());
5758
if (h == NULL) {
58-
log.error("fail OpenFileMapping[%d]: ", static_cast<int>(::GetLastError(, "")), name);
59+
log.error("fail OpenFileMapping[", static_cast<int>(::GetLastError()), "]: ", name);
5960
return nullptr;
6061
}
6162
}
@@ -72,7 +73,7 @@ id_t acquire(char const * name, std::size_t size, unsigned mode) {
7273
h = NULL;
7374
}
7475
if (h == NULL) {
75-
log.error("fail CreateFileMapping[%d]: ", static_cast<int>(err, ""), name);
76+
log.error("fail CreateFileMapping[", static_cast<int>(err), "]: ", name);
7677
return nullptr;
7778
}
7879
}
@@ -108,6 +109,7 @@ void sub_ref(id_t id) {
108109
}
109110

110111
void * get_mem(id_t id, std::size_t * size) {
112+
LIBIPC_LOG();
111113
if (id == nullptr) {
112114
log.error("fail get_mem: invalid id (null)");
113115
return nullptr;
@@ -123,12 +125,12 @@ void * get_mem(id_t id, std::size_t * size) {
123125
}
124126
LPVOID mem = ::MapViewOfFile(ii->h_, FILE_MAP_ALL_ACCESS, 0, 0, 0);
125127
if (mem == NULL) {
126-
log.error("fail MapViewOfFile[", static_cast<int>(::GetLastError(, "]")));
128+
log.error("fail MapViewOfFile[", static_cast<int>(::GetLastError()), "]");
127129
return nullptr;
128130
}
129131
MEMORY_BASIC_INFORMATION mem_info;
130132
if (::VirtualQuery(mem, &mem_info, sizeof(mem_info)) == 0) {
131-
log.error("fail VirtualQuery[", static_cast<int>(::GetLastError(, "]")));
133+
log.error("fail VirtualQuery[", static_cast<int>(::GetLastError()), "]");
132134
return nullptr;
133135
}
134136
std::size_t actual_size = static_cast<std::size_t>(mem_info.RegionSize);

0 commit comments

Comments
 (0)