XBT_LOG_NEW_DEFAULT_SUBCATEGORY(global, msg,
"Logging specific to MSG (global)");
+int __stop_at_time = -1.0 ;
+
MSG_Global_t msg_global = NULL;
/* static void MarkAsFailed(m_task_t t, TBX_HashTable_t failedProcessList); */
}
}
-/** \ingroup msg_simulation
- * \brief Defines the verbosity of the simulation.
+/** @deprecated Defines the verbosity of the simulation.
+ * @ingroup msg_simulation
*/
void MSG_set_verbosity(MSG_outputmode_t mode)
{
m_process_t process = NULL;
int nbprocess,i;
double elapsed_time = 0.0;
-
+ int state_modifications = 1;
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
/* xbt_fifo_size(msg_global->process_to_run) */
while (1) {
xbt_context_empty_trash();
+ if(xbt_fifo_size(msg_global->process_to_run) && (elapsed_time>0)) {
+ DEBUG0("**************************************************");
+ }
+ if((__stop_at_time>0) && (MSG_getClock() >= __stop_at_time)) {
+ DEBUG0("Let's stop here!");
+ }
+
while ((process = xbt_fifo_pop(msg_global->process_to_run))) {
-/* fprintf(stderr,"-> %s (%d)\n",process->name, process->simdata->PID); */
DEBUG3("Scheduling %s(%d) on %s",
process->name,process->simdata->PID,
process->simdata->host->name);
msg_global->current_process = process;
- fflush(NULL);
+/* fflush(NULL); */
xbt_context_schedule(process->simdata->context);
msg_global->current_process = NULL;
}
- DEBUG1("%lg : Calling surf_solve",MSG_getClock());
- elapsed_time = surf_solve();
- DEBUG1("Elapsed_time %lg",elapsed_time);
-
-/* fprintf(stderr, "====== %lg =====\n",Now); */
-/* if (elapsed_time==0.0) { */
-/* fprintf(stderr, "No change in time\n"); */
-/* } */
- if (elapsed_time<0.0) {
-/* fprintf(stderr, "We're done %lg\n",elapsed_time); */
- break;
- }
-
+
{
surf_action_t action = NULL;
surf_resource_t resource = NULL;
m_task_t task = NULL;
+
+ void *fun = NULL;
+ void *arg = NULL;
+
+ xbt_dynar_foreach(resource_list, i, resource) {
+ if(xbt_swag_size(resource->common_public->states.failed_action_set) ||
+ xbt_swag_size(resource->common_public->states.done_action_set))
+ state_modifications = 1;
+ }
+
+ if(!state_modifications) {
+ DEBUG1("%g : Calling surf_solve",MSG_getClock());
+ elapsed_time = surf_solve();
+ DEBUG1("Elapsed_time %g",elapsed_time);
+
+ if (elapsed_time<0.0) {
+ /* fprintf(stderr, "We're done %g\n",elapsed_time); */
+ break;
+ }
+ }
+
+ while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
+ DEBUG2("got %p %p", fun, arg);
+ if(fun==MSG_process_create_with_arguments) {
+ process_arg_t args = arg;
+ DEBUG2("Launching %s on %s", args->name, args->host->name);
+ process = MSG_process_create_with_arguments(args->name, args->code,
+ args->data, args->host,
+ args->argc,args->argv);
+ if(args->kill_time > MSG_getClock()) {
+ surf_timer_resource->extension_public->set(args->kill_time,
+ (void*) &MSG_process_kill,
+ (void*) process);
+ }
+ xbt_free(args);
+ }
+ if(fun==MSG_process_kill) {
+ process = arg;
+ DEBUG3("Killing %s(%d) on %s", process->name, process->simdata->PID,
+ process->simdata->host->name);
+ MSG_process_kill(process);
+ }
+ }
xbt_dynar_foreach(resource_list, i, resource) {
while ((action =
- xbt_swag_extract(resource->common_public->states.
- failed_action_set))) {
+ xbt_swag_extract(resource->common_public->states.
+ failed_action_set))) {
task = action->data;
if(task) {
int _cursor;
DEBUG1("** %s failed **",task->name);
-/* fprintf(stderr,"** %s **\n",task->name); */
xbt_dynar_foreach(task->simdata->sleeping,_cursor,process) {
DEBUG3("\t preparing to wake up %s(%d) on %s",
process->name,process->simdata->PID,
}
}
while ((action =
- xbt_swag_extract(resource->common_public->states.
- done_action_set))) {
+ xbt_swag_extract(resource->common_public->states.
+ done_action_set))) {
task = action->data;
if(task) {
int _cursor;
DEBUG1("** %s done **",task->name);
-/* fprintf(stderr,"** %s **\n",task->name); */
xbt_dynar_foreach(task->simdata->sleeping,_cursor,process) {
DEBUG3("\t preparing to wake up %s(%d) on %s",
process->name,process->simdata->PID,
}
}
}
+ state_modifications = 0;
}
if ((nbprocess=xbt_fifo_size(msg_global->process_list)) == 0) {
if(p_simdata->waiting_task) {
if(p_simdata->waiting_task->simdata->compute) {
if(p_simdata->put_host)
- fprintf(stderr,"Trying to send a task on Host %s, channel %d.\n",
+ fprintf(stderr,"Trying to send a task to Host %s, channel %d.\n",
p_simdata->put_host->name, p_simdata->put_channel);
else
fprintf(stderr,"Waiting for %s to finish.\n",p_simdata->waiting_task->name);
}
}
-/* static void MarkAsFailed(m_task_t t, TBX_HashTable_t failedProcessList) */
-/* { */
-/* simdata_task_t simdata = NULL; */
-/* xbt_fifo_item_t i = NULL; */
-/* m_process_t p = NULL; */
-
-/* xbt_assert0((t!=NULL),"Invalid task"); */
-/* simdata = t->simdata; */
-
-/* #define KILL(task) if(task) SG_failTask(task) */
-/* KILL(simdata->compute); */
-/* KILL(simdata->TCP_comm); */
-/* KILL(simdata->s[0]); */
-/* KILL(simdata->s[1]); */
-/* KILL(simdata->s[2]); */
-/* KILL(simdata->s[3]); */
-/* KILL(simdata->sleep); */
-/* #undef KILL */
-/* /\* if(simdata->comm) SG_failEndToEndTransfer(simdata->comm); *\/ */
-
-/* xbt_fifo_foreach(simdata->sleeping,i,p,m_process_t) { */
-/* if(!TBX_HashTable_isInList(failedProcessList,p,TBX_basicHash)) */
-/* TBX_HashTable_insert(failedProcessList,p,TBX_basicHash); */
-/* } */
-
-/* } */
-
-/* static xbt_fifo_t MSG_buildFailedHostList(double begin, double end) */
-/* { */
-/* xbt_fifo_t failedHostList = xbt_fifo_new(); */
-/* m_host_t host = NULL; */
-/* xbt_fifo_item_t i; */
-
-/* xbt_fifo_foreach(msg_global->host,i,host,m_host_t) { */
-/* SG_Resource r= ((simdata_host_t) (host->simdata))->host; */
-
-/* if(SG_evaluateFailureTrace(r->failure_trace,begin,end)!=-1.0) */
-/* xbt_fifo_insert(failedHostList,host); */
-/* } */
-
-/* return failedHostList; */
-/* } */
-
/** \ingroup msg_simulation
* \brief Kill all running process
