Skip to content

Commit 2b3188d

Browse files
committed
Improve logging in OS memory provider
1 parent b0ce148 commit 2b3188d

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

src/provider/provider_os_memory.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,12 +1179,17 @@ static umf_result_t os_get_ipc_handle_size(void *provider, size_t *size) {
11791179
static umf_result_t os_get_ipc_handle(void *provider, const void *ptr,
11801180
size_t size, void *providerIpcData) {
11811181
if (provider == NULL || ptr == NULL || providerIpcData == NULL) {
1182+
LOG_ERR(
1183+
"Some argument is NULL, provider=%p, ptr=%p, providerIpcData=%p",
1184+
provider, ptr, providerIpcData);
11821185
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
11831186
}
11841187

11851188
os_memory_provider_t *os_provider = (os_memory_provider_t *)provider;
11861189
if (!os_provider->IPC_enabled) {
1187-
LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED")
1190+
LOG_ERR("memory visibility mode is not UMF_MEM_MAP_SHARED, ptr=%p, "
1191+
"size=%lu",
1192+
ptr, size);
11881193
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
11891194
}
11901195

@@ -1213,6 +1218,9 @@ static umf_result_t os_get_ipc_handle(void *provider, const void *ptr,
12131218

12141219
static umf_result_t os_put_ipc_handle(void *provider, void *providerIpcData) {
12151220
if (provider == NULL || providerIpcData == NULL) {
1221+
LOG_ERR("provider or providerIpcData are NULL, provider=%p, "
1222+
"providerIpcData=%p",
1223+
provider, providerIpcData);
12161224
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
12171225
}
12181226

@@ -1225,19 +1233,28 @@ static umf_result_t os_put_ipc_handle(void *provider, void *providerIpcData) {
12251233
os_ipc_data_t *os_ipc_data = (os_ipc_data_t *)providerIpcData;
12261234

12271235
if (os_ipc_data->pid != utils_getpid()) {
1236+
LOG_ERR("invalid PID, os_ipc_data->pid = %d", os_ipc_data->pid);
12281237
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
12291238
}
12301239

12311240
size_t shm_name_len = strlen(os_provider->shm_name);
12321241
if (shm_name_len > 0) {
12331242
if (os_ipc_data->shm_name_len != shm_name_len) {
1243+
LOG_ERR("invalid shm_name_len, os_ipc_data->shm_name_len=%lu, "
1244+
"expected shm_name_len=%lu",
1245+
os_ipc_data->shm_name_len, shm_name_len);
12341246
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
12351247
} else if (strncmp(os_ipc_data->shm_name, os_provider->shm_name,
12361248
shm_name_len)) {
1249+
LOG_ERR("invalid shm_name, os_ipc_data->shm_name=%s, "
1250+
"os_provider->shm_name=%s",
1251+
os_ipc_data->shm_name, os_provider->shm_name);
12371252
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
12381253
}
12391254
} else {
12401255
if (os_ipc_data->fd != os_provider->fd) {
1256+
LOG_ERR("invalid fd, os_ipc_data->fd=%d, os_provider->fd=%d",
1257+
os_ipc_data->fd, os_provider->fd);
12411258
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
12421259
}
12431260
}

0 commit comments

Comments
 (0)