X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b0bd0896ce802ba842f77b362f2fbbabb88747ff..a24e5e842b10085c859c6988099e815964db2eda:/src/msg/private.h diff --git a/src/msg/private.h b/src/msg/private.h index 8d60aa7399..17549a9624 100644 --- a/src/msg/private.h +++ b/src/msg/private.h @@ -1,6 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2002,2004,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. */ @@ -9,40 +8,39 @@ #define METASIMGRID_PRIVATE_H #include "msg/msg.h" +#include "simix/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" #include "xbt/dynar.h" #include "xbt/swag.h" #include "xbt/dict.h" -#include "xbt/context.h" #include "xbt/config.h" +#include "instr/instr_private.h" -/**************** datatypes **********************************/ +SG_BEGIN_DECL() +/**************** datatypes **********************************/ typedef struct simdata_host { - void *host; /* SURF modeling */ - xbt_fifo_t *mbox; /* array of FIFOs used as a mailboxes */ - m_process_t *sleeping; /* array of process used to know whether a local process is - waiting for a communication on a channel */ - xbt_fifo_t process_list; + smx_host_t smx_host; /* SURF modeling */ + msg_mailbox_t *mailboxes; /* mailboxes to store msg tasks of of the host */ } s_simdata_host_t; /********************************* Task **************************************/ typedef struct simdata_task { - surf_action_t compute; /* SURF modeling of computation */ - surf_action_t comm; /* SURF modeling of communication */ - double message_size; /* Data size */ - double computation_amount; /* Computation size */ - xbt_dynar_t sleeping; /* process to wake-up */ + smx_action_t compute; /* SURF modeling of computation */ + smx_action_t comm; /* SIMIX communication */ + double message_size; /* Data size */ + double computation_amount; /* Computation size */ m_process_t sender; + m_process_t receiver; m_host_t source; double priority; double rate; - int using; + int isused; /* Indicates whether the task is used in SIMIX currently */ + int host_nb; /* ==0 if sequential task; parallel task if not */ /******* Parallel Tasks Only !!!! *******/ - int host_nb; - void * *host_list; /* SURF modeling */ + smx_host_t *host_list; double *comp_amount; double *comm_amount; } s_simdata_task_t; @@ -50,26 +48,24 @@ typedef struct simdata_task { /******************************* Process *************************************/ typedef struct simdata_process { - m_host_t host; /* the host on which the process is running */ - xbt_context_t context; /* the context that executes the scheduler fonction */ - int PID; /* used for debugging purposes */ - int PPID; /* The parent PID */ - m_task_t waiting_task; - int blocked; - int suspended; - m_host_t put_host; /* used for debugging purposes */ - m_channel_t put_channel; /* used for debugging purposes */ + m_host_t m_host; /* the host on which the process is running */ + smx_process_t s_process; + int PID; /* used for debugging purposes */ + int PPID; /* The parent PID */ + m_host_t put_host; /* used for debugging purposes */ + m_channel_t put_channel; /* used for debugging purposes */ + smx_action_t waiting_action; + m_task_t waiting_task; int argc; /* arguments number if any */ char **argv; /* arguments table if any */ MSG_error_t last_errno; /* the last value returned by a MSG_function */ - int paje_state; /* the number of states stacked with Paje */ } s_simdata_process_t; typedef struct process_arg { const char *name; - m_process_code_t code; + xbt_main_func_t code; void *data; - m_host_t host; + m_host_t m_host; int argc; char **argv; double kill_time; @@ -78,26 +74,16 @@ typedef struct process_arg { /************************** Global variables ********************************/ typedef struct MSG_Global { xbt_fifo_t host; - xbt_fifo_t process_to_run; xbt_fifo_t process_list; int max_channel; - m_process_t current_process; - xbt_dict_t registered_functions; - FILE *paje_output; - int paje_maxPID; int PID; int session; + unsigned long int sent_msg; /* Total amount of messages sent during the simulation */ } s_MSG_Global_t, *MSG_Global_t; -extern MSG_Global_t msg_global; - -/************************** Configuration support ********************************/ -void msg_config_init(void); /* create the config set, call this before use! */ -void msg_config_finalize(void); /* destroy the config set, call this at cleanup. */ -extern int _msg_init_status; /* 0: beginning of time; - 1: pre-inited (cfg_set created); - 2: inited (running) */ -extern xbt_cfg_t _msg_cfg_set; +/*extern MSG_Global_t msg_global;*/ +XBT_PUBLIC_DATA(MSG_Global_t) msg_global; + /*************************************************************/ @@ -106,106 +92,24 @@ extern xbt_cfg_t _msg_cfg_set; #define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0) /* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */ -#define CHECK_HOST() xbt_assert0(surf_workstation_resource->extension_public-> \ - get_state(MSG_host_self()->simdata->host)==SURF_CPU_ON,\ - "Host failed, you cannot call this function.") +#define CHECK_HOST() xbt_assert1(SIMIX_req_host_get_state(SIMIX_host_self())==1,\ + "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self())) + +m_host_t __MSG_host_create(smx_host_t workstation, void *data); -m_host_t __MSG_host_create(const char *name, void *workstation, - void *data); void __MSG_host_destroy(m_host_t host); -void __MSG_task_execute(m_process_t process, m_task_t task); -MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task); -MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task); - -int __MSG_process_block(double max_duration); -MSG_error_t __MSG_process_unblock(m_process_t process); -int __MSG_process_isBlocked(m_process_t process); - -#ifdef ALVIN_SPECIAL_LOGING -#define PAJE_PROCESS_STATE(process,state)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,"10 %f S_t P%d %s\n",\ - surf_get_clock(), (process)->simdata->PID,(state)) -#define PAJE_PROCESS_PUSH_STATE(process,state)\ - if(msg_global->paje_output) { \ - fprintf(msg_global->paje_output,"11 %f S_t P%d %s\n",\ - surf_get_clock(), (process)->simdata->PID,(state));\ - (process)->simdata->paje_state++; \ - } -#define PAJE_PROCESS_POP_STATE(process)\ - if(msg_global->paje_output) { \ - fprintf(msg_global->paje_output,"12 %f S_t P%d\n",\ - surf_get_clock(), (process)->simdata->PID); \ - (process)->simdata->paje_state--; \ - } -#define PAJE_PROCESS_FREE(process) -#define PAJE_PROCESS_NEW(process)\ - if((msg_global->paje_output)) {\ - if((msg_global->session==0) || ((msg_global->session>0) && ((process)->simdata->PID > msg_global->paje_maxPID))) \ - fprintf(msg_global->paje_output,"7 %f P%d P_t %p \"%s %d (%d)\"\n", \ - surf_get_clock(), (process)->simdata->PID, (process)->simdata->host, \ - (process)->name, (process)->simdata->PID, msg_global->session);\ - if(msg_global->paje_maxPID<(process)->simdata->PID) msg_global->paje_maxPID=(process)->simdata->PID;\ - } -#define PAJE_COMM_START(process,task,channel)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,\ - "16 %f Comm CUR COMM_%d P%d %p\n", \ - surf_get_clock(), channel, (process)->simdata->PID, task) -#define PAJE_COMM_STOP(process,task,channel)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,\ - "17 %f Comm CUR COMM_%d P%d %p\n", \ - surf_get_clock(), channel, (process)->simdata->PID, task) -#define PAJE_HOST_NEW(host)\ - if(msg_global->paje_output)\ - fprintf(msg_global->paje_output,"7 %f %p H_t CUR \"%s\"\n",surf_get_clock(), \ - host, host->name) -#define PAJE_HOST_FREE(host)\ - if(msg_global->paje_output)\ - fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host) - -#else - -#define PAJE_PROCESS_STATE(process,state)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,"10 %f S_t %p %s\n",\ - surf_get_clock(), (process),(state)) -#define PAJE_PROCESS_PUSH_STATE(process,state)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,"11 %f S_t %p %s\n",\ - surf_get_clock(), (process),(state)) -#define PAJE_PROCESS_POP_STATE(process)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,"12 %f S_t %p\n",\ - surf_get_clock(), (process)) - -#define PAJE_PROCESS_FREE(process)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,"8 %f %p P_t\n", \ - surf_get_clock(), (process)) -#define PAJE_PROCESS_NEW(process)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,"7 %f %p P_t %p \"%s %d (%d)\"\n", \ - surf_get_clock(), (process), (process)->simdata->host, \ - (process)->name, (process)->simdata->PID, msg_global->session) -#define PAJE_COMM_START(process,task,channel)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,\ - "16 %f Comm CUR COMM_%d %p %p\n", \ - surf_get_clock(), channel, (process), task) -#define PAJE_COMM_STOP(process,task,channel)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,\ - "17 %f Comm CUR COMM_%d %p %p\n", \ - surf_get_clock(), channel, (process), task) -#define PAJE_HOST_NEW(host)\ - if(msg_global->paje_output)\ - fprintf(msg_global->paje_output,"7 %f %p H_t CUR \"%s\"\n",surf_get_clock(), \ - host, host->name) -#define PAJE_HOST_FREE(host)\ - if(msg_global->paje_output)\ - fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host); - -#endif /* Alvin_Special_Loging */ + +void __MSG_display_process_status(void); + +void __MSG_process_cleanup(smx_process_t smx_proc); +void *_MSG_process_create_from_SIMIX(const char *name, + xbt_main_func_t code, void *data, + char *hostname, int argc, + char **argv, xbt_dict_t properties); +void _MSG_process_kill_from_SIMIX(void *p); + +void _MSG_action_init(void); +void _MSG_action_exit(void); + +SG_END_DECL() #endif