From 0c733f453323dea80a94342ae793cd9e830eae54 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 1 Mar 2016 16:23:35 +0100 Subject: [PATCH] various little cleanups --- src/surf/surf_interface.cpp | 75 +++++++++++-------------------------- src/xbt/lib.c | 15 +++----- 2 files changed, 27 insertions(+), 63 deletions(-) diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 62b0fc570e..8cef09508a 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -18,16 +18,14 @@ #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, - "Logging specific to SURF (kernel)"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); /********* * Utils * *********/ /* model_list_invoke contains only surf_host and surf_vm. - * The callback functions of cpu_model and network_model will be called from - * those of these host models. */ + * The callback functions of cpu_model and network_model will be called from those of these host models. */ xbt_dynar_t all_existing_models = NULL; /* to destroy models correctly */ xbt_dynar_t model_list_invoke = NULL; /* to invoke callbacks */ @@ -51,84 +49,57 @@ s_surf_model_description_t surf_plugin_description[] = { {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -/* Don't forget to update the option description in smx_config when you change - this */ +/* Don't forget to update the option description in smx_config when you change this */ s_surf_model_description_t surf_network_model_description[] = { - {"LV08", - "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ", + {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ", surf_network_model_init_LegrandVelho}, {"Constant", "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.", surf_network_model_init_Constant}, - {"SMPI", - "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", + {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", surf_network_model_init_SMPI}, - {"IB", - "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", + {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model", surf_network_model_init_IB}, - {"CM02", - "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).", + {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).", surf_network_model_init_CM02}, #ifdef HAVE_NS3 - {"NS3", - "Network pseudo-model using the NS3 tcp model instead of an analytic model", - surf_network_model_init_NS3}, + {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", surf_network_model_init_NS3}, #endif - {"Reno", - "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + {"Reno", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Reno}, - {"Reno2", - "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + {"Reno2", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Reno2}, - {"Vegas", - "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", + {"Vegas", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Vegas}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_cpu_model_description[] = { - {"Cas01", - "Simplistic CPU model (time=size/power).", - surf_cpu_model_init_Cas01}, + {"Cas01", "Simplistic CPU model (time=size/power).", surf_cpu_model_init_Cas01}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_host_model_description[] = { - {"default", - "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", - surf_host_model_init_current_default}, - {"compound", - "Host model that is automatically chosen if you change the network and CPU models", - surf_host_model_init_compound}, - {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", - surf_host_model_init_ptask_L07}, + {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)", surf_host_model_init_current_default}, + {"compound", "Host model that is automatically chosen if you change the network and CPU models", surf_host_model_init_compound}, + {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks", surf_host_model_init_ptask_L07}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_vm_model_description[] = { - {"default", - "Default vm model.", - surf_vm_model_init_HL13}, + {"default", "Default vm model.", surf_vm_model_init_HL13}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_optimization_mode_description[] = { - {"Lazy", - "Lazy action management (partial invalidation in lmm + heap in action remaining).", - NULL}, - {"TI", - "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", - NULL}, - {"Full", - "Full update of remaining and variables. Slow but may be useful when debugging.", - NULL}, + {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining).", NULL}, + {"TI", "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", NULL}, + {"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", NULL}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_storage_model_description[] = { - {"default", - "Simplistic storage model.", - surf_storage_model_init_default}, + {"default", "Simplistic storage model.", surf_storage_model_init_default}, {NULL, NULL, NULL} /* this array must be NULL terminated */ }; @@ -237,10 +208,8 @@ int __surf_is_absolute_file_path(const char *file_path) /** Displays the long description of all registered models, and quit */ void model_help(const char *category, s_surf_model_description_t * table) { - int i; - printf("Long description of the %s models accepted by this simulator:\n", - category); - for (i = 0; table[i].name; i++) + printf("Long description of the %s models accepted by this simulator:\n", category); + for (int i = 0; table[i].name; i++) printf(" %s: %s\n", table[i].name, table[i].description); } diff --git a/src/xbt/lib.c b/src/xbt/lib.c index 8e2f0f65fd..2bd85204a1 100644 --- a/src/xbt/lib.c +++ b/src/xbt/lib.c @@ -15,8 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_lib, xbt, xbt_lib_t xbt_lib_new(void) { - xbt_lib_t lib; - lib = xbt_new(s_xbt_lib_t, 1); + xbt_lib_t lib = xbt_new(s_xbt_lib_t, 1); lib->dict = xbt_dict_new_homogeneous(xbt_free_f); lib->levels = 0; lib->free_f = NULL; @@ -46,10 +45,8 @@ void xbt_lib_free(xbt_lib_t *plib) int xbt_lib_add_level(xbt_lib_t lib, void_f_pvoid_t free_f) { XBT_DEBUG("xbt_lib_add_level"); - xbt_assert(xbt_dict_is_empty(lib->dict), - "Lib is not empty, cannot add a level"); - lib->free_f = xbt_realloc(lib->free_f, - sizeof(void_f_pvoid_t) * (lib->levels + 1)); + xbt_assert(xbt_dict_is_empty(lib->dict), "Lib is not empty, cannot add a level"); + lib->free_f = xbt_realloc(lib->free_f, sizeof(void_f_pvoid_t) * (lib->levels + 1)); lib->free_f[lib->levels] = free_f; return lib->levels++; } @@ -63,8 +60,7 @@ void xbt_lib_set(xbt_lib_t lib, const char *key, int level, void *obj) xbt_dict_set(lib->dict, key, elts, NULL); } if (elts[level]) { - XBT_DEBUG("Replace %p by %p element under key '%s:%d'", - elts[level], obj, key, level); + XBT_DEBUG("Replace %p by %p element under key '%s:%d'", elts[level], obj, key, level); if (lib->free_f[level]) lib->free_f[level](elts[level]); } @@ -90,8 +86,7 @@ void xbt_lib_unset(xbt_lib_t lib, const char *key, int level, int invoke_callbac /* check if there still remains any elements of this key */ int empty = 1; - int i; - for (i = 0; i < lib->levels && empty; i++) { + for (int i = 0; i < lib->levels && empty; i++) { if (elts[i] != NULL) empty = 0; } -- 2.20.1