X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92a1a3afd9e836da4c7cec7022097b7956c6d749..7debb7bb97cba7c93b5112b6cf6ac345f1faa0a4:/src/msg/global.c diff --git a/src/msg/global.c b/src/msg/global.c index db2623660a..02ece3e41f 100644 --- a/src/msg/global.c +++ b/src/msg/global.c @@ -1,33 +1,30 @@ - -/* $Id$ */ - -/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */ +/* $Id$ */ + +/* Copyright (c) 2002-2007 Arnaud Legrand. */ +/* Copyright (c) 2007 Bruno Donassolo. */ +/* 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. */ - -#include "private.h" + +#include "msg/private.h" #include "xbt/sysdep.h" #include "xbt/log.h" +#include "xbt/virtu.h" #include "xbt/ex.h" /* ex_backtrace_display */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, - "Logging specific to MSG (kernel)"); -int __stop_at_time = -1.0 ; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)"); MSG_Global_t msg_global = NULL; -/* static void MarkAsFailed(m_task_t t, TBX_HashTable_t failedProcessList); */ -/* static xbt_fifo_t MSG_buildFailedHostList(double a, double b); */ /** \defgroup msg_simulation MSG simulation Functions * \brief This section describes the functions you need to know to * set up a simulation. You should have a look at \ref MSG_examples * to have an overview of their usage. - */ - -/** \addtogroup msg_simulation - * \htmlonly \endhtmlonly + */ +/** @addtogroup msg_simulation + * \htmlonly \endhtmlonly */ /********************************* MSG **************************************/ @@ -45,158 +42,35 @@ void MSG_global_init_args(int *argc, char **argv) */ void MSG_global_init(int *argc, char **argv) { + xbt_getpid = & MSG_process_self_PID; if (!msg_global) { - surf_init(argc, argv); /* Initialize some common structures. Warning, it sets msg_global=NULL */ + SIMIX_global_init(argc, argv); msg_global = xbt_new0(s_MSG_Global_t,1); msg_global->host = xbt_fifo_new(); - msg_global->process_to_run = xbt_fifo_new(); msg_global->process_list = xbt_fifo_new(); msg_global->max_channel = 0; - msg_global->current_process = NULL; - msg_global->registered_functions = xbt_dict_new(); msg_global->PID = 1; - msg_global->task_mallocator = xbt_mallocator_new(256, - (pvoid_f_void_t*) task_mallocator_new_f, - (void_f_pvoid_t*) task_mallocator_free_f, - (void_f_pvoid_t*) task_mallocator_reset_f); } + return; } /** \ingroup msg_easier_life * \brief Traces MSG events in the Paje format. */ + void MSG_paje_output(const char *filename) { - int i; - const char *paje_preembule= - "%EventDef PajeDefineContainerType 1\n" - "% NewType string\n" - "% ContainerType string\n" - "% NewName string\n" - "%EndEventDef\n" - "%EventDef PajeDefineStateType 3\n" - "% NewType string\n" - "% ContainerType string\n" - "% NewName string\n" - "%EndEventDef\n" - "%EventDef PajeDefineLinkType 5\n" - "% NewType string\n" - "% ContainerType string\n" - "% SourceContainerType string\n" - "% DestContainerType string\n" - "% NewName string\n" - "%EndEventDef\n" - "%EventDef PajeDefineEntityValue 6\n" - "% NewValue string\n" - "% EntityType string\n" - "% NewName string\n" - "%EndEventDef\n" - "%EventDef PajeCreateContainer 7\n" - "% Time date\n" - "% NewContainer string\n" - "% NewContainerType string\n" - "% Container string\n" - "% NewName string\n" - "%EndEventDef\n" - "%EventDef PajeDestroyContainer 8\n" - "% Time date\n" - "% Name string\n" - "% Type string\n" - "%EndEventDef\n" - "%EventDef PajeSetState 10\n" - "% Time date\n" - "% EntityType string\n" - "% Container string\n" - "% Value string\n" - "%EndEventDef\n" - "%EventDef PajePushState 11\n" - "% Time date\n" - "% EntityType string\n" - "% Container string\n" - "% Value string\n" - "% TaskName string\n" - "%EndEventDef\n" - "%EventDef PajePopState 12\n" - "% Time date\n" - "% EntityType string\n" - "% Container string\n" - "%EndEventDef\n" - "%EventDef PajeStartLink 16\n" - "% Time date\n" - "% EntityType string\n" - "% Container string\n" - "% Value string\n" - "% SourceContainer string\n" - "% Key string\n" - "%EndEventDef\n" - "%EventDef PajeEndLink 17\n" - "% Time date\n" - "% EntityType string\n" - "% Container string\n" - "% Value string\n" - "% DestContainer string\n" - "% Key string\n" - "%EndEventDef\n"; - - const char *type_definitions = "1 Sim_t 0 Simulation_t\n" - "1 H_t Sim_t m_host_t\n" - "1 P_t H_t m_process_t\n" - "3 S_t P_t \"Process State\"\n" - "6 E S_t Executing\n" - "6 B S_t Blocked\n" - "6 C S_t Communicating\n" - "5 Comm Sim_t P_t P_t Communication_t\n"; - - const char *ext = ".trace"; - int ext_len = strlen(ext); - int len; - m_host_t host; - m_process_t process; - xbt_fifo_item_t item = NULL; - - xbt_assert0(msg_global, "Initialize MSG first\n"); - xbt_assert0(!msg_global->paje_output, "Paje output already defined\n"); - xbt_assert0(filename, "Need a real file name\n"); - - len = strlen(filename); - if((lenpaje_output=fopen(filename,"w"); - xbt_assert1(msg_global->paje_output, "Failed to open %s \n",filename); - - fprintf(msg_global->paje_output,"%s",paje_preembule); - fprintf(msg_global->paje_output,"%s",type_definitions); - - /* Channels */ - for(i=0; imax_channel; i++) { - fprintf(msg_global->paje_output, "6 COMM_%d Comm \"Channel %d\"\n" ,i,i); - } - fprintf(msg_global->paje_output, - "7 0.0 CUR Sim_t 0 \"MSG simulation\"\n"); - - /* Hosts */ - xbt_fifo_foreach(msg_global->host,item,host,m_host_t) { - PAJE_HOST_NEW(host); - } - - /* Process */ - xbt_fifo_foreach(msg_global->process_list,item,process,m_process_t) { - PAJE_PROCESS_NEW(process); - } } /** \defgroup m_channel_management Understanding channels * \brief This section briefly describes the channel notion of MSG * (#m_channel_t). */ - -/** \addtogroup m_channel_management - * \htmlonly \endhtmlonly +/** @addtogroup m_channel_management + * \htmlonly \endhtmlonly + * * * For convenience, the simulator provides the notion of channel * that is close to the tag notion in MPI. A channel is not a @@ -240,59 +114,9 @@ int MSG_get_channel_number(void) void __MSG_display_process_status(void) { - m_process_t process = NULL; - xbt_fifo_item_t item = NULL; - int i; - int nbprocess=xbt_fifo_size(msg_global->process_list); - - INFO1("MSG: %d processes are still running, waiting for something.", - nbprocess); - /* List the process and their state */ - INFO0("MSG: () on : ."); - xbt_fifo_foreach(msg_global->process_list,item,process,m_process_t) { - simdata_process_t p_simdata = (simdata_process_t) process->simdata; - simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata; - char *who; - - asprintf(&who,"MSG: %s(%d) on %s: %s", - process->name,p_simdata->PID, - p_simdata->host->name, - (process->simdata->blocked)?"[blocked] " - :((process->simdata->suspended)?"[suspended] ":"")); - - for (i=0; imax_channel; i++) { - if (h_simdata->sleeping[i] == process) { - INFO2("%s\tListening on channel %d",who,i); - break; - } - } - if (i==msg_global->max_channel) { - if(p_simdata->waiting_task) { - if(p_simdata->waiting_task->simdata->compute) { - if(p_simdata->put_host) { - INFO4("%s\tTrying to send the task '%s' to Host %s, channel %d.", - who, p_simdata->waiting_task->name,p_simdata->put_host->name, p_simdata->put_channel); - } else { - INFO2("%s\tWaiting for %s to finish.",who,p_simdata->waiting_task->name); - } - } else if (p_simdata->waiting_task->simdata->comm) { - INFO2("%s\tWaiting for %s to be finished transfered.", - who,p_simdata->waiting_task->name); - } else { - INFO1("%s\tUNKNOWN STATUS. Please report this bug.",who); - } -/* The following would display the trace of where the maestro thread is, - since this is the thread calling this. I'd like to get the other threads to - run this to see where they were blocked, but I'm not sure of how to do this */ -/* xbt_backtrace_display(); */ - } else { /* Must be trying to put a task somewhere */ - INFO1("%s\tUNKNOWN STATUS. Please report this bug.",who); - } - } - free(who); - } } + /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ #include @@ -308,140 +132,47 @@ static void _XBT_CALL inthandler(int ignored) */ MSG_error_t MSG_main(void) { - m_process_t process = NULL; - int i; - double elapsed_time = 0.0; - int state_modifications = 1; - - /* Prepare to display some more info when dying on Ctrl-C pressing */ - signal(SIGINT,inthandler); - - /* Clean IO before the run */ - fflush(stdout); - fflush(stderr); - - surf_solve(); /* Takes traces into account. Returns 0.0 */ -/* 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_get_clock() >= __stop_at_time)) { - DEBUG0("Let's stop here!"); - } - - while ((process = xbt_fifo_pop(msg_global->process_to_run))) { - 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; - } - - { - 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("%f : Calling surf_solve",MSG_get_clock()); - elapsed_time = surf_solve(); - DEBUG1("Elapsed_time %f",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_get_clock()) { - 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))) { - task = action->data; - if(task) { - int _cursor; - DEBUG1("** %s failed **",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, - process->simdata->host->name); - xbt_fifo_unshift(msg_global->process_to_run, process); - } - process=NULL; - } - } - while ((action = - xbt_swag_extract(resource->common_public->states. - done_action_set))) { - task = action->data; - if(task) { - int _cursor; - DEBUG1("** %s done **",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, - process->simdata->host->name); - xbt_fifo_unshift(msg_global->process_to_run, process); - } - process=NULL; - } - } - } - } - state_modifications = 0; - } + smx_cond_t cond = NULL; + smx_action_t smx_action; + xbt_fifo_t actions_done = xbt_fifo_new(); + xbt_fifo_t actions_failed = xbt_fifo_new(); - if (xbt_fifo_size(msg_global->process_list) == 0) { -/* INFO0("Congratulations ! Simulation terminated : all processes are over"); */ - return MSG_OK; - } else { - INFO0("Oops ! Deadlock or code not perfectly clean."); - __MSG_display_process_status(); - if(XBT_LOG_ISENABLED(msg, xbt_log_priority_debug) || - XBT_LOG_ISENABLED(msg_kernel, xbt_log_priority_debug)) { - DEBUG0("Aborting!"); - xbt_abort(); - } - - INFO0("Return a Warning."); - return MSG_WARNING; - } + /* Prepare to display some more info when dying on Ctrl-C pressing */ + signal(SIGINT,inthandler); + + /* Clean IO before the run */ + fflush(stdout); + fflush(stderr); + + //surf_solve(); /* Takes traces into account. Returns 0.0 */ + /* xbt_fifo_size(msg_global->process_to_run) */ + + while (SIMIX_solve(actions_done, actions_failed) != -1.0) { + + while ( (smx_action = xbt_fifo_pop(actions_failed)) ) { + + + DEBUG1("** %s failed **",smx_action->name); + while ( (cond = xbt_fifo_pop(smx_action->cond_list)) ) { + SIMIX_cond_broadcast(cond); + } + /* action finished, destroy it */ + // SIMIX_action_destroy(smx_action); + } + + while ( (smx_action = xbt_fifo_pop(actions_done)) ) { + + DEBUG1("** %s done **",smx_action->name); + while ( (cond = xbt_fifo_pop(smx_action->cond_list)) ) { + SIMIX_cond_broadcast(cond); + } + /* action finished, destroy it */ + //SIMIX_action_destroy(smx_action); + } + } + xbt_fifo_free(actions_failed); + xbt_fifo_free(actions_done); + return MSG_OK; } /** \ingroup msg_simulation @@ -458,20 +189,15 @@ int MSG_process_killall(int reset_PIDs) while((p=xbt_fifo_pop(msg_global->process_list))) { if(p!=self) MSG_process_kill(p); - } + } if(reset_PIDs>0) { - msg_global->PID = reset_PIDs; + msg_global->PID = reset_PIDs; msg_global->session++; } - xbt_context_empty_trash(); - - if(self) { - xbt_context_yield(); - } - return msg_global->PID; + } /** \ingroup msg_simulation @@ -492,19 +218,10 @@ MSG_error_t MSG_clean(void) __MSG_host_destroy(h); } xbt_fifo_free(msg_global->host); - xbt_fifo_free(msg_global->process_to_run); xbt_fifo_free(msg_global->process_list); - xbt_dict_free(&(msg_global->registered_functions)); - xbt_mallocator_free(msg_global->task_mallocator); - if(msg_global->paje_output) { - fclose(msg_global->paje_output); - msg_global->paje_output = NULL; - } - msg_config_finalize(); free(msg_global); - msg_global = NULL; - surf_exit(); + SIMIX_clean(); return MSG_OK; } @@ -513,7 +230,8 @@ MSG_error_t MSG_clean(void) /** \ingroup msg_easier_life * \brief A clock (in second). */ -double MSG_get_clock(void) { - return surf_get_clock(); +double MSG_get_clock(void) +{ + return SIMIX_get_clock(); }