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
exclude lib for mc on freebsd
[simgrid.git]
/
src
/
mc
/
remote
/
RemoteSimulation.cpp
diff --git
a/src/mc/remote/RemoteSimulation.cpp
b/src/mc/remote/RemoteSimulation.cpp
index
a293fb5
..
b9abdbe
100644
(file)
--- a/
src/mc/remote/RemoteSimulation.cpp
+++ b/
src/mc/remote/RemoteSimulation.cpp
@@
-16,6
+16,8
@@
#include <libunwind-ptrace.h>
#include <sys/mman.h> // PROT_*
#include <libunwind-ptrace.h>
#include <sys/mman.h> // PROT_*
+#include <memory>
+
using simgrid::mc::remote;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc, "MC process information");
using simgrid::mc::remote;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc, "MC process information");
@@
-47,13
+49,19
@@
static const std::vector<std::string> filtered_libraries = {
"libboost_system",
"libboost_thread",
"libboost_timer",
"libboost_system",
"libboost_thread",
"libboost_timer",
+ "libbrotlicommon",
+ "libbrotlidec",
"libbz2",
"libc",
"libc++",
"libcdt",
"libcgraph",
"libbz2",
"libc",
"libc++",
"libcdt",
"libcgraph",
+ "libcom_err",
+ "libcrypt",
"libcrypto",
"libcrypto",
+ "libcurl",
"libcxxrt",
"libcxxrt",
+ "libdebuginfod",
"libdl",
"libdw",
"libelf",
"libdl",
"libdw",
"libelf",
@@
-63,53
+71,49
@@
static const std::vector<std::string> filtered_libraries = {
"libflangrti",
"libgcc_s",
"libgfortran",
"libflangrti",
"libgcc_s",
"libgfortran",
+ "libgssapi_krb5",
+ "libidn2",
"libimf",
"libintlc",
"libirng",
"libimf",
"libintlc",
"libirng",
+ "libk5crypto",
+ "libkeyutils",
+ "libkrb5",
+ "libkrb5support", /*odd behaviour on fedora rawhide ... remove these when fixed*/
+ "liblber",
+ "libldap",
"liblua5.1",
"liblua5.3",
"liblzma",
"libm",
"liblua5.1",
"liblua5.3",
"liblzma",
"libm",
+ "libmd",
+ "libnghttp2",
"libomp",
"libpapi",
"libpcre2",
"libpfm",
"libpgmath",
"libomp",
"libpapi",
"libpcre2",
"libpfm",
"libpgmath",
+ "libpsl",
"libpthread",
"libquadmath",
"libpthread",
"libquadmath",
+ "libresolv",
"librt",
"librt",
+ "libsasl2",
+ "libselinux",
+ "libssh",
+ "libssh2",
+ "libssl",
"libstdc++",
"libsvml",
"libtsan", /* gcc sanitizers */
"libubsan", /* gcc sanitizers */
"libstdc++",
"libsvml",
"libtsan", /* gcc sanitizers */
"libubsan", /* gcc sanitizers */
+ "libunistring",
"libunwind",
"libunwind-ptrace",
"libunwind-x86",
"libunwind-x86_64",
"libz",
"libunwind",
"libunwind-ptrace",
"libunwind-x86",
"libunwind-x86_64",
"libz",
- "libkrb5support", /*odd behaviour on fedora rawhide ... remove these when fixed*/
- "libkeyutils",
- "libunistring",
- "libbrotlidec",
- "liblber",
- "libldap",
- "libcom_err",
- "libk5crypto",
- "libkrb5",
- "libgssapi_krb5",
- "libssl",
- "libpsl",
- "libssh",
- "libssh2",
- "libidn2",
- "libnghttp2",
- "libcurl",
- "libdebuginfod",
- "libbrotlicommon",
- "libsasl2",
- "libresolv",
- "libcrypt",
- "libselinux"};
+ "libzstd"};
static bool is_simgrid_lib(const std::string& libname)
{
static bool is_simgrid_lib(const std::string& libname)
{
@@
-145,7
+149,7
@@
static std::string get_lib_name(const std::string& pathname)
static ssize_t pread_whole(int fd, void* buf, size_t count, off_t offset)
{
static ssize_t pread_whole(int fd, void* buf, size_t count, off_t offset)
{
-
char* buffer = (char*)buf
;
+
auto* buffer = static_cast<char*>(buf)
;
ssize_t real_count = count;
while (count) {
ssize_t res = pread(fd, buffer, count, offset);
ssize_t real_count = count;
while (count) {
ssize_t res = pread(fd, buffer, count, offset);
@@
-165,7
+169,7
@@
static ssize_t pread_whole(int fd, void* buf, size_t count, off_t offset)
static ssize_t pwrite_whole(int fd, const void* buf, size_t count, off_t offset)
{
static ssize_t pwrite_whole(int fd, const void* buf, size_t count, off_t offset)
{
- const
char* buffer = (const char*)buf
;
+ const
auto* buffer = static_cast<const char*>(buf)
;
ssize_t real_count = count;
while (count) {
ssize_t res = pwrite(fd, buffer, count, offset);
ssize_t real_count = count;
while (count) {
ssize_t res = pwrite(fd, buffer, count, offset);
@@
-258,7
+262,7
@@
void RemoteSimulation::refresh_heap()
{
// Read/dereference/refresh the std_heap pointer:
if (not this->heap)
{
// Read/dereference/refresh the std_heap pointer:
if (not this->heap)
- this->heap
.reset(new s_xbt_mheap_t()
);
+ this->heap
= std::make_unique<s_xbt_mheap_t>(
);
this->read_bytes(this->heap.get(), sizeof(mdesc), remote(this->heap_address));
this->cache_flags_ |= RemoteSimulation::cache_heap;
}
this->read_bytes(this->heap.get(), sizeof(mdesc), remote(this->heap_address));
this->cache_flags_ |= RemoteSimulation::cache_heap;
}