#include <unistd.h>
#include <xbt/misc.h>
+#ifdef __cplusplus
+#include <vector>
+#endif
+
#ifdef _WIN32
-#define MPI_CALL(type,name,args) \
- type name args; \
- type P##name args
+#define MPI_CALL(type, name, args) \
+ type name args; \
+ type _XBT_CONCAT(P, name) args
#else
-#define MPI_CALL(type,name,args) \
- type name args __attribute__((weak)); \
- type P##name args
+#define MPI_CALL(type, name, args) \
+ type name args __attribute__((weak)); \
+ type _XBT_CONCAT(P, name) args
#endif
SG_BEGIN_DECL()
ERROR(MPI_T_ERR_PVAR_NO_ATOMIC)
#define GENERATE_ENUM(ENUM) ENUM,
-#define GENERATE_STRING(STRING) #STRING,
+#define GENERATE_STRING(STRING) _XBT_STRINGIFY(STRING),
enum ERROR_ENUM {
FOREACH_ERROR(GENERATE_ENUM)
/** Fortran binding + -fsecond-underscore **/
XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, int* line);
-#define SMPI_ITER_NAME1(line) iter_count##line
+#define SMPI_ITER_NAME1(line) _XBT_CONCAT(iter_count, line)
#define SMPI_ITER_NAME(line) SMPI_ITER_NAME1(line)
#define SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, global, iters, thres)\
int SMPI_ITER_NAME(__LINE__)=0;\
XBT_PUBLIC int smpi_shared_known_call(const char* func, const char* input);
XBT_PUBLIC void* smpi_shared_get_call(const char* func, const char* input);
XBT_PUBLIC void* smpi_shared_set_call(const char* func, const char* input, void* data);
-#define SMPI_SHARED_CALL(func, input, ...) \
- (smpi_shared_known_call(#func, input) ? smpi_shared_get_call(#func, input) \
- : smpi_shared_set_call(#func, input, (func(__VA_ARGS__))))
+#define SMPI_SHARED_CALL(func, input, ...) \
+ (smpi_shared_known_call(_XBT_STRINGIFY(func), input) \
+ ? smpi_shared_get_call(_XBT_STRINGIFY(func), input) \
+ : smpi_shared_set_call(_XBT_STRINGIFY(func), input, (func(__VA_ARGS__))))
/* Fortran specific stuff */
/* C++ declarations for shared_malloc */
#ifdef __cplusplus
-#include <vector>
-
XBT_PUBLIC int smpi_is_shared(void* ptr, std::vector<std::pair<size_t, size_t>>& private_blocks, size_t* offset);
std::vector<std::pair<size_t, size_t>> shift_and_frame_private_blocks(const std::vector<std::pair<size_t, size_t>>& vec,
size_t offset, size_t buff_size);
std::vector<std::pair<size_t, size_t>> merge_private_blocks(const std::vector<std::pair<size_t, size_t>>& src,
const std::vector<std::pair<size_t, size_t>>& dst);
-
#endif
#endif