X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09f32d96bbc399a919b44b12f63ea054dcefda76..e487ef4538248f261ddb6e814357593df7646e33:/src/msg/private.h diff --git a/src/msg/private.h b/src/msg/private.h index d7fa359e6b..63d2703011 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,64 +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" -/**************** 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 */ + xbt_fifo_t tasks; /* the list of the tasks in the mailbox */ + smx_cond_t cond; /* the condition on the mailbox */ + char *hostname; /* the name of the host containing the mailbox */ + } 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; - int using; -} s_simdata_task_t; + typedef struct simdata_task { + smx_action_t compute; /* SURF modeling of computation */ + smx_action_t comm; /* SURF modeling of 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; + 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 */ -} s_simdata_process_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; + 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; -} s_MSG_Global_t, *MSG_Global_t; + 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; -extern MSG_Global_t msg_global; /*************************************************************/ @@ -74,19 +105,23 @@ extern MSG_Global_t msg_global; #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_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); -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); + 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); -MSG_error_t __MSG_process_block(void); -MSG_error_t __MSG_process_unblock(m_process_t process); -int __MSG_process_isBlocked(m_process_t process); + void _MSG_action_init(void); +SG_END_DECL() #endif