X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/336a8849b0b57d576c5772a217ad13d0b8c9cc42..d4e519ed897e99d8092344ffef66710ccd7f6297:/teshsuite/mc/dwarf/dwarf.cpp diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp index 83862c4c16..02c26eac9c 100644 --- a/teshsuite/mc/dwarf/dwarf.cpp +++ b/teshsuite/mc/dwarf/dwarf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. +/* Copyright (c) 2014-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,22 +8,24 @@ #undef NDEBUG #endif -#include -#include +#include +#include #include #include "mc/datatypes.h" -#include "src/mc/mc_object_info.h" #include "src/mc/mc_private.h" -#include "src/mc/Process.hpp" -#include "src/mc/Type.hpp" #include "src/mc/ObjectInformation.hpp" +#include "src/mc/Type.hpp" #include "src/mc/Variable.hpp" +#include "src/mc/remote/RemoteClient.hpp" int test_some_array[4][5][6]; -struct some_struct { int first; int second[4][5]; } test_some_struct; +struct some_struct { + int first; + int second[4][5]; +} test_some_struct; static simgrid::mc::Type* find_type_by_name(simgrid::mc::ObjectInformation* info, const char* name) { @@ -69,28 +71,22 @@ static void test_local_variable(simgrid::mc::ObjectInformation* info, const char void* frame_base = subprogram->frame_base(*cursor); simgrid::dwarf::Location location = simgrid::dwarf::resolve( - var->location_list, info, cursor, frame_base, NULL, -1); - - xbt_assert(location.in_memory(), - "Expected the variable %s of function %s to be in memory", - variable, function); - xbt_assert(location.address() == address, - "Bad resolution of local variable %s of %s", variable, function); + var->location_list, info, cursor, frame_base, nullptr, -1); + xbt_assert(location.in_memory(), "Expected the variable %s of function %s to be in memory", variable, function); + xbt_assert(location.address() == address, "Bad resolution of local variable %s of %s", variable, function); } -static simgrid::mc::Variable* test_global_variable( - simgrid::mc::Process& process, simgrid::mc::ObjectInformation* info, - const char* name, void* address, long byte_size) +static simgrid::mc::Variable* test_global_variable(simgrid::mc::RemoteClient& process, + simgrid::mc::ObjectInformation* info, const char* name, + void* address, long byte_size) { simgrid::mc::Variable* variable = info->find_variable(name); xbt_assert(variable, "Global variable %s was not found", name); - xbt_assert(variable->name == name, - "Name mismatch for %s", name); + xbt_assert(variable->name == name, "Name mismatch for %s", name); xbt_assert(variable->global, "Variable %s is not global", name); - xbt_assert(variable->address == address, - "Address mismatch for %s : %p expected but %p found", - name, address, variable->address); + xbt_assert(variable->address == address, "Address mismatch for %s : %p expected but %p found", name, address, + variable->address); auto i = process.binary_info->types.find(variable->type_id); xbt_assert(i != process.binary_info->types.end(), "Missing type for %s", name); @@ -111,11 +107,9 @@ int some_local_variable = 0; typedef struct foo {int i;} s_foo; -static void test_type_by_name(simgrid::mc::Process& process, s_foo my_foo) +static void test_type_by_name(simgrid::mc::RemoteClient& process, s_foo my_foo) { - assert( - process.binary_info->full_types_by_name.find("struct foo") != - process.binary_info->full_types_by_name.end()); + assert(process.binary_info->full_types_by_name.find("struct foo") != process.binary_info->full_types_by_name.end()); } int main(int argc, char** argv) @@ -125,31 +119,29 @@ int main(int argc, char** argv) simgrid::mc::Variable* var; simgrid::mc::Type* type; - simgrid::mc::Process process(getpid(), -1); + simgrid::mc::RemoteClient process(getpid(), -1); process.init(); - test_global_variable(process, process.binary_info.get(), - "some_local_variable", &some_local_variable, sizeof(int)); + test_global_variable(process, process.binary_info.get(), "some_local_variable", &some_local_variable, sizeof(int)); - var = test_global_variable(process, process.binary_info.get(), - "test_some_array", &test_some_array, sizeof(test_some_array)); + var = test_global_variable(process, process.binary_info.get(), "test_some_array", &test_some_array, + sizeof(test_some_array)); auto i = process.binary_info->types.find(var->type_id); xbt_assert(i != process.binary_info->types.end(), "Missing type"); type = &i->second; - xbt_assert(type->element_count == 6*5*4, - "element_count mismatch in test_some_array : %i / %i", - type->element_count, 6*5*4); + xbt_assert(type->element_count == 6 * 5 * 4, "element_count mismatch in test_some_array : %i / %i", + type->element_count, 6 * 5 * 4); - var = test_global_variable(process, process.binary_info.get(), - "test_some_struct", &test_some_struct, sizeof(test_some_struct)); + var = test_global_variable(process, process.binary_info.get(), "test_some_struct", &test_some_struct, + sizeof(test_some_struct)); i = process.binary_info->types.find(var->type_id); xbt_assert(i != process.binary_info->types.end(), "Missing type"); type = &i->second; assert(type); assert(find_member(*type, "first")->offset() == 0); - assert(find_member(*type, "second")->offset() - == ((const char*)&test_some_struct.second) - (const char*)&test_some_struct); + assert(find_member(*type, "second")->offset() == + ((const char*)&test_some_struct.second) - (const char*)&test_some_struct); unw_context_t context; unw_cursor_t cursor; @@ -158,13 +150,10 @@ int main(int argc, char** argv) test_local_variable(process.binary_info.get(), "main", "argc", &argc, &cursor); - { - int lexical_block_variable = 50; - test_local_variable(process.binary_info.get(), "main", - "lexical_block_variable", &lexical_block_variable, &cursor); - } + int lexical_block_variable = 50; + test_local_variable(process.binary_info.get(), "main", "lexical_block_variable", &lexical_block_variable, &cursor); - s_foo my_foo; + s_foo my_foo = {0}; test_type_by_name(process, my_foo); _exit(0);