From: Martin Quinson Date: Thu, 21 Jan 2016 20:14:04 +0000 (+0100) Subject: kill another GRAS leftover: xbt_peer_t X-Git-Tag: v3_13~1144 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/782a240a6fb5d89809907de92573e779666f3cad kill another GRAS leftover: xbt_peer_t --- diff --git a/ChangeLog b/ChangeLog index 903b09b97f..c9c742578f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,8 +21,9 @@ SimGrid (3.13) UNRELEASED; urgency=low as we attempt to unify our naming schemes -> smpi/send_is_detached_thresh XBT - * Kill the setset datacontainer: it's unused since a while. - * Kill the queue datacontainer: it made more sense with GRAS. + * Kill the setset data container: MC don't use it anymore. + * Kill the queue data container: it made more sense with GRAS. + * Kill the xbt_peer_t data type: it's useless without GRAS. JAVA: * Remove the ability to write internal plugins in Java. diff --git a/include/xbt.h b/include/xbt.h index 16de2998e0..5a1adc3abb 100644 --- a/include/xbt.h +++ b/include/xbt.h @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/include/xbt/config.h b/include/xbt/config.h index 57fdd2f337..58b3a41e7c 100644 --- a/include/xbt/config.h +++ b/include/xbt/config.h @@ -104,8 +104,6 @@ XBT_PUBLIC(void) xbt_cfg_set_double(xbt_cfg_t cfg, const char *name, XBT_PUBLIC(void) xbt_cfg_set_string(xbt_cfg_t cfg, const char *name, const char *val); XBT_PUBLIC(void) xbt_cfg_set_boolean(xbt_cfg_t cfg, const char *name, const char *val); -XBT_PUBLIC(void) xbt_cfg_set_peer(xbt_cfg_t cfg, const char *name, - const char *peer, int port); XBT_PUBLIC(void*) xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *name, const char *val); /* @@ -120,9 +118,6 @@ XBT_PUBLIC(void) xbt_cfg_setdefault_string(xbt_cfg_t cfg, const char *name, const char *val); XBT_PUBLIC(void) xbt_cfg_setdefault_boolean(xbt_cfg_t cfg, const char *name, const char *val); -XBT_PUBLIC(void) xbt_cfg_setdefault_peer(xbt_cfg_t cfg, const char *name, - const char *host, int port); - /* Remove the provided value from the cell @name in @cfg. @@ -133,8 +128,6 @@ XBT_PUBLIC(void) xbt_cfg_rm_double(xbt_cfg_t cfg, const char *name, XBT_PUBLIC(void) xbt_cfg_rm_string(xbt_cfg_t cfg, const char *name, const char *val); XBT_PUBLIC(void) xbt_cfg_rm_boolean(xbt_cfg_t cfg, const char *name, int val); -XBT_PUBLIC(void) xbt_cfg_rm_peer(xbt_cfg_t cfg, const char *name, - const char *peer, int port); /* Remove the value at position \e pos from the config \e cfg @@ -164,7 +157,6 @@ typedef enum { xbt_cfgelm_string, /**< char* */ xbt_cfgelm_boolean, /**< int */ - xbt_cfgelm_peer, /**< both a char* (representing the peername) and an integer (representing the port) */ //! @cond xbt_cfgelm_any, /* not shown to users to prevent errors */ @@ -233,8 +225,6 @@ XBT_PUBLIC(int) xbt_cfg_get_int(xbt_cfg_t cfg, const char *name); XBT_PUBLIC(double) xbt_cfg_get_double(xbt_cfg_t cfg, const char *name); XBT_PUBLIC(char *) xbt_cfg_get_string(xbt_cfg_t cfg, const char *name); XBT_PUBLIC(int) xbt_cfg_get_boolean(xbt_cfg_t cfg, const char *name); -XBT_PUBLIC(void) xbt_cfg_get_peer(xbt_cfg_t cfg, const char *name, - char **peer, int *port); XBT_PUBLIC(xbt_dynar_t) xbt_cfg_get_dynar(xbt_cfg_t cfg, const char *name); XBT_PUBLIC(int) xbt_cfg_get_int_at(xbt_cfg_t cfg, const char *name, @@ -245,8 +235,6 @@ XBT_PUBLIC(char *) xbt_cfg_get_string_at(xbt_cfg_t cfg, const char *name, int pos); XBT_PUBLIC(int) xbt_cfg_get_boolean_at(xbt_cfg_t cfg, const char *name, int pos); -XBT_PUBLIC(void) xbt_cfg_get_peer_at(xbt_cfg_t cfg, const char *name, - int pos, char **peer, int *port); /** @} */ diff --git a/include/xbt/peer.h b/include/xbt/peer.h deleted file mode 100644 index 4e402c0d08..0000000000 --- a/include/xbt/peer.h +++ /dev/null @@ -1,40 +0,0 @@ -/* peer.h - peer (remote processes) management functions */ - -/* Copyright (c) 2006-2007, 2009-2010, 2012-2014. 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. */ - -#ifndef XBT_PEER_H -#define XBT_PEER_H - -#include "xbt/misc.h" - -SG_BEGIN_DECL() - -/** @addtogroup XBT_peer - * \brief Helper functions to manipulate remote hosts - * - * This module simply introduces some rather trivial functions to manipulate remote host denomination (in the form hostname:port) - * - * @{ - */ -/** @brief Object describing a remote host (as name:port) */ -typedef struct s_xbt_peer *xbt_peer_t; - -/** @brief Structure describing a remote host (as name:port) */ -typedef struct s_xbt_peer { - char *name; - int port; -} s_xbt_peer_t; - -XBT_PUBLIC(xbt_peer_t) xbt_peer_new(const char *name, int port); -XBT_PUBLIC(xbt_peer_t) xbt_peer_from_string(const char *peerport); -XBT_PUBLIC(xbt_peer_t) xbt_peer_copy(xbt_peer_t h); -XBT_PUBLIC(void) xbt_peer_free(xbt_peer_t peer); -XBT_PUBLIC(void) xbt_peer_free_voidp(void *d); - -/** @} */ -SG_END_DECL() -#endif /* XBT_PEER_H */ diff --git a/src/include/simgrid/sg_config.h b/src/include/simgrid/sg_config.h index fbe0d5e3ed..7d8410e3c4 100644 --- a/src/include/simgrid/sg_config.h +++ b/src/include/simgrid/sg_config.h @@ -20,7 +20,6 @@ XBT_PUBLIC(int) sg_cfg_get_int(const char* name); XBT_PUBLIC(double) sg_cfg_get_double(const char* name); XBT_PUBLIC(char*) sg_cfg_get_string(const char* name); XBT_PUBLIC(int) sg_cfg_get_boolean(const char* name); -XBT_PUBLIC(void) sg_cfg_get_peer(const char *name, char **peer, int *port); XBT_PUBLIC(xbt_dynar_t) sg_cfg_get_dynar(const char* name); XBT_PUBLIC(void) sg_config_init(int *argc, char **argv); diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c index a36c0a2f3b..c6316bb6f5 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -1061,11 +1061,6 @@ int sg_cfg_get_boolean(const char* name) return xbt_cfg_get_boolean(_sg_cfg_set, name); } -void sg_cfg_get_peer(const char *name, char **peer, int *port) -{ - xbt_cfg_get_peer(_sg_cfg_set, name, peer, port); -} - xbt_dynar_t sg_cfg_get_dynar(const char* name) { return xbt_cfg_get_dynar(_sg_cfg_set, name); diff --git a/src/xbt/config.c b/src/xbt/config.c index 3f8a5e43b1..0798011d21 100644 --- a/src/xbt/config.c +++ b/src/xbt/config.c @@ -14,7 +14,6 @@ #include "xbt/ex.h" #include "xbt/dynar.h" #include "xbt/dict.h" -#include "xbt/peer.h" #include @@ -41,12 +40,12 @@ typedef struct { xbt_cfg_cb_t cb_rm; /* actual content - (cannot be an union because type peer uses both str and i) */ + (cannot be an union because type peer used to use both str and i, but it could be converted now) */ xbt_dynar_t content; } s_xbt_cfgelm_t, *xbt_cfgelm_t; static const char *xbt_cfgelm_type_name[xbt_cfgelm_type_count] = - { "int", "double", "string", "boolean", "peer", "any" }; + { "int", "double", "string", "boolean", "any" }; const struct xbt_boolean_couple xbt_cfgelm_boolean_values[] = { { "yes", "no"}, @@ -125,7 +124,6 @@ void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg) int ival; char *sval; double dval; - xbt_peer_t hval; if (name) printf("%s>> Dumping of the config set '%s':\n", indent, name); @@ -170,13 +168,6 @@ void xbt_cfg_dump(const char *name, const char *indent, xbt_cfg_t cfg) } break; - case xbt_cfgelm_peer: - for (i = 0; i < size; i++) { - hval = xbt_dynar_get_as(variable->content, i, xbt_peer_t); - printf("%s %s:%d\n", indent, hval->name, hval->port); - } - break; - default: printf("%s Invalid type!!\n", indent); } @@ -231,9 +222,9 @@ xbt_cfg_register(xbt_cfg_t * cfg, if (*cfg == NULL) *cfg = xbt_cfg_new(); - xbt_assert(type >= xbt_cfgelm_int && type <= xbt_cfgelm_peer, + xbt_assert(type >= xbt_cfgelm_int && type <= xbt_cfgelm_boolean, "type of %s not valid (%d should be between %d and %d)", - name, (int)type, xbt_cfgelm_int, xbt_cfgelm_peer); + name, (int)type, xbt_cfgelm_int, xbt_cfgelm_boolean); res = xbt_dict_get_or_null((xbt_dict_t) * cfg, name); if (res) { @@ -271,10 +262,6 @@ xbt_cfg_register(xbt_cfg_t * cfg, res->content = xbt_dynar_new(sizeof(int), NULL); break; - case xbt_cfgelm_peer: - res->content = xbt_dynar_new(sizeof(xbt_peer_t), xbt_peer_free_voidp); - break; - default: XBT_ERROR("%d is an invalid type code", (int)type); } @@ -305,7 +292,7 @@ void xbt_cfg_unregister(xbt_cfg_t cfg, const char *name) * * The string may consist in several variable descriptions separated by a space. * Each of them must use the following syntax: \:\_to_\_\ - * with type being one of 'string','int', 'peer' or 'double'. + * with type being one of 'string','int' or 'double'. * * FIXME: this does not allow to set the description */ @@ -347,7 +334,7 @@ void xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry) && strcmp(tok, xbt_cfgelm_type_name[type]); type++); xbt_assert(type < xbt_cfgelm_type_count, "Invalid type in config element descriptor: %s%s", entry, - "; Should be one of 'string', 'int', 'peer' or 'double'."); + "; Should be one of 'string', 'int' or 'double'."); xbt_cfg_register(cfg, entrycpy, NULL, type, min, max, NULL, NULL); @@ -419,12 +406,6 @@ void xbt_cfg_help(xbt_cfg_t cfg) break; } - case xbt_cfgelm_peer: { - xbt_peer_t hval = xbt_dynar_get_as(variable->content, i, xbt_peer_t); - printf("%s:%d%s", hval->name, hval->port, sep); - break; - } - default: printf("Invalid type!!%s", sep); } @@ -551,12 +532,6 @@ void xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa) } switch (type) { - case xbt_cfgelm_peer: - str = va_arg(pa, char *); - i = va_arg(pa, int); - xbt_cfg_set_peer(cfg, name, str, i); - break; - case xbt_cfgelm_string: str = va_arg(pa, char *); xbt_cfg_set_string(cfg, name, str); @@ -702,8 +677,6 @@ void *xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *key, const char *value) { volatile xbt_cfgelm_t variable = NULL; int i; double d; - char *str, *val; - TRY { variable = xbt_dict_get((xbt_dict_t) cfg, key); @@ -745,24 +718,6 @@ void *xbt_cfg_set_as_string(xbt_cfg_t cfg, const char *key, const char *value) { ret = (char *)value + strlen(value); break; - case xbt_cfgelm_peer: - val = xbt_strdup(value); - str = val; - val = strchr(val, ':'); - if (!val) { - xbt_die("Value of option %s not valid. Should be an peer (machine:port)", key); - } - - *(val++) = '\0'; - i = strtol(val, &ret, 0); - if (ret == val) { - xbt_die("Value of option %s not valid. Should be an peer (machine:port)", key); - } - - xbt_cfg_set_peer(cfg, key, str, i); /* throws */ - free(val); - break; - default: THROWF(unknown_error, 0, "Type of config element %s is not valid.", key); break; @@ -849,26 +804,6 @@ void xbt_cfg_setdefault_boolean(xbt_cfg_t cfg, const char *name, const char *val name, val); } -/** @brief Set a peer value to \a name within \a cfg if it wasn't changed yet - * - * This is useful to change the default value of a variable while allowing - * users to override it with command line arguments - */ -void xbt_cfg_setdefault_peer(xbt_cfg_t cfg, const char *name, - const char *host, int port) -{ - xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer); - - if (variable->isdefault){ - xbt_cfg_set_peer(cfg, name, host, port); - variable->isdefault = 1; - } - else - XBT_DEBUG - ("Do not override configuration variable '%s' with value '%s:%d' because it was already set.", - name, host, port); -} - /** @brief Set or add an integer value to \a name within \a cfg * * @param cfg the config set @@ -1031,47 +966,6 @@ void xbt_cfg_set_boolean(xbt_cfg_t cfg, const char *name, const char *val) variable->isdefault = 0; } -/** @brief Set or add an peer value to \a name within \a cfg - * - * @param cfg the config set - * @param name the name of the variable - * @param peer the peer - * @param port the port number - * - * \e peer values are composed of a string (peername) and an integer (port) - */ - -void -xbt_cfg_set_peer(xbt_cfg_t cfg, const char *name, const char *peer, - int port) -{ - xbt_cfgelm_t variable; - xbt_peer_t val = xbt_peer_new(peer, port); - - XBT_VERB("Configuration setting: %s=%s:%d", name, peer, port); - - variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer); - - if (variable->max == 1) { - if (variable->cb_rm && !xbt_dynar_is_empty(variable->content)) - variable->cb_rm(name, 0); - - xbt_dynar_set(variable->content, 0, &val); - } else { - if (variable->max - && xbt_dynar_length(variable->content) == variable->max) - THROWF(mismatch_error, 0, - "Cannot add value %s:%d to the config element %s since it's already full (size=%d)", - peer, port, name, variable->max); - - xbt_dynar_push(variable->content, &val); - } - - if (variable->cb_set) - variable->cb_set(name, xbt_dynar_length(variable->content) - 1); - variable->isdefault = 0; -} - /* ---- [ Removing ] ---- */ /** @brief Remove the provided \e val integer value from a variable @@ -1209,43 +1103,6 @@ void xbt_cfg_rm_boolean(xbt_cfg_t cfg, const char *name, int val) val, name); } -/** @brief Remove the provided \e val peer value from a variable - * - * @param cfg the config set - * @param name the name of the variable - * @param peer the peername - * @param port the port number - */ - -void -xbt_cfg_rm_peer(xbt_cfg_t cfg, const char *name, const char *peer, - int port) -{ - xbt_cfgelm_t variable; - unsigned int cpt; - xbt_peer_t seen; - - variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer); - - if (xbt_dynar_length(variable->content) == variable->min) - THROWF(mismatch_error, 0, - "Cannot remove value %s:%d from the config element %s since it's already at its minimal size (=%d)", - peer, port, name, variable->min); - - xbt_dynar_foreach(variable->content, cpt, seen) { - if (!strcpy(seen->name, peer) && seen->port == port) { - if (variable->cb_rm) - variable->cb_rm(name, cpt); - xbt_dynar_cursor_rm(variable->content, &cpt); - return; - } - } - - THROWF(not_found_error, 0, - "Can't remove the value %s:%d of config element %s: value not found.", - peer, port, name); -} - /** @brief Remove the \e pos th value from the provided variable */ void xbt_cfg_rm_at(xbt_cfg_t cfg, const char *name, int pos) @@ -1411,39 +1268,6 @@ int xbt_cfg_get_boolean(xbt_cfg_t cfg, const char *name) return xbt_dynar_get_as(variable->content, 0, int); } -/** @brief Retrieve an peer value of a variable (get a warning if not uniq) - * - * @param cfg the config set - * @param name the name of the variable - * @param peer the peer - * @param port the port number - * - * Returns the first value from the config set under the given name. - * If there is more than one value, it will issue a warning. Consider using - * xbt_cfg_get_dynar() instead. - * - * \warning the returned value is the actual content of the config set - */ - -void xbt_cfg_get_peer(xbt_cfg_t cfg, const char *name, char **peer, - int *port) -{ - xbt_cfgelm_t variable; - xbt_peer_t val; - - variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_peer); - - if (xbt_dynar_length(variable->content) > 1) { - XBT_WARN - ("You asked for the first value of the config element '%s', but there is %lu values\n", - name, xbt_dynar_length(variable->content)); - } - - val = xbt_dynar_get_as(variable->content, 0, xbt_peer_t); - *peer = val->name; - *port = val->port; -} - /** @brief Retrieve the dynar of all the values stored in a variable * * @param cfg where to search in @@ -1507,19 +1331,6 @@ int xbt_cfg_get_boolean_at(xbt_cfg_t cfg, const char *name, int pos) return xbt_dynar_get_as(variable->content, pos, int); } -/** @brief Retrieve one of the peer value of a variable */ -void -xbt_cfg_get_peer_at(xbt_cfg_t cfg, const char *name, int pos, - char **peer, int *port) -{ - - xbt_cfgelm_t variable = xbt_cfgelm_get(cfg, name, xbt_cfgelm_int); - xbt_peer_t val = xbt_dynar_get_ptr(variable->content, pos); - - *port = val->port; - *peer = val->name; -} - #ifdef SIMGRID_TEST #include "xbt.h" diff --git a/src/xbt/log.c b/src/xbt/log.c index 47ff21a645..7b7c090cf9 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -565,7 +565,6 @@ static void xbt_log_connect_categories(void) XBT_LOG_CONNECT(graphxml_parse); XBT_LOG_CONNECT(log); XBT_LOG_CONNECT(module); - XBT_LOG_CONNECT(peer); XBT_LOG_CONNECT(replay); XBT_LOG_CONNECT(strbuff); XBT_LOG_CONNECT(xbt_cfg); diff --git a/src/xbt/xbt_peer.c b/src/xbt/xbt_peer.c deleted file mode 100644 index d8339587f1..0000000000 --- a/src/xbt/xbt_peer.c +++ /dev/null @@ -1,61 +0,0 @@ -/* xbt_peer_t management functions */ - -/* Copyright (c) 2006-2014. 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. */ - -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/peer.h" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(peer, xbt, "peer management"); - -/** \brief constructor */ -xbt_peer_t xbt_peer_new(const char *name, int port) -{ - xbt_peer_t res = xbt_new(s_xbt_peer_t, 1); - res->name = xbt_strdup(name); - res->port = port; - return res; -} - -/** \brief copy constructor */ -xbt_peer_t xbt_peer_copy(xbt_peer_t h) -{ - return xbt_peer_new(h->name, h->port); -} - -/** \brief constructor. Argument should be of form '(peername):(port)'. */ -xbt_peer_t xbt_peer_from_string(const char *peerport) -{ - xbt_peer_t res = xbt_new(s_xbt_peer_t, 1); - char *name = xbt_strdup(peerport); - char *port_str = strchr(name, ':'); - xbt_assert(port_str, - "argument of xbt_peer_from_string should be of form :, it's '%s'", - peerport); - *port_str = '\0'; - port_str++; - - res->name = xbt_strdup(name); /* it will be shorter now that we cut the port */ - res->port = atoi(port_str); - free(name); - return res; -} - -/** \brief destructor */ -void xbt_peer_free(xbt_peer_t peer) -{ - if (peer) { - free(peer->name); - free(peer); - } -} - -/** \brief Freeing function for dynars of xbt_peer_t */ -void xbt_peer_free_voidp(void *d) -{ - xbt_peer_free((xbt_peer_t) * (void **) d); -} diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 1ee036bd2b..0c8b17fd16 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -283,7 +283,6 @@ set(XBT_SRC src/xbt/xbt_matrix.c src/xbt/xbt_os_time.c src/xbt/xbt_os_file.c - src/xbt/xbt_peer.c src/xbt/xbt_replay.c src/xbt/xbt_sg_synchro.c src/xbt/xbt_sha.c @@ -716,7 +715,6 @@ set(headers_to_install include/xbt/mmalloc.h include/xbt/module.h include/xbt/parmap.h - include/xbt/peer.h include/xbt/replay.h include/xbt/set.h include/xbt/str.h