-/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-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. */
#undef NDEBUG
#endif
-#include <mc/mc.h>
+#include <simgrid/s4u/Engine.hpp>
-#include "mc/datatypes.h"
+#include "src/mc/datatypes.h"
+#include "src/mc/mc.h"
#include "src/mc/mc_private.hpp"
#include "src/mc/inspect/ObjectInformation.hpp"
#include "src/mc/inspect/Type.hpp"
#include "src/mc/inspect/Variable.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/sosp/RemoteProcessMemory.hpp"
#include <cassert>
#include <cstring>
-// Test broken with multi-dimensional arrays. See https://sourceware.org/bugzilla/show_bug.cgi?id=22546
-// int test_some_array[4][5][6];
+#include <elfutils/version.h>
+#if _ELFUTILS_VERSION < 171
+// Elder elfutils/libdw broken with multi-dimensional arrays. See https://sourceware.org/bugzilla/show_bug.cgi?id=22546
int test_some_array[4 * 5 * 6];
+#else
+int test_some_array[4][5][6];
+#endif
+
struct some_struct {
int first;
int second[4][5];
static simgrid::mc::Frame* find_function_by_name(
simgrid::mc::ObjectInformation* info, const char* name)
{
- for (auto& entry : info->subprograms)
- if(entry.second.name == name)
- return &entry.second;
+ for (auto& [_, entry] : info->subprograms)
+ if (entry.name == name)
+ return &entry;
return nullptr;
}
return nullptr;
}
-static void test_local_variable(simgrid::mc::ObjectInformation* info, const char* function, const char* variable, void* address, unw_cursor_t* cursor) {
+static void test_local_variable(simgrid::mc::ObjectInformation* info, const char* function, const char* variable,
+ const void* address, unw_cursor_t* cursor)
+{
simgrid::mc::Frame* subprogram = find_function_by_name(info, function);
assert(subprogram);
// TODO, Lookup frame by IP and test against name instead
- simgrid::mc::Variable* var = find_local_variable(subprogram, variable);
+ const simgrid::mc::Variable* var = find_local_variable(subprogram, variable);
assert(var);
void* frame_base = subprogram->frame_base(*cursor);
xbt_assert(location.address() == address, "Bad resolution of local variable %s of %s", variable, function);
}
-static const simgrid::mc::Variable* test_global_variable(simgrid::mc::RemoteClient& process,
+static const simgrid::mc::Variable* test_global_variable(const simgrid::mc::RemoteProcessMemory& process,
simgrid::mc::ObjectInformation* info, const char* name,
void* address, long byte_size)
{
auto i = process.binary_info->types.find(variable->type_id);
xbt_assert(i != process.binary_info->types.end(), "Missing type for %s", name);
- simgrid::mc::Type* type = &i->second;
+ const simgrid::mc::Type* type = &i->second;
xbt_assert(type->byte_size == byte_size, "Byte size mismatch for %s", name);
return variable;
}
int i;
};
-static void test_type_by_name(simgrid::mc::RemoteClient& process, s_foo /*my_foo*/)
+static void test_type_by_name(const simgrid::mc::RemoteProcessMemory& process, s_foo /*my_foo*/)
{
assert(process.binary_info->full_types_by_name.find("struct s_foo") != process.binary_info->full_types_by_name.end());
}
int main(int argc, char** argv)
{
- SIMIX_global_init(&argc, argv);
+ simgrid::s4u::Engine::get_instance(&argc, argv);
const simgrid::mc::Variable* var;
simgrid::mc::Type* type;
- simgrid::mc::RemoteClient process(getpid(), -1);
- process.init();
+ simgrid::mc::RemoteProcessMemory process(getpid(), nullptr);
test_global_variable(process, process.binary_info.get(), "some_local_variable", &some_local_variable, sizeof(int));