X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b1a306fd49277f2ee84b9bb9dbfdff69762734e..6443d4868c5974225d792156daf319775234b087:/src/msg/host.c diff --git a/src/msg/host.c b/src/msg/host.c index af47296154..d1425a2cba 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. */ @@ -31,41 +28,36 @@ /********************************* 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 */ - - 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_create(alias); - MSG_mailbox_set_hostname(simdata->mailboxes[i],name); - memset(alias,0,MAX_ALIAS_NAME +1); - } - - 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); + xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host); + + return host; } /** \ingroup m_host_management @@ -77,8 +69,8 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data) */ MSG_error_t MSG_host_set_data(m_host_t host, void *data) { - xbt_assert0((host != NULL), "Invalid parameters"); - xbt_assert0((host->data == NULL), "Data already set"); + xbt_assert((host != NULL), "Invalid parameters"); + xbt_assert((host->data == NULL), "Data already set"); /* Assign data */ host->data = data; @@ -96,7 +88,7 @@ MSG_error_t MSG_host_set_data(m_host_t host, void *data) void *MSG_host_get_data(m_host_t host) { - xbt_assert0((host != NULL), "Invalid parameters"); + xbt_assert((host != NULL), "Invalid parameters"); /* Return data */ return (host->data); @@ -112,8 +104,8 @@ void *MSG_host_get_data(m_host_t host) const char *MSG_host_get_name(m_host_t host) { - xbt_assert0((host != NULL) - && (host->simdata != NULL), "Invalid parameters"); + xbt_assert((host != NULL) + && (host->simdata != NULL), "Invalid parameters"); /* Return data */ return (host->name); @@ -128,40 +120,27 @@ m_host_t MSG_host_self(void) return MSG_process_get_host(MSG_process_self()); } -/* - * Real function to destroy a host. - * MSG_host_destroy is just a front_end that also removes it from - * msg_global->host +/** \ingroup m_host_management + * + * \brief Destroys a host */ 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 */ - - xbt_assert0((host != NULL), "Invalid parameters"); - - /* Clean Simulator data */ - /* 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); - MSG_mailbox_free((void*)(simdata->mailboxes[i])); - memset(alias,0,MAX_ALIAS_NAME +1); - } - - if (msg_global->max_channel>0) - free(simdata->mailboxes); - SIMIX_mutex_destroy(simdata->mutex); - free(simdata); - - /* Clean host structure */ - free(host->name); - free(host); - + simdata_host_t simdata = NULL; + + xbt_assert((host != NULL), "Invalid parameters"); + + /* Clean simulator data */ + simdata = (host)->simdata; + + if (msg_global->max_channel > 0) + free(simdata->mailboxes); + + free(simdata); + /* Clean host structure */ + free(host->name); + free(host); } /** \ingroup m_host_management @@ -169,7 +148,7 @@ void __MSG_host_destroy(m_host_t host) */ int MSG_get_host_number(void) { - return (xbt_fifo_size(msg_global->host)); + return host_lib->count; } /** \ingroup m_host_management @@ -177,7 +156,23 @@ int MSG_get_host_number(void) */ m_host_t *MSG_get_host_table(void) { - return ((m_host_t *) xbt_fifo_to_array(msg_global->host)); + void **array; + int i = 0; + xbt_lib_cursor_t cursor; + char *key; + void **data; + + if (host_lib->count == 0) + return NULL; + else + array = xbt_new0(void *, host_lib->count); + + xbt_lib_foreach(host_lib, cursor, key, data) { + if(get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST) + array[i++] = data[MSG_HOST_LEVEL]; + } + + return (m_host_t *)array; } /** \ingroup m_host_management @@ -186,8 +181,8 @@ 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_assert((h != NULL), "Invalid parameters"); + xbt_die( "Not implemented yet"); return (0); } @@ -198,9 +193,9 @@ int MSG_get_host_msgload(m_host_t h) */ double MSG_get_host_speed(m_host_t h) { - xbt_assert0((h != NULL), "Invalid parameters"); + xbt_assert((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 @@ -210,7 +205,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); } @@ -223,9 +218,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_assert((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)); } @@ -236,6 +231,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_assert((h != NULL), "Invalid parameters (host is NULL)"); + return (SIMIX_req_host_get_state(h->simdata->smx_host)); }