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
Prefer "using" to "typedef".
[simgrid.git]
/
src
/
simix
/
popping_private.hpp
diff --git
a/src/simix/popping_private.hpp
b/src/simix/popping_private.hpp
index
ad153fd
..
d0079a6
100644
(file)
--- a/
src/simix/popping_private.hpp
+++ b/
src/simix/popping_private.hpp
@@
-9,17
+9,18
@@
#include "simgrid/forward.h"
#include "src/kernel/activity/ActivityImpl.hpp"
#include "simgrid/forward.h"
#include "src/kernel/activity/ActivityImpl.hpp"
+#include <array>
#include <boost/intrusive_ptr.hpp>
/********************************* Simcalls *********************************/
#include <boost/intrusive_ptr.hpp>
/********************************* Simcalls *********************************/
-#include "popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall */
+#include "popping_enum.h
pp
" /* Definition of e_smx_simcall_t, with one value per simcall */
-XBT_PUBLIC_DATA const
char* simcall_names[]
; /* Name of each simcall */
+XBT_PUBLIC_DATA const
std::array<const char*, NUM_SIMCALLS> simcall_names
; /* Name of each simcall */
-
typedef bool (*simix_match_func_t
)(void*, void*, simgrid::kernel::activity::CommImpl*);
-
typedef void (*simix_copy_data_func_t
)(simgrid::kernel::activity::CommImpl*, void*, size_t);
-
typedef void (*simix_clean_func_t
)(void*);
-
typedef void (*FPtr)(void
); // Hide the ugliness
+
using simix_match_func_t = bool (*
)(void*, void*, simgrid::kernel::activity::CommImpl*);
+
using simix_copy_data_func_t = void (*
)(simgrid::kernel::activity::CommImpl*, void*, size_t);
+
using simix_clean_func_t = void (*
)(void*);
+
using FPtr = void (*)(
); // Hide the ugliness
/* Pack all possible scalar types in an union */
union u_smx_scalar {
/* Pack all possible scalar types in an union */
union u_smx_scalar {
@@
-48,8
+49,8
@@
struct s_smx_simcall {
smx_timer_t timeout_cb_ = nullptr; // Callback to timeouts
simgrid::mc::SimcallInspector* inspector_ = nullptr; // makes that simcall observable by the MC
int mc_value_ = 0;
smx_timer_t timeout_cb_ = nullptr; // Callback to timeouts
simgrid::mc::SimcallInspector* inspector_ = nullptr; // makes that simcall observable by the MC
int mc_value_ = 0;
-
u_smx_scalar args_[11] = {{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}
};
- u_smx_scalar result_ = {
0
};
+
std::array<u_smx_scalar, 11> args_ = {
};
+ u_smx_scalar result_ = {};
};
#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall).mc_value_ = (value))
};
#define SIMCALL_SET_MC_VALUE(simcall, value) ((simcall).mc_value_ = (value))
@@
-108,11
+109,11
@@
SIMIX_MARSHAL(float, d)
SIMIX_MARSHAL(double, d)
SIMIX_MARSHAL(FPtr, fp)
SIMIX_MARSHAL(double, d)
SIMIX_MARSHAL(FPtr, fp)
-inline void unmarshal(type<void>, u_smx_scalar const&
simcall
)
+inline void unmarshal(type<void>, u_smx_scalar const&
/*simcall*/
)
{
/* Nothing to do for void data */
}
{
/* Nothing to do for void data */
}
-inline void unmarshal_raw(type<void>, u_smx_scalar const&
simcall
)
+inline void unmarshal_raw(type<void>, u_smx_scalar const&
/*simcall*/
)
{
/* Nothing to do for void data */
}
{
/* Nothing to do for void data */
}
@@
-177,7
+178,7
@@
template <class T> inline typename std::remove_reference<T>::type unmarshal_raw(
return unmarshal(type<T>(), simcall);
}
return unmarshal(type<T>(), simcall);
}
-template <std::size_t I> inline void marshal_args(
smx_simcall_t simcall
)
+template <std::size_t I> inline void marshal_args(
const s_smx_simcall* /*simcall*/
)
{
/* Nothing to do when no args */
}
{
/* Nothing to do when no args */
}
@@
-197,8
+198,8
@@
template <std::size_t I, class A, class... B> inline void marshal_args(smx_simca
template <class... A> inline void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A const&... a)
{
simcall->call_ = call;
template <class... A> inline void marshal(smx_simcall_t simcall, e_smx_simcall_t call, A const&... a)
{
simcall->call_ = call;
- memset(&simcall->result_, 0, sizeof
(simcall->result_)
);
- memset(simcall->args_
, 0, sizeof(simcall->args_)
);
+ memset(&simcall->result_, 0, sizeof
simcall->result_
);
+ memset(simcall->args_
.data(), 0, simcall->args_.size() * sizeof simcall->args_[0]
);
marshal_args<0>(simcall, a...);
}
}
marshal_args<0>(simcall, a...);
}
}