-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <string.h>
#include <assert.h>
-#include <xbt.h>
#include <mc/mc.h>
-#include "../../src/include/mc/datatypes.h"
-#include "../../src/mc/mc_object_info.h"
-#include "../../src/mc/mc_private.h"
+#include "mc/datatypes.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/Variable.hpp"
int test_some_array[4][5][6];
struct some_struct { int first; int second[4][5]; } test_some_struct;
-static mc_type_t find_type_by_name(mc_object_info_t info, const char* name) {
- xbt_dict_cursor_t cursor = NULL;
- char *key;
- mc_type_t type;
- xbt_dict_foreach(info->types, cursor, key, type)
- if(type->name == name)
- return type;
- return NULL;
+static simgrid::mc::Type* find_type_by_name(simgrid::mc::ObjectInformation* info, const char* name)
+{
+ for (auto& entry : info->types)
+ if(entry.second.name == name)
+ return &entry.second;
+ return nullptr;
}
-static mc_frame_t find_function_by_name(
- mc_object_info_t info, const char* name)
+static simgrid::mc::Frame* find_function_by_name(
+ simgrid::mc::ObjectInformation* info, const char* name)
{
- xbt_dict_cursor_t cursor = 0;
- mc_frame_t subprogram;
- char* key;
- xbt_dict_foreach(info->subprograms, cursor, key, subprogram)
- if(subprogram->name == name)
- return subprogram;
+ for (auto& entry : info->subprograms)
+ if(entry.second.name == name)
+ return &entry.second;
return nullptr;
}
-static mc_variable_t find_local_variable(
- mc_frame_t frame, const char* argument_name)
+static simgrid::mc::Variable* find_local_variable(
+ simgrid::mc::Frame* frame, const char* argument_name)
{
for (simgrid::mc::Variable& variable : frame->variables)
if(argument_name == variable.name)
return nullptr;
}
-static void test_local_variable(mc_object_info_t info, const char* function, const char* variable, void* address, unw_cursor_t* cursor) {
- mc_frame_t subprogram = find_function_by_name(info, function);
+static void test_local_variable(simgrid::mc::ObjectInformation* info, const char* function, const char* variable, 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
- mc_variable_t var = find_local_variable(subprogram, variable);
+ simgrid::mc::Variable* var = find_local_variable(subprogram, variable);
assert(var);
- void* frame_base = mc_find_frame_base(subprogram, info, cursor);
- s_mc_location_t location;
-
- mc_dwarf_resolve_locations(&location,
- &var->location_list, info, cursor, frame_base, NULL, -1);
-
- xbt_assert(mc_get_location_type(&location)==MC_LOCATION_TYPE_ADDRESS,
- "Unexpected location type for variable %s of %s", variable, function);
+ void* frame_base = subprogram->frame_base(*cursor);
+ simgrid::dwarf::Location location = simgrid::dwarf::resolve(
+ var->location_list, info, cursor, frame_base, nullptr, -1);
- xbt_assert(location.memory_location == address,
+ 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 mc_variable_t test_global_variable(mc_process_t process, mc_object_info_t info, const char* name, void* address, long byte_size) {
-
- mc_variable_t variable = info->find_variable(name);
+static simgrid::mc::Variable* test_global_variable(
+ simgrid::mc::Process& 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);
"Address mismatch for %s : %p expected but %p found",
name, address, variable->address);
- mc_type_t type = (mc_type_t) xbt_dict_get_or_null(
- process->binary_info->types, variable->type_id.c_str());
- xbt_assert(type!=NULL, "Missing type for %s", name);
+ 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;
xbt_assert(type->byte_size = byte_size, "Byte size mismatch for %s", name);
return variable;
}
-static mc_type_t find_member(mc_object_info_t info, const char* name, mc_type_t type)
+static simgrid::mc::Member* find_member(simgrid::mc::Type& type, const char* name)
{
- for (simgrid::mc::Type& member : type->members)
+ for (simgrid::mc::Member& member : type.members)
if(member.name == name)
return &member;
return nullptr;
typedef struct foo {int i;} s_foo;
-static void test_type_by_name(mc_process_t process, s_foo my_foo) {
- assert(xbt_dict_get_or_null(process->binary_info->full_types_by_name, "struct foo"));
+static void test_type_by_name(simgrid::mc::Process& process, s_foo my_foo)
+{
+ 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)
{
SIMIX_global_init(&argc, argv);
- mc_variable_t var;
- mc_type_t type;
+ simgrid::mc::Variable* var;
+ simgrid::mc::Type* type;
- s_mc_process_t p(getpid(), -1);
- mc_process_t process = &p;
+ simgrid::mc::Process process(getpid(), -1);
+ process.init();
- test_global_variable(process, process->binary_info.get(),
+ 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(),
+ var = test_global_variable(process, process.binary_info.get(),
"test_some_array", &test_some_array, sizeof(test_some_array));
- type = (mc_type_t) xbt_dict_get_or_null(
- process->binary_info->types, var->type_id.c_str());
- 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(),
+ 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);
+
+ var = test_global_variable(process, process.binary_info.get(),
"test_some_struct", &test_some_struct, sizeof(test_some_struct));
- type = (mc_type_t) xbt_dict_get_or_null(
- process->binary_info->types, var->type_id.c_str());
- assert(find_member(process->binary_info.get(), "first", type)->offset() == 0);
- assert(find_member(process->binary_info.get(), "second", type)->offset()
+ 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);
unw_context_t context;
unw_getcontext(&context);
unw_init_local(&cursor, &context);
- test_local_variable(process->binary_info.get(), "main", "argc", &argc, &cursor);
+ test_local_variable(process.binary_info.get(), "main", "argc", &argc, &cursor);
{
int lexical_block_variable = 50;
- test_local_variable(process->binary_info.get(), "main",
+ test_local_variable(process.binary_info.get(), "main",
"lexical_block_variable", &lexical_block_variable, &cursor);
}
