X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad5365a072943b2b0bacc486fa504e93a99ea940..d1476ed63c5c33d5a1395b70ac17374e07f7b80d:/src/msg/private.h diff --git a/src/msg/private.h b/src/msg/private.h index f314cfd8d1..f7c617b212 100644 --- a/src/msg/private.h +++ b/src/msg/private.h @@ -1,6 +1,8 @@ -/* $Id$ */ +/* $Id$ */ -/* Copyright (c) 2002,2004,2004 Arnaud Legrand. All rights reserved. */ +/* Copyright (c) 2002-2007 Arnaud Legrand. */ +/* Copyright (c) 2007 Bruno Donassolo. */ +/* All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -8,99 +10,93 @@ #ifndef METASIMGRID_PRIVATE_H #define METASIMGRID_PRIVATE_H +#include #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 "xbt/mallocator.h" -/**************** datatypes **********************************/ +SG_BEGIN_DECL() -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; -} s_simdata_host_t; +/**************** datatypes **********************************/ +/* this structure represents a mailbox */ + typedef struct s_msg_mailbox { + char *alias; /* the key of the mailbox in the global dictionary */ + smx_cond_t cond; /* the condition on the mailbox */ + smx_rdv_t rdv; /* SIMIX rendez-vous point */ + } s_msg_mailbox_t; + + typedef struct simdata_host { + smx_host_t smx_host; /* SURF modeling */ + struct s_msg_mailbox **mailboxes; /* mailboxes to store msg tasks of of the host */ + smx_mutex_t mutex; /* mutex to access 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 */ - m_process_t sender; - m_host_t source; - double priority; - double rate; - int using; + typedef struct simdata_task { + smx_action_t compute; /* SURF modeling of computation */ + smx_comm_t comm; /* SIMIX communication */ + double message_size; /* Data size */ + double computation_amount; /* Computation size */ + smx_cond_t cond; + smx_mutex_t mutex; /* Task mutex */ + m_process_t sender; + m_process_t receiver; + m_host_t source; + double priority; + double rate; + int refcount; /******* Parallel Tasks Only !!!! *******/ - int host_nb; - void * *host_list; /* SURF modeling */ - double *comp_amount; - double *comm_amount; -} s_simdata_task_t; + int host_nb; + smx_host_t *host_list; + double *comp_amount; + double *comm_amount; + } s_simdata_task_t; /******************************* 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 */ - 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; - void *data; - m_host_t host; - int argc; - char **argv; - double kill_time; -} s_process_arg_t, *process_arg_t; + typedef struct simdata_process { + 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 */ + } s_simdata_process_t; + + typedef struct process_arg { + const char *name; + xbt_main_func_t code; + void *data; + m_host_t m_host; + int argc; + char **argv; + double kill_time; + } s_process_arg_t, *process_arg_t; /************************** 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; - xbt_mallocator_t task_mallocator; - xbt_mallocator_t task_simdata_mallocator; -} s_MSG_Global_t, *MSG_Global_t; - -extern MSG_Global_t msg_global; - -/************************** Configuration support ********************************/ -XBT_PUBLIC(void) msg_config_init(void); /* create the config set, call this before use! */ -XBT_PUBLIC(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; + typedef struct MSG_Global { + xbt_fifo_t host; + xbt_fifo_t process_list; + int max_channel; + 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;*/ +XBT_PUBLIC_DATA(MSG_Global_t) msg_global; + /*************************************************************/ @@ -109,68 +105,23 @@ 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.") - -XBT_PUBLIC(m_host_t) __MSG_host_create(const char *name, void *workstation, - void *data); -XBT_PUBLIC(void) __MSG_host_destroy(m_host_t host); -XBT_PUBLIC(void) __MSG_task_execute(m_process_t process, m_task_t task); -XBT_PUBLIC(MSG_error_t) __MSG_wait_for_computation(m_process_t process, m_task_t task); -XBT_PUBLIC(MSG_error_t) __MSG_task_wait_event(m_process_t process, m_task_t task); - -XBT_PUBLIC(int) __MSG_process_block(double max_duration, const char *info); -XBT_PUBLIC(MSG_error_t) __MSG_process_unblock(m_process_t process); -XBT_PUBLIC(int) __MSG_process_isBlocked(m_process_t process); - -XBT_PUBLIC(void) __MSG_display_process_status(void); - -XBT_PUBLIC(m_task_t) task_mallocator_new_f(void); -XBT_PUBLIC(void) task_mallocator_free_f(m_task_t task); -XBT_PUBLIC(void) task_mallocator_reset_f(m_task_t task); - - - -#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,task)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,"11 %f S_t %p %s \"%s\"\n",\ - surf_get_clock(), (process),(state),(task)?((m_task_t)(task))->name:" ") -#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 \"CHANNEL_%d %s\" %p %p\n", \ - surf_get_clock(), channel, task->name, (process), task) -#define PAJE_COMM_STOP(process,task,channel)\ - if(msg_global->paje_output) \ - fprintf(msg_global->paje_output,\ - "17 %f Comm CUR \"CHANNEL_%d %s\" %p %p\n", \ - surf_get_clock(), channel, task->name, (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); +#define CHECK_HOST() xbt_assert1(SIMIX_host_get_state(SIMIX_host_self())==1,\ + "Host failed, you cannot call this function. (state=%d)",SIMIX_host_get_state(SIMIX_host_self())) + + m_host_t __MSG_host_create(smx_host_t workstation, void *data); + + void __MSG_host_destroy(m_host_t host); + + void __MSG_display_process_status(void); + + void __MSG_process_cleanup(void *arg); + 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); +SG_END_DECL() #endif