a few more smells

[simgrid.git] / teshsuite / mc / dwarf / dwarf.cpp

diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp
index 09ad40e..fca03b1 100644 (file)
--- a/teshsuite/mc/dwarf/dwarf.cpp
+++ b/teshsuite/mc/dwarf/dwarf.cpp
@@ -22,7 +22,10 @@
 #include "src/mc/Variable.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)
 {
@@ -70,12 +73,8 @@ static void test_local_variable(simgrid::mc::ObjectInformation* info, const char
   simgrid::dwarf::Location location = simgrid::dwarf::resolve(
     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);
-
+  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(
@@ -84,12 +83,10 @@ static simgrid::mc::Variable* test_global_variable(
 {
   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);
@@ -112,9 +109,7 @@ typedef struct foo {int i;} s_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());
+  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)
@@ -127,28 +122,26 @@ int main(int argc, char** argv)
   simgrid::mc::Process 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;
@@ -157,11 +150,8 @@ 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;
   test_type_by_name(process, my_foo);