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 FAT_PIPE
[simgrid.git]
/
src
/
msg
/
m_process.c
diff --git
a/src/msg/m_process.c
b/src/msg/m_process.c
index
813bef2
..
ee04314
100644
(file)
--- a/
src/msg/m_process.c
+++ b/
src/msg/m_process.c
@@
-136,6
+136,8
@@
void MSG_process_kill(m_process_t process)
int i;
simdata_process_t p_simdata = process->simdata;
simdata_host_t h_simdata= p_simdata->host->simdata;
int i;
simdata_process_t p_simdata = process->simdata;
simdata_host_t h_simdata= p_simdata->host->simdata;
+ int _cursor;
+ m_process_t proc = NULL;
/* fprintf(stderr,"Killing %s(%d) on %s.\n",process->name, */
/* p_simdata->PID,p_simdata->host->name); */
/* fprintf(stderr,"Killing %s(%d) on %s.\n",process->name, */
/* p_simdata->PID,p_simdata->host->name); */
@@
-148,13
+150,19
@@
void MSG_process_kill(m_process_t process)
}
if (i==msg_global->max_channel) {
if(p_simdata->waiting_task) {
}
if (i==msg_global->max_channel) {
if(p_simdata->waiting_task) {
+ xbt_dynar_foreach(p_simdata->waiting_task->simdata->sleeping,_cursor,proc) {
+ if(proc==process)
+ xbt_dynar_remove_at(p_simdata->waiting_task->simdata->sleeping,_cursor,&proc);
+ }
if(p_simdata->waiting_task->simdata->compute)
surf_workstation_resource->common_public->
action_free(p_simdata->waiting_task->simdata->compute);
if(p_simdata->waiting_task->simdata->compute)
surf_workstation_resource->common_public->
action_free(p_simdata->waiting_task->simdata->compute);
- else if (p_simdata->waiting_task->simdata->comm)
+ else if (p_simdata->waiting_task->simdata->comm)
{
surf_workstation_resource->common_public->
action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
surf_workstation_resource->common_public->
action_change_state(p_simdata->waiting_task->simdata->comm,SURF_ACTION_FAILED);
- else
+ surf_workstation_resource->common_public->
+ action_free(p_simdata->waiting_task->simdata->comm);
+ } else
CRITICAL0("UNKNOWN STATUS. Please report this bug.");
} else { /* Must be trying to put a task somewhere */
if(process==MSG_process_self()) {
CRITICAL0("UNKNOWN STATUS. Please report this bug.");
} else { /* Must be trying to put a task somewhere */
if(process==MSG_process_self()) {
@@
-391,8
+399,11
@@
MSG_error_t MSG_process_resume(m_process_t process)
xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
CHECK_HOST();
xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
CHECK_HOST();
- simdata = process->simdata;
+ if(process == MSG_process_self()) {
+ MSG_RETURN(MSG_OK);
+ }
+ simdata = process->simdata;
if(simdata->blocked) {
PAJE_PROCESS_POP_STATE(process);
if(simdata->blocked) {
PAJE_PROCESS_POP_STATE(process);
@@
-433,7
+444,7
@@
int MSG_process_isSuspended(m_process_t process)
return (process->simdata->suspended);
}
return (process->simdata->suspended);
}
-
MSG_error_t __MSG_process_block(void
)
+
int __MSG_process_block(double max_duration
)
{
m_process_t process = MSG_process_self();
{
m_process_t process = MSG_process_self();
@@
-445,6
+456,9
@@
MSG_error_t __MSG_process_block(void)
process->simdata->blocked=1;
__MSG_task_execute(process,dummy);
surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
process->simdata->blocked=1;
__MSG_task_execute(process,dummy);
surf_workstation_resource->common_public->suspend(dummy->simdata->compute);
+ if(max_duration>=0)
+ surf_workstation_resource->common_public->set_max_duration(dummy->simdata->compute,
+ max_duration);
__MSG_wait_for_computation(process,dummy);
process->simdata->blocked=0;
__MSG_wait_for_computation(process,dummy);
process->simdata->blocked=0;
@@
-453,7
+467,7
@@
MSG_error_t __MSG_process_block(void)
MSG_task_destroy(dummy);
MSG_task_destroy(dummy);
- return
MSG_OK
;
+ return
1
;
}
MSG_error_t __MSG_process_unblock(m_process_t process)
}
MSG_error_t __MSG_process_unblock(m_process_t process)