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
Implement I/O as asynchronous activities
[simgrid.git]
/
src
/
mc
/
LocationList.hpp
diff --git
a/src/mc/LocationList.hpp
b/src/mc/LocationList.hpp
index
2a8bdba
..
9eec0b1
100644
(file)
--- a/
src/mc/LocationList.hpp
+++ b/
src/mc/LocationList.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2018. 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. */
/* 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. */
@@
-7,40
+6,35
@@
#ifndef SIMGRID_MC_OBJECT_LOCATION_H
#define SIMGRID_MC_OBJECT_LOCATION_H
#ifndef SIMGRID_MC_OBJECT_LOCATION_H
#define SIMGRID_MC_OBJECT_LOCATION_H
-#include <cstdint>
-
-#include <vector>
-
-#include <libunwind.h>
-#include <dwarf.h>
-#include <elfutils/libdw.h>
-
-#include <xbt/base.h>
-#include <xbt/range.hpp>
+#include "xbt/base.h"
+#include "xbt/range.hpp"
#include "src/mc/mc_base.h"
#include "src/mc/mc_forward.hpp"
#include "src/mc/mc_base.h"
#include "src/mc/mc_forward.hpp"
-#include "src/mc/AddressSpace.hpp"
#include "src/mc/DwarfExpression.hpp"
#include "src/mc/DwarfExpression.hpp"
+#include <cstdint>
+#include <vector>
+
namespace simgrid {
namespace dwarf {
namespace simgrid {
namespace dwarf {
-/**
\brief A DWARF expression with optional validity con
traints */
+/**
A DWARF expression with optional validity cons
traints */
class LocationListEntry {
public:
class LocationListEntry {
public:
- typedef simgrid::xbt::
r
ange<std::uint64_t> range_type;
+ typedef simgrid::xbt::
R
ange<std::uint64_t> range_type;
private:
DwarfExpression expression_;
private:
DwarfExpression expression_;
+ // By default, the expression is always valid:
range_type range_ = {0, UINT64_MAX};
public:
range_type range_ = {0, UINT64_MAX};
public:
- LocationListEntry()
{}
+ LocationListEntry()
= default;
LocationListEntry(DwarfExpression expression, range_type range)
: expression_(std::move(expression)), range_(range)
{}
LocationListEntry(DwarfExpression expression, range_type range)
: expression_(std::move(expression)), range_(range)
{}
-
LocationListEntry(DwarfExpression expression
)
- : expression_(std::move(expression)), range_({0, UINT64_MAX})
-
{
}
+
explicit LocationListEntry(DwarfExpression expression) : expression_(std::move(expression)), range_({0, UINT64_MAX}
)
+ {
+ }
DwarfExpression& expression()
{
DwarfExpression& expression()
{
@@
-65,11
+59,11
@@
typedef std::vector<LocationListEntry> LocationList;
class Location {
private:
void* memory_;
class Location {
private:
void* memory_;
- int register_id_;
+ int register_id_ = 0;
+
public:
public:
- Location(void* x) :memory_(x) {}
- Location(int register_id) :
- memory_(nullptr), register_id_(register_id) {}
+ explicit Location(void* x) : memory_(x) {}
+ explicit Location(int register_id) : memory_(nullptr), register_id_(register_id) {}
// Type of location:
bool in_register() const { return memory_ == nullptr; }
bool in_memory() const { return memory_ != nullptr; }
// Type of location:
bool in_register() const { return memory_ == nullptr; }
bool in_memory() const { return memory_ != nullptr; }