Ahem. You mean I need to actually compile with MC after moving files?

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

diff --git a/teshsuite/mc/dwarf/dwarf.cpp b/teshsuite/mc/dwarf/dwarf.cpp
index fca03b1..da8102f 100644 (file)
--- a/teshsuite/mc/dwarf/dwarf.cpp
+++ b/teshsuite/mc/dwarf/dwarf.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2014-2019. 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. */
@@ -8,32 +7,27 @@
 #undef NDEBUG
 #endif
 
-#include <string.h>
-#include <assert.h>
-
 #include <mc/mc.h>
 
 #include "mc/datatypes.h"
-#include "src/mc/mc_private.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/Process.hpp"
-#include "src/mc/Type.hpp"
-#include "src/mc/ObjectInformation.hpp"
-#include "src/mc/Variable.hpp"
+#include <cassert>
+#include <cstring>
 
-int test_some_array[4][5][6];
+// Test broken with multi-dimensional arrays. See https://sourceware.org/bugzilla/show_bug.cgi?id=22546
+// int test_some_array[4][5][6];
+int test_some_array[4 * 5 * 6];
 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)
-{
-  for (auto& entry : info->types)
-    if(entry.second.name == name)
-      return &entry.second;
-  return nullptr;
-}
+};
+some_struct test_some_struct;
 
 static simgrid::mc::Frame* find_function_by_name(
     simgrid::mc::ObjectInformation* info, const char* name)
@@ -77,11 +71,11 @@ static void test_local_variable(simgrid::mc::ObjectInformation* info, const char
   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 const 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);
+  const 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->global, "Variable %s is not global", name);
@@ -91,7 +85,7 @@ static simgrid::mc::Variable* test_global_variable(
   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);
+  xbt_assert(type->byte_size == byte_size, "Byte size mismatch for %s", name);
   return variable;
 }
 
@@ -105,21 +99,23 @@ static simgrid::mc::Member* find_member(simgrid::mc::Type& type, const char* nam
 
 int some_local_variable = 0;
 
-typedef struct foo {int i;} s_foo;
+struct s_foo {
+  int i;
+};
 
-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 s_foo") != process.binary_info->full_types_by_name.end());
 }
 
 int main(int argc, char** argv)
 {
   SIMIX_global_init(&argc, argv);
 
-  simgrid::mc::Variable* var;
+  const 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));
@@ -153,8 +149,8 @@ int main(int argc, char** argv)
   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);
+  return 0;
 }