From: Frederic Suter Date: Thu, 20 Jul 2017 14:11:42 +0000 (+0200) Subject: cleanups X-Git-Tag: v3_17~343 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/91b3883142b769ef1fc0b7d460f78d2ae526bca2 cleanups --- diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 27efe346a0..55f8ba04e4 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -158,13 +158,6 @@ XBT_PUBLIC(xbt_dynar_t) SD_daxload(const char *filename); XBT_PUBLIC(xbt_dynar_t) SD_dotload(const char *filename); XBT_PUBLIC(xbt_dynar_t) SD_dotload_with_sched(const char *filename); XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename); -#ifdef __cplusplus -namespace simgrid { -namespace sd { -XBT_PUBLIC(std::set*) simulate(double how_long); -} -} -#endif /** @} */ /* Support some backward compatibility */ @@ -203,4 +196,13 @@ XBT_PUBLIC(std::set*) simulate(double how_long); //SD_route_get_list //TRACE_sd_set_task_category SG_END_DECL() + +#ifdef __cplusplus +namespace simgrid { +namespace sd { +XBT_PUBLIC(std::set*) simulate(double how_long); +} +} +#endif + #endif diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h index 03a47e55d1..a7af527de4 100644 --- a/src/mc/mc_snapshot.h +++ b/src/mc/mc_snapshot.h @@ -34,34 +34,28 @@ static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t add static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index) { switch (region->storage_type()) { - case simgrid::mc::StorageType::NoData: - default: - xbt_die("Storage type not supported"); - case simgrid::mc::StorageType::Flat: { uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address(); return (void *) ((uintptr_t) region->flat_data().get() + offset); } - case simgrid::mc::StorageType::Chunked: return mc_translate_address_region_chunked(addr, region); - case simgrid::mc::StorageType::Privatized: { - xbt_assert(process_index >=0, - "Missing process index for privatized region"); - xbt_assert((size_t) process_index < region->privatized_data().size(), - "Out of range process index"); - simgrid::mc::RegionSnapshot& subregion= region->privatized_data()[process_index]; - return mc_translate_address_region(addr, &subregion, process_index); + xbt_assert(process_index >= 0, "Missing process index for privatized region"); + xbt_assert((size_t)process_index < region->privatized_data().size(), "Out of range process index"); + simgrid::mc::RegionSnapshot& subregion = region->privatized_data()[process_index]; + return mc_translate_address_region(addr, &subregion, process_index); } + case simgrid::mc::StorageType::NoData: + default: + xbt_die("Storage type not supported"); } } -XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region( - const void* addr, const simgrid::mc::Snapshot *snapshot, int process_index); - +XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region(const void* addr, const simgrid::mc::Snapshot* snapshot, + int process_index); } // ***** MC Snapshot @@ -74,18 +68,18 @@ XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region( typedef struct s_mc_snapshot_ignored_data { void* start; std::vector data; -} s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t; +} s_mc_snapshot_ignored_data_t; +typedef s_mc_snapshot_ignored_data_t* mc_snapshot_ignored_data_t; typedef struct s_fd_infos{ std::string filename; int number; off_t current_position; int flags; -}s_fd_infos_t, *fd_infos_t; +} s_fd_infos_t; +typedef s_fd_infos_t* fd_infos_t; -/** Information about a given stack frame - * - */ +/** Information about a given stack frame */ typedef struct s_mc_stack_frame { /** Instruction pointer */ unw_word_t ip; @@ -95,7 +89,8 @@ typedef struct s_mc_stack_frame { simgrid::mc::Frame* frame; std::string frame_name; unw_cursor_t unw_cursor; -} s_mc_stack_frame_t, *mc_stack_frame_t; +} s_mc_stack_frame_t; +typedef s_mc_stack_frame_t* mc_stack_frame_t; typedef struct s_local_variable{ simgrid::mc::Frame* subprogram; @@ -104,7 +99,8 @@ typedef struct s_local_variable{ simgrid::mc::Type* type; void *address; int region; -} s_local_variable_t, *local_variable_t; +} s_local_variable_t; +typedef s_local_variable_t* local_variable_t; typedef struct XBT_PRIVATE s_mc_snapshot_stack { std::vector local_variables; @@ -123,7 +119,8 @@ public: const void* read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index = ProcessIndexAny, ReadOptions options = ReadOptions::none()) const override; -public: // To be private + + // To be private int num_state; std::size_t heap_bytes_used; std::vector> snapshot_regions; diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index c2ea20b3e0..186fd7c160 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -89,7 +89,6 @@ public: ~StorageImpl() override; -public: /** @brief Public interface */ s4u::Storage piface_; static StorageImpl* byName(const char* name); @@ -142,7 +141,6 @@ public: virtual std::string getHost() { return attach_; } std::map* parseContent(const char* filename); - static std::unordered_map* storages; static std::unordered_map* storagesMap() { return StorageImpl::storages; } lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/ @@ -153,6 +151,7 @@ public: private: sg_size_t size_; + static std::unordered_map* storages; std::map* content_; // Name of the host to which this storage is attached. Only used at platform parsing time, then the interface stores // the Host directly. diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 20e1855f5a..249ee2314d 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -378,9 +378,9 @@ void surf_exit() delete stype->model_properties; free(stype); } - for (auto s : *simgrid::surf::StorageImpl::storages) + for (auto s : *simgrid::surf::StorageImpl::storagesMap()) delete s.second; - delete simgrid::surf::StorageImpl::storages; + delete simgrid::surf::StorageImpl::storagesMap(); for (auto model : *all_existing_models) delete model;