X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee59b06df4d96bf36d6121f936147509908d85e5..2cc8ea0d3fabf1676e26e7361de7c45d09d5a2b6:/src/msg/global.c diff --git a/src/msg/global.c b/src/msg/global.c index 41ff1b2b44..c7f7d2e94c 100644 --- a/src/msg/global.c +++ b/src/msg/global.c @@ -1,48 +1,103 @@ -/* $Id$ */ - -/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * 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"xbt/sysdep.h" -#include "xbt/error.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(global, msg, - "Logging specific to MSG (global)"); +#include "msg/private.h" +#include "mc/mc.h" +#include "xbt/sysdep.h" +#include "xbt/log.h" +#include "xbt/virtu.h" +#include "xbt/ex.h" /* ex_backtrace_display */ +#include "mailbox.h" + +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(long double a, long 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 + */ /********************************* MSG **************************************/ /** \ingroup msg_simulation * \brief Initialize some MSG internal data. */ -void MSG_global_init(void) +void MSG_global_init_args(int *argc, char **argv) +{ + MSG_global_init(argc, argv); +} + + +XBT_LOG_EXTERNAL_CATEGORY(msg_gos); +XBT_LOG_EXTERNAL_CATEGORY(msg_kernel); +XBT_LOG_EXTERNAL_CATEGORY(msg_mailbox); +XBT_LOG_EXTERNAL_CATEGORY(msg_process); + +/** \ingroup msg_simulation + * \brief Initialize some MSG internal data. + */ +void MSG_global_init(int *argc, char **argv) { +#ifdef HAVE_TRACING + TRACE_global_init(argc, argv); +#endif + + xbt_getpid = MSG_process_self_PID; if (!msg_global) { - msg_global = xbt_new0(s_MSG_Global_t,1); + /* Connect our log channels: that must be done manually under windows */ + XBT_LOG_CONNECT(msg_gos, msg); + XBT_LOG_CONNECT(msg_kernel, msg); + XBT_LOG_CONNECT(msg_mailbox, msg); + XBT_LOG_CONNECT(msg_process, msg); + + SIMIX_global_init(argc, argv); + + msg_global = xbt_new0(s_MSG_Global_t, 1); - surf_init(NULL, NULL); /* Initialize some common structures */ 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->sent_msg = 0; + + /* initialization of the action module */ + _MSG_action_init(); + + SIMIX_function_register_process_create(MSG_process_create_from_SIMIX); + SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX); + SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX); } +#ifdef HAVE_TRACING + TRACE_start(); +#endif + + XBT_DEBUG("ADD MSG LEVELS"); + MSG_HOST_LEVEL = xbt_lib_add_level(host_lib,free); } -/** \ingroup msg_simulation - * \brief Defines the verbosity of the simulation. +/** \defgroup m_channel_management Understanding channels + * \brief This section briefly describes the channel notion of MSG + * (#m_channel_t). */ -void MSG_set_verbosity(MSG_outputmode_t mode) -{ - CRITICAL0("Not implemented yet."); -} +/** @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 + * socket. It doesn't need to be opened neither closed. It rather + * corresponds to the ports opened on the different machines. + */ + /** \ingroup m_channel_management * \brief Set the number of channel in the simulation. @@ -56,47 +111,27 @@ void MSG_set_verbosity(MSG_outputmode_t mode) */ MSG_error_t MSG_set_channel_number(int number) { - MSG_global_init(); - - xbt_assert0((msg_global->max_channel == 0), "Channel number already set!"); + xbt_assert0((msg_global) + && (msg_global->max_channel == 0), + "Channel number already set!"); msg_global->max_channel = number; 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, long double param) -{ - xbt_assert0(0,"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. * - * This function has to be called once the number of channel is fixed. I can't + * This function has to be called once the number of channel is fixed. I can't figure out a reason why anyone would like to call this function but nevermind. * \return the number of channel in the simulation. */ int MSG_get_channel_number(void) { - MSG_global_init(); - - xbt_assert0((msg_global->max_channel != 0), "Channel number not set yet!"); + xbt_assert0((msg_global) + && (msg_global->max_channel != 0), + "Channel number not set yet!"); return msg_global->max_channel; } @@ -106,187 +141,38 @@ int MSG_get_channel_number(void) */ MSG_error_t MSG_main(void) { - m_process_t process = NULL; - int nbprocess,i; - long double Before=0.0; - long double Now=0.0; - double elapsed_time = 0.0; - /* Clean IO before the run */ fflush(stdout); fflush(stderr); - surf_solve(); /* Takes traces into account. Returns 0.0 */ - while (xbt_fifo_size(msg_global->process_list)) { - while ((process = xbt_fifo_pop(msg_global->process_to_run))) { - msg_global->current_process = process; - xbt_context_yield(process->simdata->context); - msg_global->current_process = NULL; - } - Before = MSG_getClock(); - elapsed_time = surf_solve(); - Now = MSG_getClock(); - - if (elapsed_time==0.0) - break; - -/* /\* Handle Failures *\/ */ -/* { */ -/* xbt_fifo_t failedHostList = MSG_buildFailedHostList(Before,Now); */ -/* m_host_t host = NULL; */ -/* TBX_HashTable_Bucket_t b; */ -/* TBX_HashTable_t failedProcessList = TBX_HashTable_newList(); */ - -/* while((host=xbt_fifo_pop(failedHostList))) { */ -/* simdata_host_t h_simdata= host->simdata; */ -/* TBX_HashTable_t process_list= h_simdata->process; */ - -/* h_simdata->state = HOST_DOWN; */ - -/* for (b=TBX_HashTable_getFirstBucket(process_list);b; */ -/* b=TBX_HashTable_getNextBucket(process_list,b)) { */ -/* m_process_t p = b->content; */ -/* simdata_process_t p_simdata = p->simdata; */ - -/* if(!TBX_HashTable_isInList(failedProcessList,p,TBX_basicHash)) */ -/* TBX_HashTable_insert(failedProcessList,p,TBX_basicHash); */ - -/* fprintf(stderr,"MSG: %s(%d) on %s(%d): Has died while ", */ -/* p->name,p_simdata->PID, */ -/* p_simdata->host->name,h_simdata->PID); */ -/* for (i=0; imax_channel; i++) { */ -/* if (h_simdata->sleeping[i] == p_simdata->context) { */ -/* fprintf(stderr,"listening on channel %d.\n",i); */ -/* break; */ -/* } */ -/* } */ -/* if (i==msg_global->max_channel) { */ -/* if(p_simdata->waiting_task) { */ -/* fprintf(stderr,"waiting for %s to finish.\n",p_simdata->waiting_task->name); */ -/* MarkAsFailed(p_simdata->waiting_task,failedProcessList); */ -/* } else { /\* Must be trying to put a task somewhere *\/ */ -/* 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); */ -/* } else { */ -/* fprintf(stderr,"... WTF! UNKNOWN STATUS. Please report this bug.\n"); */ -/* } */ -/* } */ -/* } */ -/* } */ -/* } */ -/* xbt_fifo_freeFIFO(failedHostList); */ -/* for (b=TBX_HashTable_getFirstBucket(failedProcessList);b; */ -/* b=TBX_HashTable_getNextBucket(failedProcessList,b)) { */ -/* m_process_t p = b->content; */ -/* xbt_fifo_insert(msg_global->process_to_run, p); /\* Brutal... *\/ */ -/* } */ -/* TBX_HashTable_freeList(failedProcessList,NULL); */ -/* } */ - - - { - surf_action_t action = NULL; - surf_resource_t resource = NULL; - - xbt_dynar_foreach(resource_list, i, resource) { - while ((action = - xbt_swag_extract(resource->common_public->states. - failed_action_set))) { -/* xbt_fifo_insert(msg_global->process_to_run, process); */ - } - while ((action = - xbt_swag_extract(resource->common_public->states. - done_action_set))) { -/* xbt_fifo_insert(msg_global->process_to_run, process); */ - } - } - } + if (MC_IS_ENABLED) { + MC_modelcheck(); } - - if ((nbprocess=xbt_fifo_size(msg_global->process_list)) == 0) { - fprintf(stderr, - "MSG: Congratulations ! Simulation terminated : all process are over\n"); - return MSG_OK; - } else { - fprintf(stderr,"MSG: Oops ! Deadlock or code not perfectly clean.\n"); - fprintf(stderr,"MSG: %d processes are still running, waiting for something.\n", - nbprocess); - /* List the process and their state */ - fprintf(stderr,"MSG: () on (): .\n"); - while ((process=xbt_fifo_pop(msg_global->process_list))) { - 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: ", - process->name,p_simdata->PID, - p_simdata->host->name); - for (i=0; imax_channel; i++) { - if (h_simdata->sleeping[i] == process) { - fprintf(stderr,"Listening on channel %d.\n",i); - break; - } - } - if (i==msg_global->max_channel) { - if(p_simdata->waiting_task) - fprintf(stderr,"Waiting for %s to finish.\n",p_simdata->waiting_task->name); - else { /* Must be trying to put a task somewhere */ - CRITICAL0("Well! I don't know. I have to fix this part of the code. ;)"); -/* 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); */ -/* } else { */ -/* fprintf(stderr,"UNKNOWN STATUS. Please report this bug.\n"); */ -/* } */ - } - } - } - return MSG_WARNING; + else { + SIMIX_run(); } + return MSG_OK; } -/* 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(long double begin, long 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 + + * \param reset_PIDs should we reset the PID numbers. A negative + * number means no reset and a positive number will be used to set the PID + * of the next newly created process. + */ +int MSG_process_killall(int reset_PIDs) +{ + SIMIX_req_process_killall(); + + if (reset_PIDs > 0) { + msg_global->PID = reset_PIDs; + msg_global->session++; + } + + return msg_global->PID; + +} /** \ingroup msg_simulation * \brief Clean the MSG simulation @@ -296,16 +182,28 @@ MSG_error_t MSG_clean(void) xbt_fifo_item_t i = NULL; m_host_t h = NULL; - xbt_fifo_foreach(msg_global->host,i,h,m_host_t) { +#ifdef HAVE_TRACING + TRACE_surf_release(); +#endif + + MSG_process_killall(0); + + xbt_fifo_foreach(msg_global->host, i, h, m_host_t) { __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_free(msg_global); - surf_finalize(); + free(msg_global); + msg_global = NULL; + + /* initialization of the action module */ + _MSG_action_exit(); + +#ifdef HAVE_TRACING + TRACE_end(); +#endif + + SIMIX_clean(); return MSG_OK; } @@ -314,7 +212,12 @@ MSG_error_t MSG_clean(void) /** \ingroup msg_easier_life * \brief A clock (in second). */ -long double MSG_getClock(void) { - return surf_get_clock(); +XBT_INLINE double MSG_get_clock(void) +{ + return SIMIX_get_clock(); } +unsigned long int MSG_get_sent_msg() +{ + return msg_global->sent_msg; +}