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
[mc] Efficient lookup of subprogram by offset
[simgrid.git]
/
testsuite
/
mc
/
dwarf.c
diff --git
a/testsuite/mc/dwarf.c
b/testsuite/mc/dwarf.c
index
1d8ac45
..
fc85de4
100644
(file)
--- a/
testsuite/mc/dwarf.c
+++ b/
testsuite/mc/dwarf.c
@@
-38,9
+38,10
@@
static dw_variable_t find_global_variable_by_name(mc_object_info_t info, const c
}
static dw_frame_t find_function_by_name(mc_object_info_t info, const char* name) {
}
static dw_frame_t find_function_by_name(mc_object_info_t info, const char* name) {
-
unsigned in
t cursor = 0;
+
xbt_dict_cursor_
t cursor = 0;
dw_frame_t subprogram;
dw_frame_t subprogram;
- xbt_dynar_foreach(info->subprograms, cursor, subprogram){
+ char* key;
+ xbt_dict_foreach(info->subprograms, cursor, key, subprogram){
if(!strcmp(name, subprogram->name))
return subprogram;
}
if(!strcmp(name, subprogram->name))
return subprogram;
}
@@
-59,7
+60,7
@@
static dw_variable_t find_local_variable(dw_frame_t frame, const char* argument_
return NULL;
}
return NULL;
}
-static void test_local_
argument
(mc_object_info_t info, const char* function, const char* variable, void* address, unw_cursor_t* cursor) {
+static void test_local_
variable
(mc_object_info_t info, const char* function, const char* variable, void* address, unw_cursor_t* cursor) {
dw_frame_t subprogram = find_function_by_name(info, function);
assert(subprogram);
// TODO, Lookup frame by IP and test against name instead
dw_frame_t subprogram = find_function_by_name(info, function);
assert(subprogram);
// TODO, Lookup frame by IP and test against name instead
@@
-68,7
+69,8
@@
static void test_local_argument(mc_object_info_t info, const char* function, con
assert(var);
void* frame_base = mc_find_frame_base(subprogram, cursor);
assert(var);
void* frame_base = mc_find_frame_base(subprogram, cursor);
- assert((void*)mc_dwarf_resolve_locations(&var->locations, cursor, frame_base) == address);
+ xbt_assert((void*)mc_dwarf_resolve_locations(&var->locations, cursor, frame_base, NULL) == address,
+ "Bad resolution of local variable %s of %s", variable, function);
}
}
@@
-86,7
+88,7
@@
static dw_variable_t test_global_variable(mc_object_info_t info, const char* nam
return variable;
}
return variable;
}
-static dw_type_t find_
type
(mc_object_info_t info, const char* name, dw_type_t type) {
+static dw_type_t find_
member
(mc_object_info_t info, const char* name, dw_type_t type) {
unsigned int cursor = 0;
dw_type_t member;
xbt_dynar_foreach(type->members, cursor, member){
unsigned int cursor = 0;
dw_type_t member;
xbt_dynar_foreach(type->members, cursor, member){
@@
-98,6
+100,12
@@
static dw_type_t find_type(mc_object_info_t info, const char* name, dw_type_t ty
int some_local_variable = 0;
int some_local_variable = 0;
+typedef struct foo {int i;} s_foo;
+
+static void test_type_by_name(s_foo my_foo) {
+ assert(xbt_dict_get_or_null(mc_binary_info->full_types_by_name, "struct foo"));
+}
+
int main(int argc, char** argv) {
// xbt_init(&argc, argv);
int main(int argc, char** argv) {
// xbt_init(&argc, argv);
@@
-116,8
+124,8
@@
int main(int argc, char** argv) {
var = test_global_variable(mc_binary_info, "test_some_struct", &test_some_struct, sizeof(test_some_struct));
type = xbt_dict_get_or_null(mc_binary_info->types, var->type_origin);
var = test_global_variable(mc_binary_info, "test_some_struct", &test_some_struct, sizeof(test_some_struct));
type = xbt_dict_get_or_null(mc_binary_info->types, var->type_origin);
- assert(find_
type
(mc_binary_info, "first", type)->offset == 0);
- assert(find_
type
(mc_binary_info, "second", type)->offset
+ assert(find_
member
(mc_binary_info, "first", type)->offset == 0);
+ assert(find_
member
(mc_binary_info, "second", type)->offset
== ((const char*)&test_some_struct.second) - (const char*)&test_some_struct);
unw_context_t context;
== ((const char*)&test_some_struct.second) - (const char*)&test_some_struct);
unw_context_t context;
@@
-125,7
+133,10
@@
int main(int argc, char** argv) {
unw_getcontext(&context);
unw_init_local(&cursor, &context);
unw_getcontext(&context);
unw_init_local(&cursor, &context);
- test_local_argument(mc_binary_info, "main", "argc", &argc, &cursor);
+ test_local_variable(mc_binary_info, "main", "argc", &argc, &cursor);
+
+ s_foo my_foo;
+ test_type_by_name(my_foo);
_exit(0);
}
_exit(0);
}