From 7ebc38bd87e29e2a878c140aa0a03b262c604dd2 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 1 Mar 2016 14:13:37 +0100 Subject: [PATCH] a few blanks less + static --- include/simgrid/simdag.h | 9 ----- src/simdag/sd_daxloader.cpp | 16 ++------ src/simdag/sd_dotloader.cpp | 5 --- src/simdag/sd_global.cpp | 5 --- src/simdag/sd_task.cpp | 73 +++++++++++++++++-------------------- 5 files changed, 37 insertions(+), 71 deletions(-) diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 15480fdd85..d9df84c51c 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -10,7 +10,6 @@ #include "xbt/misc.h" #include "xbt/dynar.h" #include "xbt/dict.h" - #include "simgrid/link.h" SG_BEGIN_DECL() @@ -61,7 +60,6 @@ typedef enum { SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */ } e_SD_task_kind_t; - /** @brief Storage datatype @ingroup SD_datatypes_management @@ -69,7 +67,6 @@ typedef enum { typedef xbt_dictelm_t SD_storage_t; /************************** Workstation handling ****************************/ - /** @defgroup sg_host_management Hosts * @brief Functions for managing the Hosts * @@ -93,7 +90,6 @@ XBT_PUBLIC(const char*) SD_storage_get_host(SD_storage_t storage); /** @} */ /************************** Task handling ************************************/ - /** @defgroup SD_task_management Tasks * @brief Functions for managing the tasks * @@ -156,7 +152,6 @@ XBT_PUBLIC(void) SD_task_schedulel(SD_task_t task, int count, ...); /** @} */ - /** @defgroup SD_task_dependency_management Tasks dependencies * @brief Functions for managing the task dependencies * @@ -173,7 +168,6 @@ XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst); /** @} */ /************************** Global *******************************************/ - /** @defgroup SD_simulation Simulation * @brief Functions for creating the environment and launching the simulation * @@ -227,7 +221,4 @@ XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename); //TRACE_sd_set_task_category SG_END_DECL() - -#include "simgrid/instr.h" - #endif diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index 6eb07fdccc..d9757d6881 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -20,15 +20,9 @@ extern "C" { #undef register } -bool children_are_marked(SD_task_t task); -bool parents_are_marked(SD_task_t task); - -/* Parsing helpers */ - static double dax_parse_double(const char *string) { double value; - int ret = sscanf(string, "%lg", &value); xbt_assert (ret == 1, "Parse error on line %d: %s is not a double", dax_lineno, string); return value; @@ -55,25 +49,23 @@ void uniq_transfer_task_name(SD_task_t task) free(new_name); } -bool children_are_marked(SD_task_t task){ +static bool children_are_marked(SD_task_t task){ SD_dependency_t depafter = NULL; unsigned int count; xbt_dynar_foreach(task->tasks_after,count,depafter){ - if(depafter->dst->marked == 0) { + if(depafter->dst->marked == 0) return false; - } } return true; } -bool parents_are_marked(SD_task_t task){ +static bool parents_are_marked(SD_task_t task){ SD_dependency_t depbefore = NULL; unsigned int count; xbt_dynar_foreach(task->tasks_before,count,depbefore){ - if(depbefore->src->marked == 0) { + if(depbefore->src->marked == 0) return false; - } } return true; } diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index 5419345308..9547948ece 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -6,14 +6,10 @@ #include "src/simdag/simdag_private.h" #include "simgrid/simdag.h" -#include "xbt/log.h" -#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); -#undef CLEANUP - #ifdef HAVE_CGRAPH_H #include #elif HAVE_AGRAPH_H @@ -30,7 +26,6 @@ typedef enum { xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule); - static void dot_task_p_free(void *task) { SD_task_destroy(*(SD_task_t *)task); } diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index a9e2f60a5e..649f2c008b 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -10,10 +10,6 @@ #include "src/simdag/simdag_private.h" #include "src/surf/surf_interface.hpp" -#include "xbt/dynar.h" -#include "xbt/log.h" -#include "xbt/sysdep.h" - #ifdef HAVE_JEDULE #include "simgrid/jedule/jedule_sd_binding.h" #endif @@ -267,7 +263,6 @@ double SD_get_clock(void) { void SD_exit(void) { TRACE_surf_resource_utilization_release(); - TRACE_end(); #ifdef HAVE_JEDULE jedule_sd_cleanup(); diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index 93c5ba2ac0..bf221e9b91 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -12,8 +12,39 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)"); -static void __SD_task_remove_dependencies(SD_task_t task); -static void __SD_task_destroy_scheduling_data(SD_task_t task); +/* Destroys a dependency between two tasks. */ +static void __SD_task_dependency_destroy(void *dependency) +{ + xbt_free(((SD_dependency_t)dependency)->name); + xbt_free(dependency); +} + +/* Remove all dependencies associated with a task. This function is called when the task is destroyed. */ +static void __SD_task_remove_dependencies(SD_task_t task) +{ + /* we must destroy the dependencies carefuly (with SD_dependency_remove) because each one is stored twice */ + SD_dependency_t dependency; + while (!xbt_dynar_is_empty(task->tasks_before)) { + xbt_dynar_get_cpy(task->tasks_before, 0, &dependency); + SD_task_dependency_remove(dependency->src, dependency->dst); + } + + while (!xbt_dynar_is_empty(task->tasks_after)) { + xbt_dynar_get_cpy(task->tasks_after, 0, &dependency); + SD_task_dependency_remove(dependency->src, dependency->dst); + } +} + +/* Destroys the data memorized by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE. */ +static void __SD_task_destroy_scheduling_data(SD_task_t task) +{ + if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE) + THROWF(arg_error, 0, "Task '%s' must be SD_SCHEDULED or SD_RUNNABLE", SD_task_get_name(task)); + + xbt_free(task->flops_amount); + xbt_free(task->bytes_amount); + task->flops_amount = task->bytes_amount = NULL; +} void* SD_task_new_f(void) { @@ -559,14 +590,6 @@ void SD_task_dotty(SD_task_t task, void *out) } } -/* Destroys a dependency between two tasks. - */ -static void __SD_task_dependency_destroy(void *dependency) -{ - xbt_free(((SD_dependency_t)dependency)->name); - xbt_free(dependency); -} - /** * \brief Adds a dependency between two tasks * @@ -930,18 +953,6 @@ void SD_task_unschedule(SD_task_t task) task->start_time = -1.0; } -/* Destroys the data memorized by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE. - */ -static void __SD_task_destroy_scheduling_data(SD_task_t task) -{ - if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE) - THROWF(arg_error, 0, "Task '%s' must be SD_SCHEDULED or SD_RUNNABLE", SD_task_get_name(task)); - - xbt_free(task->flops_amount); - xbt_free(task->bytes_amount); - task->flops_amount = task->bytes_amount = NULL; -} - /* Runs a task. */ void SD_task_run(SD_task_t task) { @@ -979,24 +990,6 @@ void SD_task_run(SD_task_t task) SD_task_set_state(task, SD_RUNNING); } -/* - * Remove all dependencies associated with a task. This function is called when the task is destroyed. - */ -static void __SD_task_remove_dependencies(SD_task_t task) -{ - /* we must destroy the dependencies carefuly (with SD_dependency_remove) because each one is stored twice */ - SD_dependency_t dependency; - while (!xbt_dynar_is_empty(task->tasks_before)) { - xbt_dynar_get_cpy(task->tasks_before, 0, &dependency); - SD_task_dependency_remove(dependency->src, dependency->dst); - } - - while (!xbt_dynar_is_empty(task->tasks_after)) { - xbt_dynar_get_cpy(task->tasks_after, 0, &dependency); - SD_task_dependency_remove(dependency->src, dependency->dst); - } -} - /** * \brief Returns the start time of a task * -- 2.20.1