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
Add prototype of function get_route in Surf
[simgrid.git]
/
src
/
msg
/
m_process.c
diff --git
a/src/msg/m_process.c
b/src/msg/m_process.c
index
99455b2
..
085fce0
100644
(file)
--- a/
src/msg/m_process.c
+++ b/
src/msg/m_process.c
@@
-8,7
+8,7
@@
#include "private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m_process, msg,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(m
sg
_process, msg,
"Logging specific to MSG (process)");
/** \defgroup m_process_management Management Functions of Agents
"Logging specific to MSG (process)");
/** \defgroup m_process_management Management Functions of Agents
@@
-354,7
+354,7
@@
MSG_error_t MSG_process_suspend(m_process_t process)
xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
xbt_assert0(((process) && (process->simdata)), "Invalid parameters");
- PAJE_PROCESS_PUSH_STATE(process,"S");
+ PAJE_PROCESS_PUSH_STATE(process,"S"
,NULL
);
if(process!=MSG_process_self()) {
simdata = process->simdata;
if(process!=MSG_process_self()) {
simdata = process->simdata;
@@
-459,21
+459,19
@@
int MSG_process_is_suspended(m_process_t process)
return (process->simdata->suspended);
}
return (process->simdata->suspended);
}
-static char blocked_name[512];
-
-int __MSG_process_block(double max_duration)
+int __MSG_process_block(double max_duration, const char *info)
{
m_process_t process = MSG_process_self();
{
m_process_t process = MSG_process_self();
-
m_task_t dummy = MSG_TASK_UNINITIALIZED;
m_task_t dummy = MSG_TASK_UNINITIALIZED;
- snprintf(blocked_name,512,"blocked (%s:%s)",process->name,
- process->simdata->host->name);
+ char blocked_name[512];
+ snprintf(blocked_name,512,"blocked [%s] (%s:%s)",process->name,
+ info, process->simdata->host->name);
XBT_IN1(": max_duration=%g",max_duration);
dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
XBT_IN1(": max_duration=%g",max_duration);
dummy = MSG_task_create(blocked_name, 0.0, 0, NULL);
- PAJE_PROCESS_PUSH_STATE(process,"B");
+ PAJE_PROCESS_PUSH_STATE(process,"B"
,NULL
);
process->simdata->blocked=1;
__MSG_task_execute(process,dummy);
process->simdata->blocked=1;
__MSG_task_execute(process,dummy);