From 35e51746af39c4061a0336771f8f31bb371fae23 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 2 Mar 2017 10:51:23 +0100 Subject: [PATCH 1/1] smells -- --- src/kernel/context/ContextRaw.cpp | 48 ++++++++++++++----------------- src/surf/storage_n11.cpp | 6 ++-- src/xbt/xbt_replay.cpp | 12 ++++---- 3 files changed, 31 insertions(+), 35 deletions(-) diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 2d87f6bf94..a49ead0b27 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -294,13 +294,12 @@ RawContextFactory::~RawContextFactory() RawContext* RawContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) { - return this->new_context(std::move(code), - cleanup, process); + return this->new_context(std::move(code), cleanup, process); } void RawContext::wrapper(void* arg) { - RawContext* context = (RawContext*) arg; + RawContext* context = static_cast(arg); (*context)(); context->stop(); } @@ -386,18 +385,16 @@ void RawContext::suspend_serial() { /* determine the next context */ RawContext* next_context = nullptr; - unsigned long int i; - i = raw_process_index++; + unsigned long int i = raw_process_index; + raw_process_index++; if (i < xbt_dynar_length(simix_global->process_to_run)) { /* execute the next process */ XBT_DEBUG("Run next process"); - next_context = (RawContext*) xbt_dynar_get_as( - simix_global->process_to_run, i, smx_actor_t)->context; - } - else { + next_context = static_cast(xbt_dynar_get_as(simix_global->process_to_run, i, smx_actor_t)->context); + } else { /* all processes were run, return to maestro */ XBT_DEBUG("No more process to run"); - next_context = (RawContext*) raw_maestro_context; + next_context = static_cast(raw_maestro_context); } SIMIX_context_set_current(next_context); raw_swapcontext(&this->stack_top_, next_context->stack_top_); @@ -407,20 +404,19 @@ void RawContext::suspend_parallel() { #if HAVE_THREAD_CONTEXTS /* determine the next context */ - smx_actor_t next_work = (smx_actor_t) xbt_parmap_next(raw_parmap); + smx_actor_t next_work = static_cast(xbt_parmap_next(raw_parmap)); RawContext* next_context = nullptr; if (next_work != nullptr) { /* there is a next process to resume */ XBT_DEBUG("Run next process"); - next_context = (RawContext*) next_work->context; - } - else { + next_context = static_cast(next_work->context); + } else { /* all processes were run, go to the barrier */ XBT_DEBUG("No more processes to run"); uintptr_t worker_id = (uintptr_t) xbt_os_thread_get_specific(raw_worker_id_key); - next_context = (RawContext*) raw_workers_context[worker_id]; + next_context = static_cast(raw_workers_context[worker_id]); XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id, raw_threads_working); } @@ -449,7 +445,7 @@ void RawContext::resume_parallel() #if HAVE_THREAD_CONTEXTS uintptr_t worker_id = __sync_fetch_and_add(&raw_threads_working, 1); xbt_os_thread_set_specific(raw_worker_id_key, (void*) worker_id); - RawContext* worker_context = (RawContext*) SIMIX_context_self(); + RawContext* worker_context = static_cast(SIMIX_context_self()); raw_workers_context[worker_id] = worker_context; XBT_DEBUG("Saving worker stack %zu", worker_id); SIMIX_context_set_current(this); @@ -463,16 +459,16 @@ void RawContext::resume_parallel() void RawContextFactory::run_all_adaptative() { unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run); - if (SIMIX_context_is_parallel() - && (unsigned long) SIMIX_context_get_parallel_threshold() < nb_processes) { - raw_context_parallel = true; - XBT_DEBUG("Runall // %lu", nb_processes); - this->run_all_parallel(); - } else { - XBT_DEBUG("Runall serial %lu", nb_processes); - raw_context_parallel = false; - this->run_all_serial(); - } + if (SIMIX_context_is_parallel() && + static_cast(SIMIX_context_get_parallel_threshold()) < nb_processes) { + raw_context_parallel = true; + XBT_DEBUG("Runall // %lu", nb_processes); + this->run_all_parallel(); + } else { + XBT_DEBUG("Runall serial %lu", nb_processes); + raw_context_parallel = false; + this->run_all_serial(); + } } }}} diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index 88b7996548..eb203e53b6 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -192,8 +192,8 @@ StorageAction *StorageN11::open(const char* mount, const char* path) { XBT_DEBUG("\tOpen file '%s'",path); - sg_size_t size, *psize; - psize = (sg_size_t*) xbt_dict_get_or_null(content_, path); + sg_size_t size; + sg_size_t* psize = (sg_size_t*)xbt_dict_get_or_null(content_, path); // if file does not exist create an empty file if(psize) size = *psize; @@ -297,6 +297,8 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora // storage->p_writeActions->push_back(action); // ref(); break; + default: + THROW_UNIMPLEMENTED; } XBT_OUT(); } diff --git a/src/xbt/xbt_replay.cpp b/src/xbt/xbt_replay.cpp index d0b7197fb3..9af925bd2f 100644 --- a/src/xbt/xbt_replay.cpp +++ b/src/xbt/xbt_replay.cpp @@ -42,8 +42,8 @@ static char **action_get_action(char *name); static char *str_tolower (const char *str) { char *ret = xbt_strdup (str); - int i, n = strlen (ret); - for (i = 0; i < n; i++) + int n = strlen(ret); + for (int i = 0; i < n; i++) ret[i] = tolower (str[i]); return ret; } @@ -63,10 +63,8 @@ xbt_replay_reader_t xbt_replay_reader_new(const char *filename) const char **xbt_replay_reader_get(xbt_replay_reader_t reader) { - ssize_t read; - xbt_dynar_t d; - read = xbt_getline(&reader->line, &reader->line_len, reader->fp); - //XBT_INFO("got from trace: %s",reader->line); + ssize_t read = xbt_getline(&reader->line, &reader->line_len, reader->fp); + XBT_DEBUG("got from trace: %s", reader->line); reader->linenum++; if (read==-1) return nullptr; /* end of file */ @@ -77,7 +75,7 @@ const char **xbt_replay_reader_get(xbt_replay_reader_t reader) if (reader->line[0] == '\0') return xbt_replay_reader_get(reader); /* Get next line */ - d=xbt_str_split_quoted_in_place(reader->line); + xbt_dynar_t d = xbt_str_split_quoted_in_place(reader->line); if (xbt_dynar_is_empty(d)) { xbt_dynar_free(&d); return xbt_replay_reader_get(reader); /* Get next line */ -- 2.20.1