A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better warning message for max-depth
[simgrid.git]
/
src
/
xbt
/
memory_map.cpp
diff --git
a/src/xbt/memory_map.cpp
b/src/xbt/memory_map.cpp
index f275135387db4afc02adddc037c05d55b2d2c82a..2d54b6aee88166a6a2b8bb8890859da9d95b0e96 100644
(file)
--- a/
src/xbt/memory_map.cpp
+++ b/
src/xbt/memory_map.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-202
3
. 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. */
/* 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)
} else \
((void)0)
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
/**
* \todo This function contains many cases that do not allow for a
/**
* \todo This function contains many cases that do not allow for a
@@
-111,45
+110,46
@@
std::vector<VmMap> get_memory_map(pid_t pid)
break;
} else if (kr != KERN_SUCCESS) {
break;
} else if (kr != KERN_SUCCESS) {
- std::perror("mach_vm_region failed");
- std::fprintf(stderr, "Cannot request authorization for kernel information access (kr=%d)\n", (int)kr);
+ const char* name = nullptr;
switch (kr) { // https://github.com/apple/darwin-xnu/blob/main/bsd/kern/stackshot.c#L42
case KERN_SUCCESS:
switch (kr) { // https://github.com/apple/darwin-xnu/blob/main/bsd/kern/stackshot.c#L42
case KERN_SUCCESS:
-
XBT_INFO("kr=KERN_SUCCESS")
;
+
name = "kr=KERN_SUCCESS"
;
break;
case KERN_RESOURCE_SHORTAGE:
break;
case KERN_RESOURCE_SHORTAGE:
-
XBT_INFO("kr=KERN_RESOURCE_SHORTAGE (ENOMEM)")
;
+
name = "kr=KERN_RESOURCE_SHORTAGE (ENOMEM)"
;
break;
case KERN_INSUFFICIENT_BUFFER_SIZE:
break;
case KERN_INSUFFICIENT_BUFFER_SIZE:
-
XBT_INFO("kr=KERN_INSUFFICIENT_BUFFER_SIZE (ENOSPC)")
;
+
name = "kr=KERN_INSUFFICIENT_BUFFER_SIZE (ENOSPC)"
;
break;
case KERN_NO_SPACE:
break;
case KERN_NO_SPACE:
-
XBT_INFO("kr=KERN_NO_SPACE (ENOSPC)")
;
+
name = "kr=KERN_NO_SPACE (ENOSPC)"
;
break;
case KERN_NO_ACCESS:
break;
case KERN_NO_ACCESS:
-
XBT_INFO("kr=KERN_NO_ACCESS (EPERM)")
;
+
name = "kr=KERN_NO_ACCESS (EPERM)"
;
break;
case KERN_MEMORY_PRESENT:
break;
case KERN_MEMORY_PRESENT:
-
XBT_INFO("kr=KERN_MEMORY_PRESENT (EEXIST)")
;
+
name = "kr=KERN_MEMORY_PRESENT (EEXIST)"
;
break;
case KERN_NOT_SUPPORTED:
break;
case KERN_NOT_SUPPORTED:
-
XBT_INFO("kr=KERN_NOT_SUPPORTED (ENOTSUP)")
;
+
name = "kr=KERN_NOT_SUPPORTED (ENOTSUP)"
;
break;
case KERN_NOT_IN_SET:
break;
case KERN_NOT_IN_SET:
-
XBT_INFO("kr=KERN_NOT_IN_SET (ENOENT)")
;
+
name = "kr=KERN_NOT_IN_SET (ENOENT)"
;
break;
case KERN_ABORTED:
break;
case KERN_ABORTED:
-
XBT_INFO("kr=KERN_ABORTED (EINTR)")
;
+
name = "kr=KERN_ABORTED (EINTR)"
;
break;
case KERN_FAILURE:
break;
case KERN_FAILURE:
-
XBT_INFO("kr=KERN_FAILURE (EBUSY)")
;
+
name = "kr=KERN_FAILURE (EBUSY)"
;
break;
case KERN_OPERATION_TIMED_OUT:
break;
case KERN_OPERATION_TIMED_OUT:
-
XBT_INFO("kr=KERN_OPERATION_TIMED_OUT (ETIMEDOUT)")
;
+
name = "kr=KERN_OPERATION_TIMED_OUT (ETIMEDOUT)"
;
break;
default:
break;
default:
-
XBT_INFO("kr=default case (EINVAL)")
;
+
name = "kr=default case (EINVAL)"
;
}
}
+ std::perror("mach_vm_region failed");
+ std::fprintf(stderr, "Cannot request authorization for kernel information access (kr=%d ; %s)\n", (int)kr, name);
abort();
}
abort();
}
@@
-202,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. */
#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);
std::ifstream fp;
fp.rdbuf()->pubsetbuf(nullptr, 0);
fp.open(path);
@@
-418,5
+418,4
@@
std::vector<VmMap> get_memory_map(pid_t pid)
return ret;
}
return ret;
}
-}
-}
+} // namespace simgrid::xbt