A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use enum class for smpi privatization strategies.
[simgrid.git]
/
src
/
smpi
/
include
/
private.hpp
diff --git
a/src/smpi/include/private.hpp
b/src/smpi/include/private.hpp
index
b7a5081
..
b5edb7a
100644
(file)
--- a/
src/smpi/include/private.hpp
+++ b/
src/smpi/include/private.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-201
8
. 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. */
/* 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. */
@@
-6,6
+6,7
@@
#ifndef SMPI_PRIVATE_HPP
#define SMPI_PRIVATE_HPP
#ifndef SMPI_PRIVATE_HPP
#define SMPI_PRIVATE_HPP
+#include "include/xbt/config.hpp"
#include "simgrid/msg.h" // msg_bar_t
#include "smpi/smpi.h"
#include "src/instr/instr_smpi.hpp"
#include "simgrid/msg.h" // msg_bar_t
#include "smpi/smpi.h"
#include "src/instr/instr_smpi.hpp"
@@
-61,12
+62,13
@@
typedef SMPI_Graph_topology* MPIR_Graph_Topology;
typedef SMPI_Dist_Graph_topology* MPIR_Dist_Graph_Topology;
XBT_PRIVATE SMPI_Process* smpi_process();
typedef SMPI_Dist_Graph_topology* MPIR_Dist_Graph_Topology;
XBT_PRIVATE SMPI_Process* smpi_process();
-XBT_PRIVATE SMPI_Process* smpi_process_remote(
int index
);
+XBT_PRIVATE SMPI_Process* smpi_process_remote(
simgrid::s4u::ActorPtr actor
);
XBT_PRIVATE int smpi_process_count();
XBT_PRIVATE int smpi_process_count();
-XBT_PRIVATE void smpi_deployment_register_process(const char* instance_id, int rank, int index);
-XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const char* instance_id);
-XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id);
+XBT_PRIVATE void smpi_deployment_register_process(const std::string instance_id, int rank,
+ simgrid::s4u::ActorPtr actor);
+XBT_PRIVATE MPI_Comm* smpi_deployment_comm_world(const std::string instance_id);
+XBT_PRIVATE msg_bar_t smpi_deployment_finalization_barrier(const std::string instance_id);
XBT_PRIVATE void smpi_deployment_cleanup_instances();
XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size);
XBT_PRIVATE void smpi_deployment_cleanup_instances();
XBT_PRIVATE void smpi_comm_copy_buffer_callback(smx_activity_t comm, void* buff, size_t buff_size);
@@
-88,12
+90,12
@@
extern XBT_PRIVATE int smpi_data_exe_size; // size of the data+bss segment of
enum shared_malloc_type { shmalloc_none, shmalloc_local, shmalloc_global };
extern XBT_PRIVATE shared_malloc_type smpi_cfg_shared_malloc; // Whether to activate shared malloc
enum shared_malloc_type { shmalloc_none, shmalloc_local, shmalloc_global };
extern XBT_PRIVATE shared_malloc_type smpi_cfg_shared_malloc; // Whether to activate shared malloc
-XBT_PRIVATE void smpi_switch_data_segment(
int dest
);
-XBT_PRIVATE void smpi_really_switch_data_segment(
int dest
);
+XBT_PRIVATE void smpi_switch_data_segment(
simgrid::s4u::ActorPtr actor
);
+XBT_PRIVATE void smpi_really_switch_data_segment(
simgrid::s4u::ActorPtr actor
);
XBT_PRIVATE int smpi_is_privatization_file(char* file);
XBT_PRIVATE void smpi_get_executable_global_size();
XBT_PRIVATE int smpi_is_privatization_file(char* file);
XBT_PRIVATE void smpi_get_executable_global_size();
-XBT_PRIVATE void smpi_
initialize_global_memory_segments
();
+XBT_PRIVATE void smpi_
backup_global_memory_segment
();
XBT_PRIVATE void smpi_destroy_global_memory_segments();
XBT_PRIVATE void smpi_bench_destroy();
XBT_PRIVATE void smpi_bench_begin();
XBT_PRIVATE void smpi_destroy_global_memory_segments();
XBT_PRIVATE void smpi_bench_destroy();
XBT_PRIVATE void smpi_bench_begin();
@@
-103,6
+105,7
@@
XBT_PRIVATE void smpi_shared_destroy();
XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);
XBT_PRIVATE void* smpi_get_tmp_sendbuffer(int size);
XBT_PRIVATE void* smpi_get_tmp_recvbuffer(int size);
XBT_PRIVATE void smpi_free_tmp_buffer(void* buf);
+XBT_PRIVATE void smpi_free_replay_tmp_buffers();
// f77 wrappers
void mpi_init_(int* ierr);
// f77 wrappers
void mpi_init_(int* ierr);
@@
-410,7
+413,6
@@
struct s_smpi_privatization_region_t {
};
typedef s_smpi_privatization_region_t* smpi_privatization_region_t;
};
typedef s_smpi_privatization_region_t* smpi_privatization_region_t;
-// extern XBT_PRIVATE smpi_privatization_region_t smpi_privatization_regions;
extern XBT_PRIVATE int smpi_loaded_page;
extern XBT_PRIVATE int smpi_universe_size;
XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process();
extern XBT_PRIVATE int smpi_loaded_page;
extern XBT_PRIVATE int smpi_universe_size;
XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process();
@@
-426,25
+428,17
@@
XBT_PRIVATE smpi_privatization_region_t smpi_init_global_memory_segment_process(
#if HAVE_PAPI
typedef std::vector<std::pair</* counter name */ std::string, /* counter value */ long long>> papi_counter_t;
#if HAVE_PAPI
typedef std::vector<std::pair</* counter name */ std::string, /* counter value */ long long>> papi_counter_t;
-XBT_PRIVATE papi_counter_t& smpi_process_papi_counters();
-XBT_PRIVATE int smpi_process_papi_event_set();
#endif
extern std::unordered_map<std::string, double> location2speedup;
/** @brief Returns the last call location (filename, linenumber). Process-specific. */
extern "C" {
#endif
extern std::unordered_map<std::string, double> location2speedup;
/** @brief Returns the last call location (filename, linenumber). Process-specific. */
extern "C" {
-XBT_PUBLIC(smpi_trace_call_location_t*) smpi_process_get_call_location();
-XBT_PUBLIC(smpi_trace_call_location_t*) smpi_trace_get_call_location();
+XBT_PUBLIC smpi_trace_call_location_t* smpi_trace_get_call_location();
}
}
-enum smpi_priv_strategies {
- SMPI_PRIVATIZE_NONE = 0,
- SMPI_PRIVATIZE_MMAP = 1,
- SMPI_PRIVATIZE_DLOPEN = 2,
- SMPI_PRIVATIZE_DEFAULT = SMPI_PRIVATIZE_MMAP
-};
+enum class SmpiPrivStrategies { None = 0, Mmap = 1, Dlopen = 2, Default = Dlopen };
-extern XBT_PRIVATE
int
smpi_privatize_global_variables;
+extern XBT_PRIVATE
SmpiPrivStrategies
smpi_privatize_global_variables;
#endif
#endif