X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ba71e33e73c61ca467a37dda2bc3b9d5f9ed1b..2cc8ea0d3fabf1676e26e7361de7c45d09d5a2b6:/src/msg/host.c diff --git a/src/msg/host.c b/src/msg/host.c index 98668736fa..20541bc96a 100644 --- a/src/msg/host.c +++ b/src/msg/host.c @@ -1,8 +1,5 @@ -/* $Id$ */ - -/* Copyright (c) 2002-2007 Arnaud Legrand. */ -/* Copyright (c) 2007 Bruno Donassolo. */ -/* 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. */ @@ -10,7 +7,7 @@ #include "msg/private.h" #include "xbt/sysdep.h" #include "xbt/log.h" -#include "msg_mailbox.h" +#include "mailbox.h" /** \defgroup m_host_management Management functions of Hosts * \brief This section describes the host structure of MSG @@ -31,44 +28,38 @@ /********************************* Host **************************************/ m_host_t __MSG_host_create(smx_host_t workstation, void *data) { - const char *name; - simdata_host_t simdata = xbt_new0(s_simdata_host_t, 1); - m_host_t host = xbt_new0(s_m_host_t, 1); - int i; - - char alias[MAX_ALIAS_NAME +1] = {0}; /* buffer used to build the key of the mailbox */ - msg_mailbox_t mailbox; - - name = SIMIX_host_get_name(workstation); - /* Host structure */ - host->name = xbt_strdup(name); - host->simdata = simdata; - host->data = data; - - simdata->smx_host = workstation; - - simdata->mbox = xbt_new0(xbt_fifo_t, msg_global->max_channel); - - for (i = 0; i < msg_global->max_channel; i++) - { - sprintf(alias,"%s:%d",name,i); - - /* the key of the mailbox (in this case) is build from the name of the host and the channel number */ - mailbox = MSG_mailbox_new(alias); - MSG_mailbox_set_hostname(mailbox,name); - memset(alias,0,MAX_ALIAS_NAME +1); - - simdata->mbox[i] = xbt_fifo_new(); - } - - simdata->sleeping = xbt_new0(smx_cond_t, msg_global->max_channel); - simdata->mutex = SIMIX_mutex_init(); - SIMIX_host_set_data(workstation, host); - - /* Update global variables */ - xbt_fifo_unshift(msg_global->host, host); - - return host; + const char *name; + simdata_host_t simdata = xbt_new0(s_simdata_host_t, 1); + m_host_t host = xbt_new0(s_m_host_t, 1); + int i; + + char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */ + + name = SIMIX_host_get_name(workstation); + /* Host structure */ + host->name = xbt_strdup(name); + host->simdata = simdata; + host->data = data; + + simdata->smx_host = workstation; + + if (msg_global->max_channel > 0) + simdata->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel); + + for (i = 0; i < msg_global->max_channel; i++) { + sprintf(alias, "%s:%d", name, i); + + /* the key of the mailbox (in this case) is build from the name of the host and the channel number */ + simdata->mailboxes[i] = MSG_mailbox_new(alias); + memset(alias, 0, MAX_ALIAS_NAME + 1); + } + + SIMIX_req_host_set_data(workstation, host); + + /* Update global variables */ + xbt_fifo_unshift(msg_global->host, host); + + return host; } /** \ingroup m_host_management @@ -116,7 +107,7 @@ const char *MSG_host_get_name(m_host_t host) { xbt_assert0((host != NULL) - && (host->simdata != NULL), "Invalid parameters"); + && (host->simdata != NULL), "Invalid parameters"); /* Return data */ return (host->name); @@ -140,7 +131,7 @@ void __MSG_host_destroy(m_host_t host) { simdata_host_t simdata = NULL; int i = 0; - char alias[MAX_ALIAS_NAME +1] = {0}; /* buffer used to build the key of the mailbox */ + char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */ xbt_assert0((host != NULL), "Invalid parameters"); @@ -148,25 +139,22 @@ void __MSG_host_destroy(m_host_t host) /* SIMIX host will be cleaned when MSG_clean calls SIMIX_clean */ simdata = (host)->simdata; - for (i = 0; i < msg_global->max_channel; i++) - { - sprintf(alias,"%s:%d",host->name,i); - xbt_dict_remove(MSG_get_mailboxes(),alias); - memset(alias,0,MAX_ALIAS_NAME +1); - - xbt_fifo_free(simdata->mbox[i]); + for (i = 0; i < msg_global->max_channel; i++) { + sprintf(alias, "%s:%d", host->name, i); + MSG_mailbox_free((void *) (simdata->mailboxes[i])); + memset(alias, 0, MAX_ALIAS_NAME + 1); } - free(simdata->mbox); - free(simdata->sleeping); - SIMIX_mutex_destroy(simdata->mutex); + if (msg_global->max_channel > 0) + free(simdata->mailboxes); + free(simdata); /* Clean host structure */ free(host->name); free(host); - return; + } /** \ingroup m_host_management @@ -192,7 +180,7 @@ m_host_t *MSG_get_host_table(void) int MSG_get_host_msgload(m_host_t h) { xbt_assert0((h != NULL), "Invalid parameters"); - xbt_assert0(0, "Not implemented yet"); + xbt_die( "Not implemented yet"); return (0); } @@ -205,7 +193,7 @@ double MSG_get_host_speed(m_host_t h) { xbt_assert0((h != NULL), "Invalid parameters"); - return (SIMIX_host_get_speed(h->simdata->smx_host)); + return (SIMIX_req_host_get_speed(h->simdata->smx_host)); } /** \ingroup m_host_management @@ -215,7 +203,7 @@ double MSG_get_host_speed(m_host_t h) * \param name a property name * \return value of a property (or NULL if property not set) */ -const char* MSG_host_get_property_value(m_host_t host, const char* name) +const char *MSG_host_get_property_value(m_host_t host, const char *name) { return xbt_dict_get_or_null(MSG_host_get_properties(host), name); } @@ -228,9 +216,9 @@ const char* MSG_host_get_property_value(m_host_t host, const char* name) */ xbt_dict_t MSG_host_get_properties(m_host_t host) { - xbt_assert0((host != NULL), "Invalid parameters"); + xbt_assert0((host != NULL), "Invalid parameters (host is NULL)"); - return (SIMIX_host_get_properties(host->simdata->smx_host)); + return (SIMIX_req_host_get_properties(host->simdata->smx_host)); } @@ -241,6 +229,6 @@ xbt_dict_t MSG_host_get_properties(m_host_t host) */ int MSG_host_is_avail(m_host_t h) { - xbt_assert0((h != NULL), "Invalid parameters"); - return (SIMIX_host_get_state(h->simdata->smx_host)); + xbt_assert0((h != NULL), "Invalid parameters (host is NULL)"); + return (SIMIX_req_host_get_state(h->simdata->smx_host)); }