-/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2021. 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. */
#ifdef __cplusplus
-#include "cstdint"
#include "mc/datatypes.h"
#include "simgrid/forward.h" // aid_t
+#include <array>
+#include <cstdint>
+#include <xbt/dynar.h>
+#include <xbt/mmalloc.h>
+#include <xbt/utility.hpp>
// ***** Messages
namespace simgrid {
namespace mc {
-enum class MessageType {
- NONE,
- CONTINUE,
- IGNORE_HEAP,
- UNIGNORE_HEAP,
- IGNORE_MEMORY,
- STACK_REGION,
- REGISTER_SYMBOL,
- DEADLOCK_CHECK,
- DEADLOCK_CHECK_REPLY,
- WAITING,
- SIMCALL_HANDLE,
- ASSERTION_FAILED,
- ACTOR_ENABLED,
- ACTOR_ENABLED_REPLY
-};
+XBT_DECLARE_ENUM_CLASS(MessageType, NONE, INITIAL_ADDRESSES, CONTINUE, IGNORE_HEAP, UNIGNORE_HEAP, IGNORE_MEMORY,
+ STACK_REGION, REGISTER_SYMBOL, DEADLOCK_CHECK, DEADLOCK_CHECK_REPLY, WAITING, SIMCALL_HANDLE,
+ SIMCALL_IS_VISIBLE, SIMCALL_IS_VISIBLE_ANSWER, SIMCALL_TO_STRING, SIMCALL_TO_STRING_ANSWER,
+ SIMCALL_DOT_LABEL, ASSERTION_FAILED, ACTOR_ENABLED, ACTOR_ENABLED_REPLY, FINALIZE);
} // namespace mc
} // namespace simgrid
-#define MC_MESSAGE_LENGTH 512
+constexpr unsigned MC_MESSAGE_LENGTH = 512;
/** Basic structure for a MC message
*
};
/* Client->Server */
+struct s_mc_message_initial_addresses_t {
+ simgrid::mc::MessageType type;
+ xbt_mheap_t mmalloc_default_mdp;
+ unsigned long* maxpid;
+ xbt_dynar_t actors;
+ xbt_dynar_t dead_actors;
+};
+
struct s_mc_message_ignore_heap_t {
simgrid::mc::MessageType type;
int block;
struct s_mc_message_register_symbol_t {
simgrid::mc::MessageType type;
- char name[128];
+ std::array<char, 128> name;
int (*callback)(void*);
void* data;
};
/* Server -> client */
struct s_mc_message_simcall_handle_t {
simgrid::mc::MessageType type;
- unsigned long pid;
- int value;
+ aid_t aid_;
+ int times_considered_;
};
struct s_mc_message_restore_t {
aid_t aid; // actor ID
};
-XBT_PRIVATE const char* MC_message_type_name(simgrid::mc::MessageType type);
+/* RPC */
+struct s_mc_message_simcall_is_visible_t { // MessageType::SIMCALL_IS_VISIBLE
+ simgrid::mc::MessageType type;
+ aid_t aid;
+};
+struct s_mc_message_simcall_is_visible_answer_t { // MessageType::SIMCALL_IS_VISIBLE_ANSWER
+ simgrid::mc::MessageType type;
+ bool value;
+};
+
+struct s_mc_message_simcall_to_string_t { // MessageType::SIMCALL_TO_STRING or MessageType::SIMCALL_DOT_LABEL
+ simgrid::mc::MessageType type;
+ aid_t aid;
+ int time_considered;
+};
+struct s_mc_message_simcall_to_string_answer_t { // MessageType::SIMCALL_TO_STRING_ANSWER
+ simgrid::mc::MessageType type;
+ char value[1024];
+};
#endif // __cplusplus
#endif