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
MSG_process_ref/unref: allow to fiddle with the process refcounting
[simgrid.git]
/
src
/
msg
/
instr_msg_process.cpp
diff --git
a/src/msg/instr_msg_process.cpp
b/src/msg/instr_msg_process.cpp
index
db86216
..
6243a29
100644
(file)
--- a/
src/msg/instr_msg_process.cpp
+++ b/
src/msg/instr_msg_process.cpp
@@
-1,17
+1,18
@@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010, 2012-2016. 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. */
-#include "msg_private.h"
-#include "src/simix/smx_process_private.h"
+#include "simgrid/s4u/host.hpp"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
+#include "src/simix/ActorImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
char *instr_process_id (msg_process_t proc, char *str, int len)
{
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
char *instr_process_id (msg_process_t proc, char *str, int len)
{
- return instr_process_id_2 (proc->name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
+ return instr_process_id_2 (proc->name
.c_str()
, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
}
char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
}
char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
@@
-58,7
+59,7
@@
void TRACE_msg_process_create (const char *process_name, int process_pid, msg_ho
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t host_container = PJ_container_get
(SIMIX_host_get_name(host
));
+ container_t host_container = PJ_container_get
(host->cname(
));
PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
}
}
PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
}
}
@@
-81,7
+82,7
@@
void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t proc
{
if (TRACE_msg_process_is_enabled() && status==SMX_EXIT_FAILURE){
//kill means that this process no longer exists, let's destroy it
{
if (TRACE_msg_process_is_enabled() && status==SMX_EXIT_FAILURE){
//kill means that this process no longer exists, let's destroy it
- TRACE_msg_process_destroy(process->name, process->pid);
+ TRACE_msg_process_destroy(process->name
.c_str()
, process->pid);
}
}
}
}