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] Fix constness issue in MC_make_functions_index()
[simgrid.git]
/
src
/
mc
/
mc_dwarf.cpp
diff --git
a/src/mc/mc_dwarf.cpp
b/src/mc/mc_dwarf.cpp
index
0b0e2e4
..
37b97da
100644
(file)
--- a/
src/mc/mc_dwarf.cpp
+++ b/
src/mc/mc_dwarf.cpp
@@
-23,6
+23,10
@@
#include "mc_object_info.h"
#include "mc_private.h"
#include "mc_object_info.h"
#include "mc_private.h"
+#include "mc_process.h"
+
+#include "mc/ObjectInformation.hpp"
+#include "mc/Variable.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dwarf, mc, "DWARF processing");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dwarf, mc, "DWARF processing");
@@
-610,14
+614,11
@@
static simgrid::mc::Type MC_dwarf_die_to_type(
Dwarf_Die * unit, simgrid::mc::Frame* frame,
const char *ns)
{
Dwarf_Die * unit, simgrid::mc::Frame* frame,
const char *ns)
{
-
simgrid::mc::Type type;
simgrid::mc::Type type;
- type.type =
-1
;
+ type.type =
dwarf_tag(die)
;
type.name = std::string();
type.element_count = -1;
type.name = std::string();
type.element_count = -1;
- type.type = dwarf_tag(die);
-
// Global Offset
type.id = dwarf_dieoffset(die);
// Global Offset
type.id = dwarf_dieoffset(die);
@@
-1058,8
+1059,8
@@
static void MC_make_functions_index(simgrid::mc::ObjectInformation* info)
// Sort the array by low_pc:
std::sort(info->functions_index.begin(), info->functions_index.end(),
// Sort the array by low_pc:
std::sort(info->functions_index.begin(), info->functions_index.end(),
- [](simgrid::mc::FunctionIndexEntry& a,
- simgrid::mc::FunctionIndexEntry& b)
+ [](simgrid::mc::FunctionIndexEntry
const
& a,
+ simgrid::mc::FunctionIndexEntry
const
& b)
{
return a.low_pc < b.low_pc;
});
{
return a.low_pc < b.low_pc;
});
@@
-1141,7
+1142,7
@@
std::shared_ptr<simgrid::mc::ObjectInformation> MC_find_object_info(
std::shared_ptr<simgrid::mc::ObjectInformation> result =
std::make_shared<simgrid::mc::ObjectInformation>();
if (executable)
std::shared_ptr<simgrid::mc::ObjectInformation> result =
std::make_shared<simgrid::mc::ObjectInformation>();
if (executable)
- result->flags |=
MC_OBJECT_INFO_EXECUTABLE
;
+ result->flags |=
simgrid::mc::ObjectInformation::Executable
;
result->file_name = name;
MC_find_object_address(maps, result.get());
MC_dwarf_get_variables(result.get());
result->file_name = name;
MC_find_object_address(maps, result.get());
MC_dwarf_get_variables(result.get());