From: quintin Date: Thu, 1 Jul 2010 17:54:29 +0000 (+0000) Subject: avoid the complilation of dot_test.c if graphviz wasn't found X-Git-Tag: v3_5~859 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/470b276614f45ce71f58dad1c2ab118aa3e4d1bb avoid the complilation of dot_test.c if graphviz wasn't found and resolve a bug of compilation in the file gos git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7958 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake index 0b0c5264f8..1c0de070b2 100644 --- a/buildtools/Cmake/MakeExeLib.cmake +++ b/buildtools/Cmake/MakeExeLib.cmake @@ -155,7 +155,9 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/amok/saturate) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dax) +if(HAVE_CGRAPH_H) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/dot) +endif(HAVE_CGRAPH_H) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/scheduling) diff --git a/examples/simdag/dot/dot_test.c b/examples/simdag/dot/dot_test.c index 2a24180455..2d72a6c88f 100644 --- a/examples/simdag/dot/dot_test.c +++ b/examples/simdag/dot/dot_test.c @@ -14,112 +14,111 @@ #include XBT_LOG_NEW_DEFAULT_CATEGORY(test, - "Logging specific to this SimDag example"); + "Logging specific to this SimDag example"); static int name_compare_hosts(const void *n1, const void *n2) { - char name1[80], name2[80]; - strcpy(name1, SD_workstation_get_name(*((SD_workstation_t *) n1))); - strcpy(name2, SD_workstation_get_name(*((SD_workstation_t *) n2))); + char name1[80], name2[80]; + strcpy(name1, SD_workstation_get_name(*((SD_workstation_t *) n1))); + strcpy(name2, SD_workstation_get_name(*((SD_workstation_t *) n2))); - return strcmp(name1, name2); + return strcmp(name1, name2); } int main(int argc, char **argv) { - xbt_dynar_t dot, changed; - unsigned int cursor; - SD_task_t task; - - /* initialisation of SD */ - SD_init(&argc, argv); - - /* Check our arguments */ - if (argc < 3) { - INFO1("Usage: %s platform_file dot_file [trace_file]", argv[0]); - INFO1("example: %s ../sd_platform.xml Montage_50.xml Montage_50.mytrace", argv[0]); - exit(1); - } - char *tracefilename; - if (argc == 3) { - char *last=strrchr(argv[2],'.'); - - tracefilename=bprintf("%.*s.trace",(int)(last==NULL?strlen(argv[2]):last-argv[2]),argv[2]); - } else { - tracefilename = xbt_strdup(argv[3]); - } - - /* creation of the environment */ - SD_create_environment(argv[1]); - - /* load the DAX file */ - dot=SD_dotload(argv[2]); - INFO1("dot : %lld",dot); - - /* Display all the tasks */ - INFO0("------------------- Display all tasks of the loaded DAG ---------------------------"); - xbt_dynar_foreach(dot,cursor,task) { - SD_task_dump(task); - } - - FILE *dotout = fopen("dot.dot","w"); - fprintf(dotout,"digraph A {\n"); - xbt_dynar_foreach(dot,cursor,task) { - SD_task_dotty(task,dotout); - } - fprintf(dotout,"}\n"); - fclose(dotout); - - /* Schedule them all on the first workstation */ - INFO0("------------------- Schedule tasks ---------------------------"); - const SD_workstation_t *ws_list = SD_workstation_get_list(); - int totalHosts = SD_workstation_get_number(); - qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t), - name_compare_hosts); - - int count = SD_workstation_get_number(); - xbt_dynar_foreach(dot,cursor,task) { - if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) { - if (!strcmp(SD_task_get_name(task),"end")) - SD_task_schedulel(task,1,ws_list[0]); - else - SD_task_schedulel(task,1,ws_list[cursor%count]); - } - } - - INFO0("------------------- Run the schedule ---------------------------"); - changed = SD_simulate(-1); - xbt_dynar_free_container(&changed); - INFO0("------------------- Produce the trace file---------------------------"); - INFO1("Producing the trace of the run into %s",tracefilename); - FILE*out = fopen(tracefilename,"w"); - xbt_assert1(out,"Cannot write to %s",tracefilename); - free(tracefilename); - - xbt_dynar_foreach(dot,cursor,task) { - int kind = SD_task_get_kind(task); - SD_workstation_t *wsl = SD_task_get_workstation_list(task); - switch (kind) { - case SD_TASK_COMP_SEQ: - fprintf(out,"[%f] %s compute %f # %s\n",SD_task_get_start_time(task), - SD_workstation_get_name(wsl[0]),SD_task_get_amount(task), - SD_task_get_name(task)); - break; - case SD_TASK_COMM_E2E: - fprintf(out,"[%f] %s send %s %f # %s\n",SD_task_get_start_time(task), - SD_workstation_get_name(wsl[0]),SD_workstation_get_name(wsl[1]), - SD_task_get_amount(task), SD_task_get_name(task)); - fprintf(out,"[%f] %s recv %s %f # %s\n",SD_task_get_finish_time(task), - SD_workstation_get_name(wsl[1]),SD_workstation_get_name(wsl[0]), - SD_task_get_amount(task), SD_task_get_name(task)); - break; - default: - xbt_die(bprintf("Task %s is of unknown kind %d",SD_task_get_name(task),SD_task_get_kind(task))); - } - SD_task_destroy(task); - } - fclose(out); - - /* exit */ - SD_exit(); - return 0; + xbt_dynar_t dot, changed; + unsigned int cursor; + SD_task_t task; + + /* initialisation of SD */ + SD_init(&argc, argv); + + /* Check our arguments */ + if (argc < 3) { + INFO1("Usage: %s platform_file dot_file [trace_file]", argv[0]); + INFO1("example: %s ../sd_platform.xml Montage_50.xml Montage_50.mytrace", argv[0]); + exit(1); + } + char *tracefilename; + if (argc == 3) { + char *last=strrchr(argv[2],'.'); + + tracefilename=bprintf("%.*s.trace",(int)(last==NULL?strlen(argv[2]):last-argv[2]),argv[2]); + } else { + tracefilename = xbt_strdup(argv[3]); + } + + /* creation of the environment */ + SD_create_environment(argv[1]); + + /* load the DAX file */ + dot=SD_dotload(argv[2]); + + /* Display all the tasks */ + INFO0("------------------- Display all tasks of the loaded DAG ---------------------------"); + xbt_dynar_foreach(dot,cursor,task) { + SD_task_dump(task); + } + + FILE *dotout = fopen("dot.dot","w"); + fprintf(dotout,"digraph A {\n"); + xbt_dynar_foreach(dot,cursor,task) { + SD_task_dotty(task,dotout); + } + fprintf(dotout,"}\n"); + fclose(dotout); + + /* Schedule them all on the first workstation */ + INFO0("------------------- Schedule tasks ---------------------------"); + const SD_workstation_t *ws_list = SD_workstation_get_list(); + int totalHosts = SD_workstation_get_number(); + qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t), + name_compare_hosts); + + int count = SD_workstation_get_number(); + xbt_dynar_foreach(dot,cursor,task) { + if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) { + if (!strcmp(SD_task_get_name(task),"end")) + SD_task_schedulel(task,1,ws_list[0]); + else + SD_task_schedulel(task,1,ws_list[cursor%count]); + } + } + + INFO0("------------------- Run the schedule ---------------------------"); + changed = SD_simulate(-1); + xbt_dynar_free_container(&changed); + INFO0("------------------- Produce the trace file---------------------------"); + INFO1("Producing the trace of the run into %s",tracefilename); + FILE*out = fopen(tracefilename,"w"); + xbt_assert1(out,"Cannot write to %s",tracefilename); + free(tracefilename); + + xbt_dynar_foreach(dot,cursor,task) { + int kind = SD_task_get_kind(task); + SD_workstation_t *wsl = SD_task_get_workstation_list(task); + switch (kind) { + case SD_TASK_COMP_SEQ: + fprintf(out,"[%f] %s compute %f # %s\n",SD_task_get_start_time(task), + SD_workstation_get_name(wsl[0]),SD_task_get_amount(task), + SD_task_get_name(task)); + break; + case SD_TASK_COMM_E2E: + fprintf(out,"[%f] %s send %s %f # %s\n",SD_task_get_start_time(task), + SD_workstation_get_name(wsl[0]),SD_workstation_get_name(wsl[1]), + SD_task_get_amount(task), SD_task_get_name(task)); + fprintf(out,"[%f] %s recv %s %f # %s\n",SD_task_get_finish_time(task), + SD_workstation_get_name(wsl[1]),SD_workstation_get_name(wsl[0]), + SD_task_get_amount(task), SD_task_get_name(task)); + break; + default: + xbt_die(bprintf("Task %s is of unknown kind %d",SD_task_get_name(task),SD_task_get_kind(task))); + } + SD_task_destroy(task); + } + fclose(out); + + /* exit */ + SD_exit(); + return 0; } diff --git a/src/msg/gos.c b/src/msg/gos.c index 263ecbda29..943df6371d 100644 --- a/src/msg/gos.c +++ b/src/msg/gos.c @@ -5,13 +5,15 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "msg/private.h" +#include "simix/private.h" #include "xbt/sysdep.h" +#include "mc/mc.h" #include "xbt/log.h" #include "mailbox.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, - "Logging specific to MSG (gos)"); + "Logging specific to MSG (gos)"); /** \ingroup msg_gos_functions * @@ -20,7 +22,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, */ MSG_error_t MSG_get_errno(void) { - return PROCESS_GET_ERRNO(); + return PROCESS_GET_ERRNO(); } /** \ingroup msg_gos_functions @@ -29,204 +31,204 @@ MSG_error_t MSG_get_errno(void) * This function is used for describing the behavior of an agent. It * takes only one parameter. * \param task a #m_task_t to execute on the location on which the - agent is running. + agent is running. * \return #MSG_FATAL if \a task is not properly initialized and * #MSG_OK otherwise. */ MSG_error_t MSG_task_execute(m_task_t task) { - simdata_task_t simdata = NULL; - m_process_t self = MSG_process_self(); - e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; - CHECK_HOST(); + simdata_task_t simdata = NULL; + m_process_t self = MSG_process_self(); + e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; + CHECK_HOST(); - simdata = task->simdata; + simdata = task->simdata; - xbt_assert0(simdata->host_nb==0, "This is a parallel task. Go to hell."); + xbt_assert0(simdata->host_nb==0, "This is a parallel task. Go to hell."); #ifdef HAVE_TRACING - TRACE_msg_task_execute_start (task); + TRACE_msg_task_execute_start (task); #endif - xbt_assert1((!simdata->compute) && (task->simdata->refcount == 1), - "This task is executed somewhere else. Go fix your code! %d", task->simdata->refcount); + xbt_assert1((!simdata->compute) && (task->simdata->refcount == 1), + "This task is executed somewhere else. Go fix your code! %d", task->simdata->refcount); - DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); + DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); - if (simdata->computation_amount == 0) { + if (simdata->computation_amount == 0) { #ifdef HAVE_TRACING - TRACE_msg_task_execute_end (task); + TRACE_msg_task_execute_end (task); #endif - return MSG_OK; - } - simdata->refcount++; - SIMIX_mutex_lock(simdata->mutex); - simdata->compute = - SIMIX_action_execute(SIMIX_host_self(), task->name, - simdata->computation_amount); - SIMIX_action_set_priority(simdata->compute, simdata->priority); - - /* changed to waiting action since we are always waiting one action (execute, communicate or sleep) */ - self->simdata->waiting_action = simdata->compute; - SIMIX_register_action_to_condition(simdata->compute, simdata->cond); - do { - SIMIX_cond_wait(simdata->cond, simdata->mutex); - state = SIMIX_action_get_state(simdata->compute); - } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); - SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); - self->simdata->waiting_action = NULL; - - SIMIX_mutex_unlock(simdata->mutex); - simdata->refcount--; - - if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->computation_amount = 0.0; - simdata->comm = NULL; - simdata->compute = NULL; + return MSG_OK; + } + simdata->refcount++; + SIMIX_mutex_lock(simdata->mutex); + simdata->compute = + SIMIX_action_execute(SIMIX_host_self(), task->name, + simdata->computation_amount); + SIMIX_action_set_priority(simdata->compute, simdata->priority); + + /* changed to waiting action since we are always waiting one action (execute, communicate or sleep) */ + self->simdata->waiting_action = simdata->compute; + SIMIX_register_action_to_condition(simdata->compute, simdata->cond); + do { + SIMIX_cond_wait(simdata->cond, simdata->mutex); + state = SIMIX_action_get_state(simdata->compute); + } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); + SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); + self->simdata->waiting_action = NULL; + + SIMIX_mutex_unlock(simdata->mutex); + simdata->refcount--; + + if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->computation_amount = 0.0; + simdata->comm = NULL; + simdata->compute = NULL; #ifdef HAVE_TRACING - TRACE_msg_task_execute_end (task); + TRACE_msg_task_execute_end (task); #endif - MSG_RETURN(MSG_OK); - } else if (SIMIX_host_get_state(SIMIX_host_self()) == 0) { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; + MSG_RETURN(MSG_OK); + } else if (SIMIX_host_get_state(SIMIX_host_self()) == 0) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; #ifdef HAVE_TRACING - TRACE_msg_task_execute_end (task); + TRACE_msg_task_execute_end (task); #endif - MSG_RETURN(MSG_HOST_FAILURE); - } else { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; + MSG_RETURN(MSG_HOST_FAILURE); + } else { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; #ifdef HAVE_TRACING - TRACE_msg_task_execute_end (task); + TRACE_msg_task_execute_end (task); #endif - MSG_RETURN(MSG_TASK_CANCELLED); - } + MSG_RETURN(MSG_TASK_CANCELLED); + } } /** \ingroup m_task_management * \brief Creates a new #m_task_t (a parallel one....). * * A constructor for #m_task_t taking six arguments and returning the - corresponding object. + corresponding object. * \param name a name for the object. It is for user-level information - and can be NULL. + and can be NULL. * \param host_nb the number of hosts implied in the parallel task. * \param host_list an array of \p host_nb m_host_t. * \param computation_amount an array of \p host_nb - doubles. computation_amount[i] is the total number of operations - that have to be performed on host_list[i]. + doubles. computation_amount[i] is the total number of operations + that have to be performed on host_list[i]. * \param communication_amount an array of \p host_nb* \p host_nb doubles. * \param data a pointer to any data may want to attach to the new - object. It is for user-level information and can be NULL. It can - be retrieved with the function \ref MSG_task_get_data. + object. It is for user-level information and can be NULL. It can + be retrieved with the function \ref MSG_task_get_data. * \see m_task_t * \return The new corresponding object. */ -m_task_t + m_task_t MSG_parallel_task_create(const char *name, int host_nb, - const m_host_t * host_list, - double *computation_amount, - double *communication_amount, void *data) + const m_host_t * host_list, + double *computation_amount, + double *communication_amount, void *data) { - int i; - simdata_task_t simdata = xbt_new0(s_simdata_task_t, 1); - m_task_t task = xbt_new0(s_m_task_t, 1); - task->simdata = simdata; - - /* Task structure */ - task->name = xbt_strdup(name); - task->data = data; - - /* Simulator Data */ - simdata->computation_amount = 0; - simdata->message_size = 0; - simdata->cond = SIMIX_cond_init(); - simdata->mutex = SIMIX_mutex_init(); - simdata->compute = NULL; - simdata->comm = NULL; - simdata->rate = -1.0; - simdata->refcount = 1; - simdata->sender = NULL; - simdata->receiver = NULL; - simdata->source = NULL; - - simdata->host_nb = host_nb; - simdata->host_list = xbt_new0(smx_host_t, host_nb); - simdata->comp_amount = computation_amount; - simdata->comm_amount = communication_amount; - - for (i = 0; i < host_nb; i++) - simdata->host_list[i] = host_list[i]->simdata->smx_host; - - return task; + int i; + simdata_task_t simdata = xbt_new0(s_simdata_task_t, 1); + m_task_t task = xbt_new0(s_m_task_t, 1); + task->simdata = simdata; + + /* Task structure */ + task->name = xbt_strdup(name); + task->data = data; + + /* Simulator Data */ + simdata->computation_amount = 0; + simdata->message_size = 0; + simdata->cond = SIMIX_cond_init(); + simdata->mutex = SIMIX_mutex_init(); + simdata->compute = NULL; + simdata->comm = NULL; + simdata->rate = -1.0; + simdata->refcount = 1; + simdata->sender = NULL; + simdata->receiver = NULL; + simdata->source = NULL; + + simdata->host_nb = host_nb; + simdata->host_list = xbt_new0(smx_host_t, host_nb); + simdata->comp_amount = computation_amount; + simdata->comm_amount = communication_amount; + + for (i = 0; i < host_nb; i++) + simdata->host_list[i] = host_list[i]->simdata->smx_host; + + return task; } MSG_error_t MSG_parallel_task_execute(m_task_t task) { - simdata_task_t simdata = NULL; - m_process_t self = MSG_process_self(); - e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; - CHECK_HOST(); - - simdata = task->simdata; - - xbt_assert0((!simdata->compute) - && (task->simdata->refcount == 1), - "This task is executed somewhere else. Go fix your code!"); - - xbt_assert0(simdata->host_nb, "This is not a parallel task. Go to hell."); - - DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); - - simdata->refcount++; - - SIMIX_mutex_lock(simdata->mutex); - simdata->compute = - SIMIX_action_parallel_execute(task->name, simdata->host_nb, - simdata->host_list, simdata->comp_amount, - simdata->comm_amount, 1.0, -1.0); - - self->simdata->waiting_action = simdata->compute; - SIMIX_register_action_to_condition(simdata->compute, simdata->cond); - do { - SIMIX_cond_wait(simdata->cond, simdata->mutex); - state = SIMIX_action_get_state(task->simdata->compute); - } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); - - SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); - self->simdata->waiting_action = NULL; - - - SIMIX_mutex_unlock(simdata->mutex); - simdata->refcount--; - - if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->computation_amount = 0.0; - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_OK); - } else if (SIMIX_host_get_state(SIMIX_host_self()) == 0) { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_HOST_FAILURE); - } else { - /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ - SIMIX_action_destroy(task->simdata->compute); - simdata->comm = NULL; - simdata->compute = NULL; - MSG_RETURN(MSG_TASK_CANCELLED); - } + simdata_task_t simdata = NULL; + m_process_t self = MSG_process_self(); + e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; + CHECK_HOST(); + + simdata = task->simdata; + + xbt_assert0((!simdata->compute) + && (task->simdata->refcount == 1), + "This task is executed somewhere else. Go fix your code!"); + + xbt_assert0(simdata->host_nb, "This is not a parallel task. Go to hell."); + + DEBUG1("Computing on %s", MSG_process_self()->simdata->m_host->name); + + simdata->refcount++; + + SIMIX_mutex_lock(simdata->mutex); + simdata->compute = + SIMIX_action_parallel_execute(task->name, simdata->host_nb, + simdata->host_list, simdata->comp_amount, + simdata->comm_amount, 1.0, -1.0); + + self->simdata->waiting_action = simdata->compute; + SIMIX_register_action_to_condition(simdata->compute, simdata->cond); + do { + SIMIX_cond_wait(simdata->cond, simdata->mutex); + state = SIMIX_action_get_state(task->simdata->compute); + } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); + + SIMIX_unregister_action_to_condition(simdata->compute, simdata->cond); + self->simdata->waiting_action = NULL; + + + SIMIX_mutex_unlock(simdata->mutex); + simdata->refcount--; + + if (SIMIX_action_get_state(task->simdata->compute) == SURF_ACTION_DONE) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->computation_amount = 0.0; + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_OK); + } else if (SIMIX_host_get_state(SIMIX_host_self()) == 0) { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_HOST_FAILURE); + } else { + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ + SIMIX_action_destroy(task->simdata->compute); + simdata->comm = NULL; + simdata->compute = NULL; + MSG_RETURN(MSG_TASK_CANCELLED); + } } @@ -240,62 +242,62 @@ MSG_error_t MSG_parallel_task_execute(m_task_t task) */ MSG_error_t MSG_process_sleep(double nb_sec) { - smx_action_t act_sleep; - m_process_t proc = MSG_process_self(); - e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; - smx_mutex_t mutex; - smx_cond_t cond; + smx_action_t act_sleep; + m_process_t proc = MSG_process_self(); + e_surf_action_state_t state = SURF_ACTION_NOT_IN_THE_SYSTEM; + smx_mutex_t mutex; + smx_cond_t cond; #ifdef HAVE_TRACING - TRACE_msg_process_sleep_in (MSG_process_self()); + TRACE_msg_process_sleep_in (MSG_process_self()); #endif - /* create action to sleep */ - act_sleep = - SIMIX_action_sleep(SIMIX_process_get_host(proc->simdata->s_process), - nb_sec); - - mutex = SIMIX_mutex_init(); - SIMIX_mutex_lock(mutex); - - /* create conditional and register action to it */ - cond = SIMIX_cond_init(); - - proc->simdata->waiting_action = act_sleep; - SIMIX_register_action_to_condition(act_sleep, cond); - do { - SIMIX_cond_wait(cond, mutex); - state = SIMIX_action_get_state(act_sleep); - } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); - proc->simdata->waiting_action = NULL; - SIMIX_unregister_action_to_condition(act_sleep, cond); - SIMIX_mutex_unlock(mutex); - - /* remove variables */ - SIMIX_cond_destroy(cond); - SIMIX_mutex_destroy(mutex); - - if (SIMIX_action_get_state(act_sleep) == SURF_ACTION_DONE) { - if (SIMIX_host_get_state(SIMIX_host_self()) == SURF_RESOURCE_OFF) { - SIMIX_action_destroy(act_sleep); + /* create action to sleep */ + act_sleep = + SIMIX_action_sleep(SIMIX_process_get_host(proc->simdata->s_process), + nb_sec); + + mutex = SIMIX_mutex_init(); + SIMIX_mutex_lock(mutex); + + /* create conditional and register action to it */ + cond = SIMIX_cond_init(); + + proc->simdata->waiting_action = act_sleep; + SIMIX_register_action_to_condition(act_sleep, cond); + do { + SIMIX_cond_wait(cond, mutex); + state = SIMIX_action_get_state(act_sleep); + } while (state == SURF_ACTION_READY || state == SURF_ACTION_RUNNING); + proc->simdata->waiting_action = NULL; + SIMIX_unregister_action_to_condition(act_sleep, cond); + SIMIX_mutex_unlock(mutex); + + /* remove variables */ + SIMIX_cond_destroy(cond); + SIMIX_mutex_destroy(mutex); + + if (SIMIX_action_get_state(act_sleep) == SURF_ACTION_DONE) { + if (SIMIX_host_get_state(SIMIX_host_self()) == SURF_RESOURCE_OFF) { + SIMIX_action_destroy(act_sleep); #ifdef HAVE_TRACING - TRACE_msg_process_sleep_out (MSG_process_self()); + TRACE_msg_process_sleep_out (MSG_process_self()); #endif - MSG_RETURN(MSG_HOST_FAILURE); - } - } else { - SIMIX_action_destroy(act_sleep); + MSG_RETURN(MSG_HOST_FAILURE); + } + } else { + SIMIX_action_destroy(act_sleep); #ifdef HAVE_TRACING - TRACE_msg_process_sleep_out (MSG_process_self()); + TRACE_msg_process_sleep_out (MSG_process_self()); #endif - MSG_RETURN(MSG_HOST_FAILURE); - } + MSG_RETURN(MSG_HOST_FAILURE); + } - SIMIX_action_destroy(act_sleep); + SIMIX_action_destroy(act_sleep); #ifdef HAVE_TRACING - TRACE_msg_process_sleep_out (MSG_process_self()); + TRACE_msg_process_sleep_out (MSG_process_self()); #endif - MSG_RETURN(MSG_OK); + MSG_RETURN(MSG_OK); } /** \ingroup msg_gos_functions @@ -303,20 +305,20 @@ MSG_error_t MSG_process_sleep(double nb_sec) * * It takes three parameters. * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). * \param host the host that is to be watched. * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING - if \a *task is not equal to \c NULL, and #MSG_OK otherwise. + if \a *task is not equal to \c NULL, and #MSG_OK otherwise. */ -MSG_error_t + MSG_error_t MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host) { - return MSG_task_get_ext(task, channel, -1, host); + return MSG_task_get_ext(task, channel, -1, host); } /** \ingroup msg_gos_functions @@ -324,18 +326,18 @@ MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host) * * It takes two parameters. * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING * if \a *task is not equal to \c NULL, and #MSG_OK otherwise. */ MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel) { - return MSG_task_get_with_timeout(task, channel, -1); + return MSG_task_get_with_timeout(task, channel, -1); } /** \ingroup msg_gos_functions @@ -343,24 +345,24 @@ MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel) * * It takes three parameters. * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). * \param max_duration the maximum time to wait for a task before giving - up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task - will not be modified and will still be - equal to \c NULL when returning. + up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task + will not be modified and will still be + equal to \c NULL when returning. * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING - if \a *task is not equal to \c NULL, and #MSG_OK otherwise. + if \a *task is not equal to \c NULL, and #MSG_OK otherwise. */ -MSG_error_t + MSG_error_t MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel, - double max_duration) + double max_duration) { - return MSG_task_get_ext(task, channel, max_duration, NULL); + return MSG_task_get_ext(task, channel, max_duration, NULL); } /** \defgroup msg_gos_functions MSG Operating System Functions @@ -368,137 +370,137 @@ MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel, * by an agent for handling some task. */ -MSG_error_t + MSG_error_t MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout, - m_host_t host) + m_host_t host) { - xbt_assert1((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - return - MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel - (MSG_host_self(), channel), task, host, timeout); + return + MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel + (MSG_host_self(), channel), task, host, timeout); } -MSG_error_t + MSG_error_t MSG_task_receive_from_host(m_task_t * task, const char *alias, m_host_t host) { - return MSG_task_receive_ext(task, alias, -1, host); + return MSG_task_receive_ext(task, alias, -1, host); } MSG_error_t MSG_task_receive(m_task_t * task, const char *alias) { - return MSG_task_receive_with_timeout(task, alias, -1); + return MSG_task_receive_with_timeout(task, alias, -1); } -MSG_error_t + MSG_error_t MSG_task_receive_with_timeout(m_task_t * task, const char *alias, - double timeout) + double timeout) { - return MSG_task_receive_ext(task, alias, timeout, NULL); + return MSG_task_receive_ext(task, alias, timeout, NULL); } -MSG_error_t + MSG_error_t MSG_task_receive_ext(m_task_t * task, const char *alias, double timeout, - m_host_t host) + m_host_t host) { - return MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, - timeout); + return MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, + timeout); } msg_comm_t MSG_task_isend(m_task_t task, const char *alias) { - simdata_task_t t_simdata = NULL; - m_process_t process = MSG_process_self(); - msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); + simdata_task_t t_simdata = NULL; + m_process_t process = MSG_process_self(); + msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); - CHECK_HOST(); + CHECK_HOST(); - /* FIXME: these functions are not tracable */ + /* FIXME: these functions are not tracable */ - /* Prepare the task to send */ - t_simdata = task->simdata; - t_simdata->sender = process; - t_simdata->source = MSG_host_self(); + /* Prepare the task to send */ + t_simdata = task->simdata; + t_simdata->sender = process; + t_simdata->source = MSG_host_self(); - xbt_assert0(t_simdata->refcount == 1, - "This task is still being used somewhere else. You cannot send it now. Go fix your code!"); + xbt_assert0(t_simdata->refcount == 1, + "This task is still being used somewhere else. You cannot send it now. Go fix your code!"); - t_simdata->refcount++; - msg_global->sent_msg++; - process->simdata->waiting_task = task; + t_simdata->refcount++; + msg_global->sent_msg++; + process->simdata->waiting_task = task; - /* Send it by calling SIMIX network layer */ + /* Send it by calling SIMIX network layer */ - /* Kept for semantical compatibility with older implementation */ - if(mailbox->cond) - SIMIX_cond_signal(mailbox->cond); + /* Kept for semantical compatibility with older implementation */ + if(mailbox->cond) + SIMIX_cond_signal(mailbox->cond); - return SIMIX_network_isend(mailbox->rdv, t_simdata->message_size, t_simdata->rate, - task, sizeof(void*), &t_simdata->comm); + return SIMIX_network_isend(mailbox->rdv, t_simdata->message_size, t_simdata->rate, + task, sizeof(void*), &t_simdata->comm); } msg_comm_t MSG_task_irecv(m_task_t * task, const char *alias) { - smx_comm_t comm; - smx_rdv_t rdv = MSG_mailbox_get_by_alias(alias)->rdv; - msg_mailbox_t mailbox=MSG_mailbox_get_by_alias(alias); - size_t size = sizeof(void*); + smx_comm_t comm; + smx_rdv_t rdv = MSG_mailbox_get_by_alias(alias)->rdv; + msg_mailbox_t mailbox=MSG_mailbox_get_by_alias(alias); + size_t size = sizeof(void*); - CHECK_HOST(); + CHECK_HOST(); - /* FIXME: these functions are not tracable */ + /* FIXME: these functions are not tracable */ - memset(&comm,0,sizeof(comm)); + memset(&comm,0,sizeof(comm)); - /* Kept for compatibility with older implementation */ - xbt_assert1(!MSG_mailbox_get_cond(mailbox), - "A process is already blocked on this channel %s", - MSG_mailbox_get_alias(mailbox)); + /* Kept for compatibility with older implementation */ + xbt_assert1(!MSG_mailbox_get_cond(mailbox), + "A process is already blocked on this channel %s", + MSG_mailbox_get_alias(mailbox)); - /* Sanity check */ - xbt_assert0(task, "Null pointer for the task storage"); + /* Sanity check */ + xbt_assert0(task, "Null pointer for the task storage"); - if (*task) - CRITICAL0("MSG_task_get() was asked to write in a non empty task struct."); + if (*task) + CRITICAL0("MSG_task_get() was asked to write in a non empty task struct."); - /* Try to receive it by calling SIMIX network layer */ - return SIMIX_network_irecv(rdv, task, &size); + /* Try to receive it by calling SIMIX network layer */ + return SIMIX_network_irecv(rdv, task, &size); } int MSG_comm_test(msg_comm_t comm) { - return SIMIX_network_test(comm); + return SIMIX_network_test(comm); } MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout) { - xbt_ex_t e; - MSG_error_t res = MSG_OK; - TRY { - SIMIX_network_wait(comm,timeout); + xbt_ex_t e; + MSG_error_t res = MSG_OK; + TRY { + SIMIX_network_wait(comm,timeout); if(!(comm->src_proc == SIMIX_process_self())) - { - m_task_t task; - task = (m_task_t) SIMIX_communication_get_src_buf(comm); - task->simdata->refcount--; - } - - /* FIXME: these functions are not tracable */ - } CATCH(e){ - switch(e.category){ - case host_error: - res = MSG_HOST_FAILURE; - break; - case network_error: - res = MSG_TRANSFER_FAILURE; - break; - case timeout_error: - res = MSG_TIMEOUT; - break; - default: - xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg)); - } - xbt_ex_free(e); - } - return res; + { + m_task_t task; + task = (m_task_t) SIMIX_communication_get_src_buf(comm); + task->simdata->refcount--; + } + + /* FIXME: these functions are not tracable */ + } CATCH(e){ + switch(e.category){ + case host_error: + res = MSG_HOST_FAILURE; + break; + case network_error: + res = MSG_TRANSFER_FAILURE; + break; + case timeout_error: + res = MSG_TIMEOUT; + break; + default: + xbt_die(bprintf("Unhandled SIMIX network exception: %s",e.msg)); + } + xbt_ex_free(e); + } + return res; } /** \ingroup msg_gos_functions @@ -508,19 +510,19 @@ MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout) { * This function is used for describing the behavior of an agent. It * takes three parameter. * \param task a #m_task_t to send on another location. This task - will not be usable anymore when the function will return. There is - no automatic task duplication and you have to save your parameters - before calling this function. Tasks are unique and once it has been - sent to another location, you should not access it anymore. You do - not need to call MSG_task_destroy() but to avoid using, as an - effect of inattention, this task anymore, you definitely should - renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task - can be transfered iff it has been correctly created with - MSG_task_create(). + will not be usable anymore when the function will return. There is + no automatic task duplication and you have to save your parameters + before calling this function. Tasks are unique and once it has been + sent to another location, you should not access it anymore. You do + not need to call MSG_task_destroy() but to avoid using, as an + effect of inattention, this task anymore, you definitely should + renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task + can be transfered iff it has been correctly created with + MSG_task_create(). * \param dest the destination of the message * \param channel the channel on which the agent should put this - task. This value has to be >=0 and < than the maximal number of - channels fixed with MSG_set_channel_number(). + task. This value has to be >=0 and < than the maximal number of + channels fixed with MSG_set_channel_number(). * \return #MSG_FATAL if \a task is not properly initialized and * #MSG_OK otherwise. Returns #MSG_HOST_FAILURE if the host on which * this function was called was shut down. Returns @@ -529,7 +531,7 @@ MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout) { */ MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel) { - return MSG_task_put_with_timeout(task, dest, channel, -1.0); + return MSG_task_put_with_timeout(task, dest, channel, -1.0); } /** \ingroup msg_gos_functions @@ -538,12 +540,12 @@ MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel) * * \sa MSG_task_put */ -MSG_error_t + MSG_error_t MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel, - double maxrate) + double maxrate) { - task->simdata->rate = maxrate; - return MSG_task_put(task, dest, channel); + task->simdata->rate = maxrate; + return MSG_task_put(task, dest, channel); } /** \ingroup msg_gos_functions \brief Put a task on a channel of an @@ -553,67 +555,67 @@ MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel, * This function is used for describing the behavior of an agent. It * takes four parameter. * \param task a #m_task_t to send on another location. This task - will not be usable anymore when the function will return. There is - no automatic task duplication and you have to save your parameters - before calling this function. Tasks are unique and once it has been - sent to another location, you should not access it anymore. You do - not need to call MSG_task_destroy() but to avoid using, as an - effect of inattention, this task anymore, you definitely should - renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task - can be transfered iff it has been correctly created with - MSG_task_create(). + will not be usable anymore when the function will return. There is + no automatic task duplication and you have to save your parameters + before calling this function. Tasks are unique and once it has been + sent to another location, you should not access it anymore. You do + not need to call MSG_task_destroy() but to avoid using, as an + effect of inattention, this task anymore, you definitely should + renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task + can be transfered iff it has been correctly created with + MSG_task_create(). * \param dest the destination of the message * \param channel the channel on which the agent should put this - task. This value has to be >=0 and < than the maximal number of - channels fixed with MSG_set_channel_number(). + task. This value has to be >=0 and < than the maximal number of + channels fixed with MSG_set_channel_number(). * \param timeout the maximum time to wait for a task before giving - up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task - will not be modified + up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task + will not be modified * \return #MSG_FATAL if \a task is not properly initialized and - #MSG_OK otherwise. Returns #MSG_HOST_FAILURE if the host on which - this function was called was shut down. Returns - #MSG_TRANSFER_FAILURE if the transfer could not be properly done - (network failure, dest failure, timeout...) +#MSG_OK otherwise. Returns #MSG_HOST_FAILURE if the host on which +this function was called was shut down. Returns +#MSG_TRANSFER_FAILURE if the transfer could not be properly done +(network failure, dest failure, timeout...) */ -MSG_error_t + MSG_error_t MSG_task_put_with_timeout(m_task_t task, m_host_t dest, m_channel_t channel, - double timeout) + double timeout) { - xbt_assert1((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - return - MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_channel(dest, channel), - task, timeout); + return + MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_channel(dest, channel), + task, timeout); } MSG_error_t MSG_task_send(m_task_t task, const char *alias) { - return MSG_task_send_with_timeout(task, alias, -1); + return MSG_task_send_with_timeout(task, alias, -1); } -MSG_error_t + MSG_error_t MSG_task_send_bounded(m_task_t task, const char *alias, double maxrate) { - task->simdata->rate = maxrate; - return MSG_task_send(task, alias); + task->simdata->rate = maxrate; + return MSG_task_send(task, alias); } -MSG_error_t + MSG_error_t MSG_task_send_with_timeout(m_task_t task, const char *alias, double timeout) { - return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), task, - timeout); + return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), task, + timeout); } int MSG_task_listen(const char *alias) { - CHECK_HOST(); + CHECK_HOST(); - return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); + return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); } /** \ingroup msg_gos_functions @@ -621,58 +623,58 @@ int MSG_task_listen(const char *alias) * * It takes one parameter. * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). * \return 1 if there is a pending communication and 0 otherwise */ int MSG_task_Iprobe(m_channel_t channel) { - xbt_assert1((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - CHECK_HOST(); + CHECK_HOST(); - return - !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel - (MSG_host_self(), channel)); + return + !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel + (MSG_host_self(), channel)); } /** \ingroup msg_gos_functions * \brief Return the number of tasks waiting to be received on a \a - channel and sent by \a host. + channel and sent by \a host. * * It takes two parameters. * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). * \param host the host that is to be watched. * \return the number of tasks waiting to be received on \a channel - and sent by \a host. + and sent by \a host. */ int MSG_task_probe_from_host(int channel, m_host_t host) { - xbt_assert1((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - CHECK_HOST(); + CHECK_HOST(); - return - MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel - (MSG_host_self(), channel), - host); + return + MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel + (MSG_host_self(), channel), + host); } int MSG_task_listen_from_host(const char *alias, m_host_t host) { - CHECK_HOST(); + CHECK_HOST(); - return - MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias(alias), - host); + return + MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias(alias), + host); } /** \ingroup msg_gos_functions @@ -680,198 +682,198 @@ int MSG_task_listen_from_host(const char *alias, m_host_t host) * * It takes one parameter. * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). * \return -1 if there is no pending communication and the PID of the process who sent it otherwise */ int MSG_task_probe_from(m_channel_t channel) { - m_task_t task; + m_task_t task; - CHECK_HOST(); + CHECK_HOST(); - xbt_assert1((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - if (NULL == - (task = - MSG_mailbox_get_head(MSG_mailbox_get_by_channel - (MSG_host_self(), channel)))) - return -1; + if (NULL == + (task = + MSG_mailbox_get_head(MSG_mailbox_get_by_channel + (MSG_host_self(), channel)))) + return -1; - return MSG_process_get_PID(task->simdata->sender); + return MSG_process_get_PID(task->simdata->sender); } int MSG_task_listen_from(const char *alias) { - m_task_t task; + m_task_t task; - CHECK_HOST(); + CHECK_HOST(); - if (NULL == (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) - return -1; + if (NULL == (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) + return -1; - return MSG_process_get_PID(task->simdata->sender); + return MSG_process_get_PID(task->simdata->sender); } /** \ingroup msg_gos_functions * \brief Wait for at most \a max_duration second for a task reception - on \a channel. + on \a channel. * \a PID is updated with the PID of the first process that triggered this event if any. * * It takes three parameters: * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal. - number of channels fixed with MSG_set_channel_number(). + listening. This value has to be >=0 and < than the maximal. + number of channels fixed with MSG_set_channel_number(). * \param PID a memory location for storing an int. * \param timeout the maximum time to wait for a task before - giving up. In the case of a reception, *\a PID will be updated - with the PID of the first process to send a task. + giving up. In the case of a reception, *\a PID will be updated + with the PID of the first process to send a task. * \return #MSG_HOST_FAILURE if the host is shut down in the meantime - and #MSG_OK otherwise. + and #MSG_OK otherwise. */ -MSG_error_t + MSG_error_t MSG_channel_select_from(m_channel_t channel, double timeout, int *PID) { - m_host_t h = NULL; - simdata_host_t h_simdata = NULL; - m_task_t t; - int first_time = 1; - smx_cond_t cond; - msg_mailbox_t mailbox; + m_host_t h = NULL; + simdata_host_t h_simdata = NULL; + m_task_t t; + int first_time = 1; + smx_cond_t cond; + msg_mailbox_t mailbox; - xbt_assert1((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); + xbt_assert1((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); - if (PID) { - *PID = -1; - } + if (PID) { + *PID = -1; + } - if (timeout == 0.0) { - *PID = MSG_task_probe_from(channel); - MSG_RETURN(MSG_OK); - } else { - CHECK_HOST(); - h = MSG_host_self(); - h_simdata = h->simdata; + if (timeout == 0.0) { + *PID = MSG_task_probe_from(channel); + MSG_RETURN(MSG_OK); + } else { + CHECK_HOST(); + h = MSG_host_self(); + h_simdata = h->simdata; - mailbox = MSG_mailbox_get_by_channel(MSG_host_self(), channel); + mailbox = MSG_mailbox_get_by_channel(MSG_host_self(), channel); - while (MSG_mailbox_is_empty(mailbox)) { - if (timeout > 0) { - if (!first_time) { - MSG_RETURN(MSG_OK); - } - } + while (MSG_mailbox_is_empty(mailbox)) { + if (timeout > 0) { + if (!first_time) { + MSG_RETURN(MSG_OK); + } + } - SIMIX_mutex_lock(h_simdata->mutex); + SIMIX_mutex_lock(h_simdata->mutex); - xbt_assert1(!MSG_mailbox_get_cond(mailbox), - "A process is already blocked on this channel %d", channel); + xbt_assert1(!MSG_mailbox_get_cond(mailbox), + "A process is already blocked on this channel %d", channel); - cond = SIMIX_cond_init(); + cond = SIMIX_cond_init(); - MSG_mailbox_set_cond(mailbox, cond); + MSG_mailbox_set_cond(mailbox, cond); - if (timeout > 0) { - SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); - } else { - SIMIX_cond_wait(cond, h_simdata->mutex); - } + if (timeout > 0) { + SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); + } else { + SIMIX_cond_wait(cond, h_simdata->mutex); + } - SIMIX_cond_destroy(cond); - SIMIX_mutex_unlock(h_simdata->mutex); + SIMIX_cond_destroy(cond); + SIMIX_mutex_unlock(h_simdata->mutex); - if (SIMIX_host_get_state(h_simdata->smx_host) == 0) { - MSG_RETURN(MSG_HOST_FAILURE); - } + if (SIMIX_host_get_state(h_simdata->smx_host) == 0) { + MSG_RETURN(MSG_HOST_FAILURE); + } - MSG_mailbox_set_cond(mailbox, NULL); - first_time = 0; - } + MSG_mailbox_set_cond(mailbox, NULL); + first_time = 0; + } - if (NULL == (t = MSG_mailbox_get_head(mailbox))) - MSG_RETURN(MSG_OK); + if (NULL == (t = MSG_mailbox_get_head(mailbox))) + MSG_RETURN(MSG_OK); - if (PID) { - *PID = MSG_process_get_PID(t->simdata->sender); - } + if (PID) { + *PID = MSG_process_get_PID(t->simdata->sender); + } - MSG_RETURN(MSG_OK); - } + MSG_RETURN(MSG_OK); + } } MSG_error_t MSG_alias_select_from(const char *alias, double timeout, int *PID) { - m_host_t h = NULL; - simdata_host_t h_simdata = NULL; - m_task_t t; - int first_time = 1; - smx_cond_t cond; - msg_mailbox_t mailbox; + m_host_t h = NULL; + simdata_host_t h_simdata = NULL; + m_task_t t; + int first_time = 1; + smx_cond_t cond; + msg_mailbox_t mailbox; - if (PID) { - *PID = -1; - } + if (PID) { + *PID = -1; + } - if (timeout == 0.0) { - *PID = MSG_task_listen_from(alias); - MSG_RETURN(MSG_OK); - } else { - CHECK_HOST(); - h = MSG_host_self(); - h_simdata = h->simdata; + if (timeout == 0.0) { + *PID = MSG_task_listen_from(alias); + MSG_RETURN(MSG_OK); + } else { + CHECK_HOST(); + h = MSG_host_self(); + h_simdata = h->simdata; - DEBUG2("Probing on alias %s (%s)", alias, h->name); + DEBUG2("Probing on alias %s (%s)", alias, h->name); - mailbox = MSG_mailbox_get_by_alias(alias); + mailbox = MSG_mailbox_get_by_alias(alias); - while (MSG_mailbox_is_empty(mailbox)) { - if (timeout > 0) { - if (!first_time) { - MSG_RETURN(MSG_OK); - } - } + while (MSG_mailbox_is_empty(mailbox)) { + if (timeout > 0) { + if (!first_time) { + MSG_RETURN(MSG_OK); + } + } - SIMIX_mutex_lock(h_simdata->mutex); + SIMIX_mutex_lock(h_simdata->mutex); - xbt_assert1(!MSG_mailbox_get_cond(mailbox), - "A process is already blocked on this alias %s", alias); + xbt_assert1(!MSG_mailbox_get_cond(mailbox), + "A process is already blocked on this alias %s", alias); - cond = SIMIX_cond_init(); + cond = SIMIX_cond_init(); - MSG_mailbox_set_cond(mailbox, cond); + MSG_mailbox_set_cond(mailbox, cond); - if (timeout > 0) { - SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); - } else { - SIMIX_cond_wait(cond, h_simdata->mutex); - } + if (timeout > 0) { + SIMIX_cond_wait_timeout(cond, h_simdata->mutex, timeout); + } else { + SIMIX_cond_wait(cond, h_simdata->mutex); + } - SIMIX_cond_destroy(cond); - SIMIX_mutex_unlock(h_simdata->mutex); + SIMIX_cond_destroy(cond); + SIMIX_mutex_unlock(h_simdata->mutex); - if (SIMIX_host_get_state(h_simdata->smx_host) == 0) { - MSG_RETURN(MSG_HOST_FAILURE); - } + if (SIMIX_host_get_state(h_simdata->smx_host) == 0) { + MSG_RETURN(MSG_HOST_FAILURE); + } - MSG_mailbox_set_cond(mailbox, NULL); - first_time = 0; - } + MSG_mailbox_set_cond(mailbox, NULL); + first_time = 0; + } - if (NULL == (t = MSG_mailbox_get_head(mailbox))) - MSG_RETURN(MSG_OK); + if (NULL == (t = MSG_mailbox_get_head(mailbox))) + MSG_RETURN(MSG_OK); - if (PID) { - *PID = MSG_process_get_PID(t->simdata->sender); - } + if (PID) { + *PID = MSG_process_get_PID(t->simdata->sender); + } - MSG_RETURN(MSG_OK); - } + MSG_RETURN(MSG_OK); + } } diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c index d65f46f832..fff2e1176b 100644 --- a/src/simdag/sd_dotloader.c +++ b/src/simdag/sd_dotloader.c @@ -16,23 +16,23 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd,"Parsing DOT files"); static double parse_double(const char *string) { if (string == NULL) return -10; - int ret = 0; - double value; + int ret = 0; + double value; - ret = sscanf(string, "%lg", &value); - if (ret != 1) - WARN1("%s is not a double", string); - return value; + ret = sscanf(string, "%lg", &value); + if (ret != 1) + WARN1("%s is not a double", string); + return value; } static int parse_int(const char *string) { if (string == NULL) return -10; - int ret = 0; - int value; + int ret = 0; + int value; - ret = sscanf(string, "%d", &value); - if (ret != 1) - WARN1("%s is not an integer", string); - return value; + ret = sscanf(string, "%d", &value); + if (ret != 1) + WARN1("%s is not an integer", string); + return value; } static xbt_dynar_t result; @@ -42,17 +42,17 @@ static SD_task_t root_task,end_task; static Agraph_t * dag_dot; static void dump_res() { - unsigned int cursor; - SD_task_t task; - xbt_dynar_foreach(result,cursor,task) { - INFO1("Task %d",cursor); - SD_task_dump(task); - } + unsigned int cursor; + SD_task_t task; + xbt_dynar_foreach(result,cursor,task) { + INFO1("Task %d",cursor); + SD_task_dump(task); + } } static void dot_task_free(void*task){ - SD_task_t t=task; - SD_task_destroy(t); + SD_task_t t=task; + SD_task_destroy(t); } void Start_dot_job(Agnode_t *dag_node) ; void input_edge(SD_task_t current_job, Agedge_t *edge) ; @@ -64,95 +64,95 @@ void output_edge(SD_task_t current_job, Agedge_t *edge) ; * for more details. */ xbt_dynar_t SD_dotload(const char*filename){ - FILE* in_file = fopen(filename,"r"); - xbt_assert1(in_file, "Unable to open \"%s\"\n", filename); + FILE* in_file = fopen(filename,"r"); + xbt_assert1(in_file, "Unable to open \"%s\"\n", filename); SD_dotload_FILE(in_file); - fclose(in_file); + fclose(in_file); return result; } xbt_dynar_t SD_dotload_FILE(FILE* in_file){ - xbt_assert0(in_file, "Unable to use a null file descriptor\n"); + xbt_assert0(in_file, "Unable to use a null file descriptor\n"); dag_dot = agread(in_file,NIL(Agdisc_t*)); - result = xbt_dynar_new(sizeof(SD_task_t),dot_task_free); - files=xbt_dict_new(); - jobs=xbt_dict_new(); - root_task = SD_task_create_comp_seq("root",NULL,0); - /* by design the root task is always SCHEDULABLE */ - __SD_task_set_state(root_task, SD_SCHEDULABLE); + result = xbt_dynar_new(sizeof(SD_task_t),dot_task_free); + files=xbt_dict_new(); + jobs=xbt_dict_new(); + root_task = SD_task_create_comp_seq("root",NULL,0); + /* by design the root task is always SCHEDULABLE */ + __SD_task_set_state(root_task, SD_SCHEDULABLE); + + xbt_dynar_push(result,&root_task); + end_task = SD_task_create_comp_seq("end",NULL,0); - xbt_dynar_push(result,&root_task); - end_task = SD_task_create_comp_seq("end",NULL,0); - Agnode_t *dag_node = NULL; SD_task_t task_node = NULL; for (dag_node = agfstnode(dag_dot); dag_node; dag_node = agnxtnode(dag_dot,dag_node)){ Start_dot_job(dag_node); } agclose(dag_dot); - xbt_dict_free(&jobs); - - /* And now, post-process the files. - * We want a file task per pair of computation tasks exchanging the file. Duplicate on need - * Files not produced in the system are said to be produced by root task (top of DAG). - * Files not consumed in the system are said to be consumed by end task (bottom of DAG). - */ - xbt_dict_cursor_t cursor; - SD_task_t file; - char *name; - xbt_dict_foreach(files,cursor,name,file) { - unsigned int cpt1,cpt2; - SD_task_t newfile = NULL; - SD_dependency_t depbefore,depafter; - if (xbt_dynar_length(file->tasks_before) == 0) { - xbt_dynar_foreach(file->tasks_after,cpt2,depafter) { - SD_task_t newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); - SD_task_dependency_add(NULL,NULL,root_task,newfile); - SD_task_dependency_add(NULL,NULL,newfile,depafter->dst); - xbt_dynar_push(result,&newfile); - } - } else if (xbt_dynar_length(file->tasks_after) == 0) { - xbt_dynar_foreach(file->tasks_before,cpt2,depbefore) { - SD_task_t newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); - SD_task_dependency_add(NULL,NULL,depbefore->src,newfile); - SD_task_dependency_add(NULL,NULL,newfile,end_task); - xbt_dynar_push(result,&newfile); - } - } else { - xbt_dynar_foreach(file->tasks_before,cpt1,depbefore) { - xbt_dynar_foreach(file->tasks_after,cpt2,depafter) { - if (depbefore->src == depafter->dst) { - WARN2("File %s is produced and consumed by task %s. This loop dependency will prevent the execution of the task.", - file->name,depbefore->src->name); - } - newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); - SD_task_dependency_add(NULL,NULL,depbefore->src,newfile); - SD_task_dependency_add(NULL,NULL,newfile,depafter->dst); - xbt_dynar_push(result,&newfile); - } - } - } - } - - /* Push end task last */ - xbt_dynar_push(result,&end_task); - - /* Free previous copy of the files */ - xbt_dict_free(&files); + xbt_dict_free(&jobs); + + /* And now, post-process the files. + * We want a file task per pair of computation tasks exchanging the file. Duplicate on need + * Files not produced in the system are said to be produced by root task (top of DAG). + * Files not consumed in the system are said to be consumed by end task (bottom of DAG). + */ + xbt_dict_cursor_t cursor; + SD_task_t file; + char *name; + xbt_dict_foreach(files,cursor,name,file) { + unsigned int cpt1,cpt2; + SD_task_t newfile = NULL; + SD_dependency_t depbefore,depafter; + if (xbt_dynar_length(file->tasks_before) == 0) { + xbt_dynar_foreach(file->tasks_after,cpt2,depafter) { + SD_task_t newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); + SD_task_dependency_add(NULL,NULL,root_task,newfile); + SD_task_dependency_add(NULL,NULL,newfile,depafter->dst); + xbt_dynar_push(result,&newfile); + } + } else if (xbt_dynar_length(file->tasks_after) == 0) { + xbt_dynar_foreach(file->tasks_before,cpt2,depbefore) { + SD_task_t newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); + SD_task_dependency_add(NULL,NULL,depbefore->src,newfile); + SD_task_dependency_add(NULL,NULL,newfile,end_task); + xbt_dynar_push(result,&newfile); + } + } else { + xbt_dynar_foreach(file->tasks_before,cpt1,depbefore) { + xbt_dynar_foreach(file->tasks_after,cpt2,depafter) { + if (depbefore->src == depafter->dst) { + WARN2("File %s is produced and consumed by task %s. This loop dependency will prevent the execution of the task.", + file->name,depbefore->src->name); + } + newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); + SD_task_dependency_add(NULL,NULL,depbefore->src,newfile); + SD_task_dependency_add(NULL,NULL,newfile,depafter->dst); + xbt_dynar_push(result,&newfile); + } + } + } + } + + /* Push end task last */ + xbt_dynar_push(result,&end_task); + + /* Free previous copy of the files */ + xbt_dict_free(&files); //INFO2("result : %lld, dot : %lld",result,*dot); - return result; + return result; } void Start_dot_job(Agnode_t *dag_node) { - char *name = agnameof(dag_node); - double runtime = parse_double(agget(dag_node,"size")); - int performer = parse_int(agget(dag_node,"performer")); - INFO3("See ",name,agget(dag_node,"size"),runtime); - SD_task_t current_job = SD_task_create_comp_seq(name,(void*)performer,runtime); - xbt_dict_set(jobs,name,current_job,NULL); - xbt_dynar_push(result,¤t_job); + char *name = agnameof(dag_node); + double runtime = parse_double(agget(dag_node,"size")); + int performer = parse_int(agget(dag_node,"performer")); + INFO3("See ",name,agget(dag_node,"size"),runtime); + SD_task_t current_job = SD_task_create_comp_seq(name,(void*)performer,runtime); + xbt_dict_set(jobs,name,current_job,NULL); + xbt_dynar_push(result,¤t_job); Agedge_t *e; int count = 0; for (e = agfstin(dag_dot,dag_node); e; e = agnxtin(dag_dot,e)) { @@ -205,46 +205,46 @@ void Start_dot_job(Agnode_t *dag_node) { } void input_edge(SD_task_t current_job, Agedge_t *edge) { - SD_task_t file; - - char name[80]; - sprintf(name ,"%s->%s",agnameof(agtail(edge)) ,agnameof(aghead(edge))); - double size = parse_double(agget(edge,"size")); - int sender = parse_int(agget(edge,"sender")); - int reciever = parse_int(agget(edge,"reciever")); - - file = xbt_dict_get_or_null(files,name); - if (file==NULL) { - file = SD_task_create_comm_e2e(name,NULL,size); - xbt_dict_set(files,name,file,&dot_task_free); - } else { - if (SD_task_get_amount(file)!=size) { - WARN3("Ignoring file %s size redefinition from %.0f to %.0f", - name,SD_task_get_amount(file),size); - } - } + SD_task_t file; + + char name[80]; + sprintf(name ,"%s->%s",agnameof(agtail(edge)) ,agnameof(aghead(edge))); + double size = parse_double(agget(edge,"size")); + int sender = parse_int(agget(edge,"sender")); + int reciever = parse_int(agget(edge,"reciever")); + + file = xbt_dict_get_or_null(files,name); + if (file==NULL) { + file = SD_task_create_comm_e2e(name,NULL,size); + xbt_dict_set(files,name,file,&dot_task_free); + } else { + if (SD_task_get_amount(file)!=size) { + WARN3("Ignoring file %s size redefinition from %.0f to %.0f", + name,SD_task_get_amount(file),size); + } + } SD_task_dependency_add(NULL,NULL,file,current_job); } void output_edge(SD_task_t current_job, Agedge_t *edge) { - SD_task_t file; - char name[80]; - sprintf(name ,"%s->%s",agnameof(agtail(edge)) ,agnameof(aghead(edge))); - double size = parse_double(agget(edge,"size")); - int sender = parse_int(agget(edge,"sender")); - int reciever = parse_int(agget(edge,"reciever")); - -// INFO2("See ",A_dot__uses_file,(is_input?"in":"out")); - file = xbt_dict_get_or_null(files,name); - if (file==NULL) { - file = SD_task_create_comm_e2e(name,NULL,size); - xbt_dict_set(files,name,file,&dot_task_free); - } else { - if (SD_task_get_amount(file)!=size) { - WARN3("Ignoring file %s size redefinition from %.0f to %.0f", - name,SD_task_get_amount(file),size); - } - } + SD_task_t file; + char name[80]; + sprintf(name ,"%s->%s",agnameof(agtail(edge)) ,agnameof(aghead(edge))); + double size = parse_double(agget(edge,"size")); + int sender = parse_int(agget(edge,"sender")); + int reciever = parse_int(agget(edge,"reciever")); + + // INFO2("See ",A_dot__uses_file,(is_input?"in":"out")); + file = xbt_dict_get_or_null(files,name); + if (file==NULL) { + file = SD_task_create_comm_e2e(name,NULL,size); + xbt_dict_set(files,name,file,&dot_task_free); + } else { + if (SD_task_get_amount(file)!=size) { + WARN3("Ignoring file %s size redefinition from %.0f to %.0f", + name,SD_task_get_amount(file),size); + } + } SD_task_dependency_add(NULL,NULL,current_job,file); if (xbt_dynar_length(file->tasks_before)>1) { WARN1("File %s created at more than one location...",file->name);