/* 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"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(global, msg,
- "Logging specific to MSG (global)");
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
+ "Logging specific to MSG (kernel)");
int __stop_at_time = -1.0 ;
* \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.
+ * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Simulation functions" --> \endhtmlonly
*/
/********************************* MSG **************************************/
/** \ingroup msg_simulation
* \brief Initialize some MSG internal data.
*/
-void MSG_global_init(void)
+void MSG_global_init_args(int *argc, char **argv)
{
- int argc=0;
- char **argv=NULL;
-
- CRITICAL0("Function MSG_global_init() is deprecated by MSG_global_init_args().");
- MSG_global_init_args(&argc,argv);
+ MSG_global_init(argc,argv);
}
/** \ingroup msg_simulation
* \brief Initialize some MSG internal data.
*/
-void MSG_global_init_args(int *argc, char **argv)
+void MSG_global_init(int *argc, char **argv)
{
if (!msg_global) {
surf_init(argc, argv); /* Initialize some common structures. Warning, it sets msg_global=NULL */
"% EntityType string\n"
"% Container string\n"
"% Value string\n"
+ "% TaskName string\n"
"%EndEventDef\n"
"%EventDef PajePopState 12\n"
"% Time date\n"
len = strlen(filename);
if((len<ext_len) || (strncmp(filename+len-ext_len,ext,ext_len))) {
- CRITICAL2("%s does not end by \"%s\". It may cause troubles when using Paje\n",
+ CRITICAL2("The name of the Paje trace file \"%s\" does not end by \"%s\". Paje will cause difficulties to read it.\n",
filename,ext);
}
}
}
-/** @deprecated Defines the verbosity of the simulation.
- * @ingroup msg_simulation
- */
-void MSG_set_verbosity(MSG_outputmode_t mode)
-{
- CRITICAL0("MSG_set_verbosity : Deprecated function. Use the XBT logging interface.");
-}
-
/** \defgroup m_channel_management Understanding channels
* \brief This section briefly describes the channel notion of MSG
* (#m_channel_t).
+ * \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Channels" --> \endhtmlonly
+ *
*
* For convenience, the simulator provides the notion of channel
* that is close to the tag notion in MPI. A channel is not a
return MSG_OK;
}
-/** \ingroup m_simulation
- * \brief Set the sharing policy used for the links
- *
- * This function can be called to change the sharing policy used for the links
- (see \ref paper_tcp). By default the store and forward mechanism is used
- with a parameter equal to 0.1. This function has to be called before creating
- any link.
- * \param mode the sharing policy used for the links: can be either
- MSG_STORE_AND_FORWARD or MSG_TCP.
- * \param param a parameter for the sharing policy. It has to be >0. It is
- currently used only for the MSG_STORE_AND_FORWARD flavor and represents the
- granularity of the communications (i.e. the packet size).
- */
-MSG_error_t MSG_set_sharing_policy(MSG_sharing_t mode, double param)
-{
- CRITICAL0("MSG_set_sharing_policy: this function is now deprecated and useless. Store and forward does not exist anymore. Please stop using it.");
-
- return MSG_OK;
-}
-
/** \ingroup m_channel_management
* \brief Return the number of channel in the simulation.
*
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);
if(xbt_fifo_size(msg_global->process_to_run) && (elapsed_time>0)) {
DEBUG0("**************************************************");
}
- if((__stop_at_time>0) && (MSG_getClock() >= __stop_at_time)) {
+ 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",
+ DEBUG3("Scheduling %s(%d) on %s",
process->name,process->simdata->PID,
process->simdata->host->name);
msg_global->current_process = process;
xbt_context_schedule(process->simdata->context);
msg_global->current_process = NULL;
}
- DEBUG1("%g : Calling surf_solve",MSG_getClock());
- elapsed_time = surf_solve();
- DEBUG1("Elapsed_time %g",elapsed_time);
-
-/* 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 %g\n",elapsed_time); */
- break;
- }
-
+
{
surf_action_t action = NULL;
surf_resource_t resource = 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 = MSG_process_create_with_arguments(args->name, args->code,
args->data, args->host,
args->argc,args->argv);
- if(args->kill_time > MSG_getClock()) {
+ if(args->kill_time > MSG_get_clock()) {
surf_timer_resource->extension_public->set(args->kill_time,
(void*) &MSG_process_kill,
(void*) 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;
}
}
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;
}
}
}
+ state_modifications = 0;
}
if ((nbprocess=xbt_fifo_size(msg_global->process_list)) == 0) {
- fprintf(stderr,
- "MSG: Congratulations ! Simulation terminated : all process are over\n");
+ INFO0("Congratulations ! Simulation terminated : all process are over");
return MSG_OK;
} else {
xbt_fifo_item_t item = NULL;
- fprintf(stderr,"MSG: Oops ! Deadlock or code not perfectly clean.\n");
- fprintf(stderr,"MSG: %d processes are still running, waiting for something.\n",
- nbprocess);
+ INFO0("Oops ! Deadlock or code not perfectly clean.");
+ INFO1("MSG: %d processes are still running, waiting for something.",
+ nbprocess);
/* List the process and their state */
- fprintf(stderr,"MSG: <process>(<pid>) on <host>: <status>.\n");
+ INFO0("MSG: <process>(<pid>) on <host>: <status>.");
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;
- fprintf(stderr,"MSG: %s(%d) on %s: ",
+ INFO4("MSG: %s(%d) on %s: %s",
process->name,p_simdata->PID,
- p_simdata->host->name);
-
- if (process->simdata->blocked)
- fprintf(stderr,"[blocked] ");
- if (process->simdata->suspended)
- fprintf(stderr,"[suspended] ");
+ p_simdata->host->name,
+ (process->simdata->blocked)?"[blocked] "
+ :((process->simdata->suspended)?"[suspended] ":""));
for (i=0; i<msg_global->max_channel; i++) {
if (h_simdata->sleeping[i] == process) {
- fprintf(stderr,"Listening on channel %d.\n",i);
+ INFO1("\tListening on channel %d.",i);
break;
}
}
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",
- p_simdata->put_host->name, p_simdata->put_channel);
+ INFO2("\tTrying to send a task to Host %s, channel %d.",
+ p_simdata->put_host->name, p_simdata->put_channel);
else
- fprintf(stderr,"Waiting for %s to finish.\n",p_simdata->waiting_task->name);
+ INFO1("Waiting for %s to finish.",p_simdata->waiting_task->name);
} else if (p_simdata->waiting_task->simdata->comm)
- fprintf(stderr,"Waiting for %s to be finished transfered.\n",
+ INFO1("Waiting for %s to be finished transfered.",
p_simdata->waiting_task->name);
else
- fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n");
+ INFO0("UNKNOWN STATUS. Please report this bug.");
}
else { /* Must be trying to put a task somewhere */
- fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n");
+ INFO0("UNKNOWN STATUS. Please report this bug.");
}
}
}
xbt_abort();
}
+ INFO0("Return a Warning.");
return MSG_WARNING;
}
}
-/* 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
*/
int MSG_process_killall(int reset_PIDs)
{
- xbt_fifo_item_t i = NULL;
m_process_t p = NULL;
m_process_t self = MSG_process_self();
- while((p=xbt_fifo_shift(msg_global->process_list))) {
+ while((p=xbt_fifo_pop(msg_global->process_list))) {
if(p!=self) MSG_process_kill(p);
}
m_process_t p = NULL;
- while((p=xbt_fifo_shift(msg_global->process_list))) {
+ while((p=xbt_fifo_pop(msg_global->process_list))) {
MSG_process_kill(p);
}
xbt_context_exit();
fclose(msg_global->paje_output);
msg_global->paje_output = NULL;
}
+ msg_config_finalize();
free(msg_global);
- surf_finalize();
+ surf_exit();
return MSG_OK;
}
-/** \ingroup msg_easier_life
- * \brief A clock (in second).
- * \deprecated Use MSG_get_clock
- */
-double MSG_getClock(void) {
- return surf_get_clock();
-}
-
/** \ingroup msg_easier_life
* \brief A clock (in second).
*/
