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)
{
/* 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))) {
- if (process->simdata->kill_time >= 0.0 &&
- process->simdata->kill_time < surf_get_clock()) {
- INFO3("KILLING %s(%d) on %s (kill_time elapsed; too bad)",
- process->name,process->simdata->PID,
- process->simdata->host->name);
- MSG_process_kill(process);
-
- } else {
- DEBUG3("Scheduling %s(%d) on %s",
- process->name,process->simdata->PID,
- process->simdata->host->name);
- msg_global->current_process = process;
- fflush(NULL);
- xbt_context_schedule(process->simdata->context);
- msg_global->current_process = NULL;
- }
+ DEBUG3("Scheduling %s(%d) on %s",
+ process->name,process->simdata->PID,
+ process->simdata->host->name);
+ msg_global->current_process = process;
+/* fflush(NULL); */
+ xbt_context_schedule(process->simdata->context);
+ msg_global->current_process = NULL;
}
- DEBUG1("%lg : Calling surf_solve",MSG_getClock());
+ DEBUG1("%g : Calling surf_solve",MSG_getClock());
elapsed_time = surf_solve();
- DEBUG1("Elapsed_time %lg",elapsed_time);
+ DEBUG1("Elapsed_time %g",elapsed_time);
-/* fprintf(stderr, "====== %lg =====\n",Now); */
+/* fprintf(stderr, "====== %g =====\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); */
+/* fprintf(stderr, "We're done %g\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;
+ 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 =
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,
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,