#ifndef METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
+#include <functional>
+
#include "simgrid/msg.h"
#include "simgrid/simix.h"
-#include "surf/surf.h"
+#include "src/include/surf/surf.h"
#include "xbt/base.h"
#include "xbt/fifo.h"
#include "xbt/dynar.h"
#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/config.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
+
+#include "src/simix/SynchroExec.hpp"
+#include "src/simix/SynchroComm.hpp"
+
SG_BEGIN_DECL()
/**************** datatypes **********************************/
/********************************* Task **************************************/
-
-
#define MSG_BT(ptr, m) \
do {xbt_ex_t *_xbt_ex_t = xbt_new0(xbt_ex_t, 1); \
/* build the exception */ \
_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 {
msg_host_t m_host; /* the host on which the process is running */
msg_host_t put_host; /* used for debugging purposes */
-#ifdef MSG_USE_DEPRECATED
- m_channel_t put_channel; /* used for debugging purposes */
-#endif
smx_synchro_t waiting_action;
msg_task_t waiting_task;
- char **argv; /* arguments table if any */
- int argc; /* arguments number if any */
msg_error_t last_errno; /* the last value returned by a MSG_function */
void* data; /* user data */
msg_error_t status; /* status of the communication once finished */
} s_msg_comm_t;
-
/******************************* VM *************************************/
typedef struct dirty_page {
double prev_clock;
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
-#ifdef MSG_USE_DEPRECATED
- int max_channel;
-#endif
int session;
int debug_multiple_use;
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
/*extern MSG_Global_t msg_global;*/
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
-
/*************************************************************/
-
-#ifdef MSG_USE_DEPRECATED
-# define PROCESS_SET_ERRNO(val) \
- (((simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self()))->last_errno=val)
-# define PROCESS_GET_ERRNO() \
- (((simdata_process_t) SIMIX_process_self_get_data(SIMIX_process_self()))->last_errno)
-#define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
-/* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
-
-#else
+// FIXME: KILLME
# define MSG_RETURN(val) return(val)
-#endif
XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
-void __MSG_host_destroy(msg_host_t host);
XBT_PRIVATE void __MSG_host_priv_free(msg_host_priv_t priv);
XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);
XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
XBT_PRIVATE smx_process_t MSG_process_create_from_SIMIX(const char *name,
- xbt_main_func_t code, void *data,
+ std::function<void()> code, void *data,
const char *hostname, double kill_time,
- int argc, char **argv,
xbt_dict_t properties, int auto_restart,
smx_process_t parent_process);
XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size);
/* declaration of instrumentation functions from msg_process_instr.c */
XBT_PRIVATE char *instr_process_id (msg_process_t proc, char *str, int len);
XBT_PRIVATE char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len);
-XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host,
- msg_host_t new_host);
+XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host);
XBT_PRIVATE void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host);
-XBT_PRIVATE void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host);
+XBT_PRIVATE void TRACE_msg_process_destroy (const char *process_name, int process_pid);
XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process);
XBT_PRIVATE void TRACE_msg_process_suspend(msg_process_t process);
XBT_PRIVATE void TRACE_msg_process_resume(msg_process_t process);
XBT_PRIVATE void TRACE_msg_process_sleep_in(msg_process_t process); //called from msg/gos.c
XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process);
-XBT_PRIVATE void TRACE_msg_process_end(msg_process_t process);
/* declaration of instrumentation functions from instr_msg_vm.c */
XBT_PRIVATE char *instr_vm_id(msg_vm_t vm, char *str, int len);
XBT_PRIVATE char *instr_vm_id_2(const char *vm_name, char *str, int len);
-XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host,
- msg_host_t new_host);
+XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_host);
XBT_PRIVATE void TRACE_msg_vm_start(msg_vm_t vm);
XBT_PRIVATE void TRACE_msg_vm_create(const char *vm_name, msg_host_t host);
XBT_PRIVATE void TRACE_msg_vm_kill(msg_vm_t process);
XBT_PRIVATE void TRACE_msg_vm_end(msg_vm_t vm);
SG_END_DECL()
+
+XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment(
+ const char *name, std::function<void()> code, void *data,
+ msg_host_t host, xbt_dict_t properties);
+
#endif
