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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
Process.cpp
diff --git
a/src/mc/Process.cpp
b/src/mc/Process.cpp
index
f9099a2
..
3f06a40
100644
(file)
--- a/
src/mc/Process.cpp
+++ b/
src/mc/Process.cpp
@@
-201,7
+201,7
@@
int open_vm(pid_t pid, int flags)
// ***** Process
Process::Process(pid_t pid, int sockfd) :
// ***** Process
Process::Process(pid_t pid, int sockfd) :
- AddressSpace(this),
pid_(pid), socket
_(sockfd), running_(true)
+ AddressSpace(this),
pid_(pid), channel
_(sockfd), running_(true)
{}
void Process::init()
{}
void Process::init()
@@
-233,12
+233,6
@@
void Process::init()
Process::~Process()
{
Process::~Process()
{
- if (this->socket_ >= 0 && close(this->socket_) < 0)
- xbt_die("Could not close communication socket");
-
- this->maestro_stack_start_ = nullptr;
- this->maestro_stack_end_ = nullptr;
-
if (this->memory_file >= 0)
close(this->memory_file);
if (this->memory_file >= 0)
close(this->memory_file);
@@
-246,13
+240,8
@@
Process::~Process()
unw_destroy_addr_space(this->unw_underlying_addr_space);
_UPT_destroy(this->unw_underlying_context);
}
unw_destroy_addr_space(this->unw_underlying_addr_space);
_UPT_destroy(this->unw_underlying_context);
}
- this->unw_underlying_context = nullptr;
- this->unw_underlying_addr_space = nullptr;
unw_destroy_addr_space(this->unw_addr_space);
unw_destroy_addr_space(this->unw_addr_space);
- this->unw_addr_space = nullptr;
-
- this->cache_flags = MC_PROCESS_CACHE_FLAG_NONE;
if (this->clear_refs_fd_ >= 0)
close(this->clear_refs_fd_);
if (this->clear_refs_fd_ >= 0)
close(this->clear_refs_fd_);