#include "xbt/dict.h"
#include "xbt/config.h"
#include "src/instr/instr_private.h"
+
+#include "src/simix/SynchroExec.hpp"
+#include "src/simix/SynchroComm.hpp"
+
SG_BEGIN_DECL()
/**************** datatypes **********************************/
_xbt_ex_t->pid = xbt_getpid(); \
_xbt_ex_t->file = (char*)__FILE__; \
_xbt_ex_t->line = __LINE__; \
- _xbt_ex_t->func = (char*)_XBT_FUNCTION; \
+ _xbt_ex_t->func = (char*)__func__; \
_xbt_ex_t->bt_strings = NULL; \
xbt_backtrace_current(_xbt_ex_t); \
ptr = _xbt_ex_t; } while(0)
typedef struct simdata_task {
- smx_synchro_t compute; /* SIMIX modeling of computation */
- smx_synchro_t comm; /* SIMIX modeling of communication */
+ simgrid::simix::Exec *compute; /* SIMIX modeling of computation */
+ simgrid::simix::Comm *comm; /* SIMIX modeling of communication */
double bytes_amount; /* Data size */
double flops_amount; /* Computation size */
msg_process_t sender;
XBT_PRIVATE int __MSG_host_get_file_descriptor_id(msg_host_t host);
XBT_PRIVATE void __MSG_host_release_file_descriptor_id(msg_host_t host, int id);
-/*************** Begin GPU ***************/
-typedef struct simdata_gpu_task {
- double flops_amount; /* Computation size */
- double dispatch_latency;
- double collect_latency;
- int isused; /* Indicates whether the task is used in SIMIX currently */
-} s_simdata_gpu_task_t;
-/*************** End GPU ***************/
-
/******************************* Process *************************************/
typedef struct simdata_process {
XBT_PRIVATE void MSG_host_add_task(msg_host_t host, msg_task_t task);
XBT_PRIVATE void MSG_host_del_task(msg_host_t host, msg_task_t task);
-/* @brief MSG_mailbox_free - release a mailbox from the memory.
- * Releases a mailbox from the memory but does not remove it from the dictionary.
- * @param mailbox The mailbox to release.
- */
-XBT_PRIVATE void MSG_mailbox_free(void *mailbox);
/********** Tracing **********/
/* declaration of instrumentation functions from msg_task_instr.c */