From: Martin Quinson Date: Tue, 11 Apr 2017 13:30:02 +0000 (+0200) Subject: please sonar by killing useless parameters and cleanups X-Git-Tag: v3.16~370^2~15 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a009335302ac96061f77c83afbe51af640d898b0 please sonar by killing useless parameters and cleanups --- diff --git a/examples/s4u/dht-chord/s4u_dht-chord.cpp b/examples/s4u/dht-chord/s4u_dht-chord.cpp index 4105503b4a..68239898c9 100644 --- a/examples/s4u/dht-chord/s4u_dht-chord.cpp +++ b/examples/s4u/dht-chord/s4u_dht-chord.cpp @@ -34,7 +34,7 @@ static void chord_init() host->extension_set(new HostChord(host)); } -static void chord_exit(void) +static void chord_exit() { delete[] powers2; } diff --git a/examples/s4u/dht-chord/s4u_dht-chord.hpp b/examples/s4u/dht-chord/s4u_dht-chord.hpp index 095ea8c480..a63191fadf 100644 --- a/examples/s4u/dht-chord/s4u_dht-chord.hpp +++ b/examples/s4u/dht-chord/s4u_dht-chord.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2016. The SimGrid Team. -* All rights reserved. */ +/* Copyright (c) 2016-2017. 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. */ @@ -120,7 +119,7 @@ public: return; ChordMessage* message = nullptr; void* data = nullptr; - double now = simgrid::s4u::Engine::instance()->getClock(); + double now = simgrid::s4u::Engine::getClock(); double next_stabilize_date = start_time_ + PERIODIC_STABILIZE_DELAY; double next_fix_fingers_date = start_time_ + PERIODIC_FIX_FINGERS_DELAY; double next_check_predecessor_date = start_time_ + PERIODIC_CHECK_PREDECESSOR_DELAY; @@ -133,28 +132,28 @@ public: // no task was received: make some periodic calls if (now >= next_stabilize_date) { stabilize(); - next_stabilize_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_STABILIZE_DELAY; + next_stabilize_date = simgrid::s4u::Engine::getClock() + PERIODIC_STABILIZE_DELAY; } else if (now >= next_fix_fingers_date) { fixFingers(); - next_fix_fingers_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_FIX_FINGERS_DELAY; + next_fix_fingers_date = simgrid::s4u::Engine::getClock() + PERIODIC_FIX_FINGERS_DELAY; } else if (now >= next_check_predecessor_date) { checkPredecessor(); - next_check_predecessor_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_CHECK_PREDECESSOR_DELAY; + next_check_predecessor_date = simgrid::s4u::Engine::getClock() + PERIODIC_CHECK_PREDECESSOR_DELAY; } else if (now >= next_lookup_date) { randomLookup(); - next_lookup_date = simgrid::s4u::Engine::instance()->getClock() + PERIODIC_LOOKUP_DELAY; + next_lookup_date = simgrid::s4u::Engine::getClock() + PERIODIC_LOOKUP_DELAY; } else { // nothing to do: sleep for a while simgrid::s4u::this_actor::sleep_for(SLEEP_DELAY); } - now = simgrid::s4u::Engine::instance()->getClock(); + now = simgrid::s4u::Engine::getClock(); } if (data != nullptr) { message = static_cast(data); handleMessage(message); } - now = simgrid::s4u::Engine::instance()->getClock(); + now = simgrid::s4u::Engine::getClock(); } if (data != nullptr) { delete static_cast(data); diff --git a/src/xbt/dict.cpp b/src/xbt/dict.cpp index 370774f008..cc112b9f49 100644 --- a/src/xbt/dict.cpp +++ b/src/xbt/dict.cpp @@ -163,6 +163,7 @@ void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, xbt_dictelm_t current; xbt_dictelm_t previous = nullptr; + xbt_assert(!free_ctn, "Cannot set an individual free function in homogeneous dicts."); XBT_CDEBUG(xbt_dict, "ADD %.*s hash = %u, size = %d, & = %u", key_len, key, hash_code, dict->table_size, hash_code & dict->table_size); current = dict->table[hash_code & dict->table_size]; @@ -174,7 +175,7 @@ void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, if (current == nullptr) { /* this key doesn't exist yet */ - current = xbt_dictelm_new(dict, key, key_len, hash_code, data, free_ctn); + current = xbt_dictelm_new(key, key_len, hash_code, data); dict->count++; if (previous == nullptr) { dict->table[hash_code & dict->table_size] = current; diff --git a/src/xbt/dict_elm.c b/src/xbt/dict_elm.c index dae75e88bf..28c0901024 100644 --- a/src/xbt/dict_elm.c +++ b/src/xbt/dict_elm.c @@ -1,7 +1,6 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2004-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ @@ -12,13 +11,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_elm, xbt_dict, "Dictionaries internals" xbt_mallocator_t dict_elm_mallocator = NULL; -xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len, unsigned int hash_code, void *content, - void_f_pvoid_t free_f) +xbt_dictelm_t xbt_dictelm_new(const char* key, int key_len, unsigned int hash_code, void* content) { - xbt_dictelm_t element; - - xbt_assert(!free_f, "Cannot set an individual free function in homogeneous dicts."); - element = xbt_mallocator_get(dict_elm_mallocator); + xbt_dictelm_t element = xbt_mallocator_get(dict_elm_mallocator); element->key = xbt_new(char, key_len + 1); memcpy(element->key, key, key_len); element->key[key_len] = '\0'; diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index 43d974f7a8..83798fb81c 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -38,8 +38,7 @@ XBT_PRIVATE void * dict_elm_mallocator_new_f(void); #define dict_elm_mallocator_reset_f ((void_f_pvoid_t)NULL) /*####[ Function prototypes ]################################################*/ -XBT_PRIVATE xbt_dictelm_t xbt_dictelm_new(xbt_dict_t dict, const char *key, int key_len, - unsigned int hash_code, void *content, void_f_pvoid_t free_f); +XBT_PRIVATE xbt_dictelm_t xbt_dictelm_new(const char* key, int key_len, unsigned int hash_code, void* content); XBT_PRIVATE void xbt_dictelm_free(xbt_dict_t dict, xbt_dictelm_t element); XBT_PRIVATE void xbt_dictelm_set_data(xbt_dict_t dict, xbt_dictelm_t element, void *data, void_f_pvoid_t free_ctn);