X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..35a644bdf9d0c5603c9483f03f913e4a649638d6:/src/xbt/memory_map.cpp

diff --git a/src/xbt/memory_map.cpp b/src/xbt/memory_map.cpp
index fccfac8a5a..2d54b6aee8 100644
--- a/src/xbt/memory_map.cpp
+++ b/src/xbt/memory_map.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -65,8 +65,7 @@
   } else                                                                                                               \
     ((void)0)
 
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
 
 /**
  * \todo This function contains many cases that do not allow for a
@@ -106,21 +105,51 @@ std::vector<VmMap> get_memory_map(pid_t pid)
     mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT;
 #endif
 
-    kr =
-      mach_vm_region(
-          map,
-          &address,
-          &size,
-          flavor,
-          (vm_region_info_t)&info,
-          &info_count,
-          &object);
+    kr = mach_vm_region(map, &address, &size, flavor, (vm_region_info_t)&info, &info_count, &object);
     if (kr == KERN_INVALID_ADDRESS) {
       break;
-    }
-    else if (kr != KERN_SUCCESS) {
+
+    } else if (kr != KERN_SUCCESS) {
+      const char* name = nullptr;
+      switch (kr) { // https://github.com/apple/darwin-xnu/blob/main/bsd/kern/stackshot.c#L42
+        case KERN_SUCCESS:
+          name = "kr=KERN_SUCCESS";
+          break;
+        case KERN_RESOURCE_SHORTAGE:
+          name = "kr=KERN_RESOURCE_SHORTAGE (ENOMEM)";
+          break;
+        case KERN_INSUFFICIENT_BUFFER_SIZE:
+          name = "kr=KERN_INSUFFICIENT_BUFFER_SIZE (ENOSPC)";
+          break;
+        case KERN_NO_SPACE:
+          name = "kr=KERN_NO_SPACE (ENOSPC)";
+          break;
+        case KERN_NO_ACCESS:
+          name = "kr=KERN_NO_ACCESS (EPERM)";
+          break;
+        case KERN_MEMORY_PRESENT:
+          name = "kr=KERN_MEMORY_PRESENT (EEXIST)";
+          break;
+        case KERN_NOT_SUPPORTED:
+          name = "kr=KERN_NOT_SUPPORTED (ENOTSUP)";
+          break;
+        case KERN_NOT_IN_SET:
+          name = "kr=KERN_NOT_IN_SET (ENOENT)";
+          break;
+        case KERN_ABORTED:
+          name = "kr=KERN_ABORTED (EINTR)";
+          break;
+        case KERN_FAILURE:
+          name = "kr=KERN_FAILURE (EBUSY)";
+          break;
+        case KERN_OPERATION_TIMED_OUT:
+          name = "kr=KERN_OPERATION_TIMED_OUT (ETIMEDOUT)";
+          break;
+        default:
+          name = "kr=default case (EINVAL)";
+      }
       std::perror("mach_vm_region failed");
-      std::fprintf(stderr, "Cannot request authorization for kernel information access\n");
+      std::fprintf(stderr, "Cannot request authorization for kernel information access (kr=%d ; %s)\n", (int)kr, name);
       abort();
     }
 
@@ -173,7 +202,7 @@ std::vector<VmMap> get_memory_map(pid_t pid)
 #elif defined __linux__
   /* Open the actual process's proc maps file and create the memory_map_t */
   /* to be returned. */
-  std::string path = std::string("/proc/") + std::to_string(pid) + "/maps";
+  std::string path = "/proc/" + std::to_string(pid) + "/maps";
   std::ifstream fp;
   fp.rdbuf()->pubsetbuf(nullptr, 0);
   fp.open(path);
@@ -389,5 +418,4 @@ std::vector<VmMap> get_memory_map(pid_t pid)
   return ret;
 }
 
-}
-}
+} // namespace simgrid::xbt