-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2017. 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. */
#define METASIMGRID_PRIVATE_H
#include "simgrid/msg.h"
-#include "simgrid/simix.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 "src/instr/instr_private.h"
-SG_BEGIN_DECL()
-/**************** datatypes **********************************/
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
+#include "xbt/Extendable.hpp"
+/**************** datatypes **********************************/
+/**************************** Host Extension *********************************/
+namespace simgrid {
+class MsgHostExt {
+public:
+ static simgrid::xbt::Extension<s4u::Host, MsgHostExt> EXTENSION_ID;
+
+ ~MsgHostExt() {
+ delete file_descriptor_table;
+ }
+ std::vector<int>* file_descriptor_table = nullptr; // Created lazily on need
+};
+}
/********************************* 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->msg = (bprintf(m)); \
- _xbt_ex_t->category = (xbt_errcat_t)(0); \
- _xbt_ex_t->value = (0); \
- _xbt_ex_t->procname = (char*)xbt_procname(); \
- _xbt_ex_t->pid = xbt_getpid(); \
- _xbt_ex_t->file = (char*)__FILE__; \
- _xbt_ex_t->line = __LINE__; \
- _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 */
- double bytes_amount; /* Data size */
- double flops_amount; /* Computation size */
- msg_process_t sender;
- msg_process_t receiver;
- msg_host_t source;
- double priority;
- double bound; /* Capping for CPU resource */
- double rate; /* Capping for network resource */
-
- /* CPU affinity database of this task */
- xbt_dict_t affinity_mask_db; /* smx_host_t host => unsigned long mask */
-
- void *isused; /* Indicates whether the task is used in SIMIX currently */
- int host_nb; /* ==0 if sequential task; parallel task if not */
+ ~simdata_task()
+ {
+ if (this->compute)
+ this->compute->unref();
+
+ /* parallel tasks only */
+ xbt_free(this->host_list);
+ }
+ void setUsed();
+ void setNotUsed()
+ {
+ this->isused = false;
+ }
+
+ simgrid::kernel::activity::ExecImpl* compute = nullptr; /* SIMIX modeling of computation */
+ simgrid::kernel::activity::CommImpl* comm = nullptr; /* SIMIX modeling of communication */
+ double bytes_amount = 0.0; /* Data size */
+ double flops_amount = 0.0; /* Computation size */
+ msg_process_t sender = nullptr;
+ msg_process_t receiver = nullptr;
+ msg_host_t source = nullptr;
+
+ double priority = 1.0;
+ double bound = 0.0; /* Capping for CPU resource, or 0 for no capping */
+ double rate = -1; /* Capping for network resource, or -1 for no capping*/
+
+ bool isused = false; /* Indicates whether the task is used in SIMIX currently */
+ int host_nb = 0; /* ==0 if sequential task; parallel task if not */
/******* Parallel Tasks Only !!!! *******/
- sg_host_t *host_list;
- double *flops_parallel_amount;
- double *bytes_parallel_amount;
+ sg_host_t *host_list = nullptr;
+ double *flops_parallel_amount = nullptr;
+ double *bytes_parallel_amount = nullptr;
+
+private:
+ void reportMultipleUse() const;
} s_simdata_task_t;
/********************************* File **************************************/
smx_file_t smx_file;
} s_simdata_file_t;
-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);
-
/******************************* 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 */
- 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 */
-} s_simdata_process_t, *simdata_process_t;
-
-typedef struct process_arg {
- const char *name;
- xbt_main_func_t code;
- void *data;
- msg_host_t m_host;
- int argc;
- char **argv;
- double kill_time;
-} s_process_arg_t, *process_arg_t;
+namespace simgrid {
+class MsgActorExt {
+public:
+ explicit MsgActorExt(void* d) : data(d) {}
+ msg_error_t errno_ = MSG_OK; /* the last value returned by a MSG_function */
+ void* data = nullptr; /* user data */
+};
+}
typedef struct msg_comm {
- smx_synchro_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+ smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
msg_task_t task_sent; /* task sent (NULL for the receiver) */
msg_task_t *task_received; /* where the task will be received (NULL for the sender) */
msg_error_t status; /* status of the communication once finished */
} s_msg_comm_t;
-/******************************* VM *************************************/
-typedef struct dirty_page {
- double prev_clock;
- double prev_remaining;
- msg_task_t task;
-} s_dirty_page, *dirty_page_t;
-
-XBT_PUBLIC_DATA(const char*) MSG_vm_get_property_value(msg_vm_t vm, const char *name);
-XBT_PUBLIC_DATA(xbt_dict_t) MSG_vm_get_properties(msg_vm_t vm);
-XBT_PUBLIC_DATA(void) MSG_vm_set_property_value(msg_vm_t vm, const char *name, void *value, void_f_pvoid_t free_ctn);
-XBT_PUBLIC_DATA(msg_vm_t) MSG_vm_get_by_name(const char *name);
-XBT_PUBLIC_DATA(const char*) MSG_vm_get_name(msg_vm_t vm);
-
/************************** Global variables ********************************/
typedef struct MSG_Global {
- xbt_fifo_t host;
- int session;
- int debug_multiple_use;
+ int debug_multiple_use; /* whether we want an error message when reusing the same Task for 2 things */
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
void (*task_copy_callback) (msg_task_t task, msg_process_t src, msg_process_t dst);
void_f_pvoid_t process_data_cleanup;
-} s_MSG_Global_t, *MSG_Global_t;
+} s_MSG_Global_t;
+typedef s_MSG_Global_t* MSG_Global_t;
+
+SG_BEGIN_DECL()
-/*extern MSG_Global_t msg_global;*/
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
/*************************************************************/
-// FIXME: KILLME
-# define MSG_RETURN(val) return(val)
XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
-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_file_destroy(msg_file_t file);
-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,
- 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);
+XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc);
+XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data,
+ sg_host_t host, xbt_dict_t properties,
+ smx_actor_t parent_process);
+XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size);
-XBT_PRIVATE void MSG_post_create_environment(void);
+XBT_PRIVATE void MSG_post_create_environment();
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);
XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task);
XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task);
XBT_PRIVATE void TRACE_msg_task_get_end(double start_time, msg_task_t task);
-XBT_PRIVATE void TRACE_msg_task_get_start(void);
+XBT_PRIVATE void TRACE_msg_task_get_start();
XBT_PRIVATE int TRACE_msg_task_put_start(msg_task_t task); //returns TRUE if the task_put_end must be called
-XBT_PRIVATE void TRACE_msg_task_put_end(void);
+XBT_PRIVATE void TRACE_msg_task_put_end();
/* 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 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);
-/* 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_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_suspend(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_resume(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_save(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_restore(msg_vm_t vm);
-XBT_PRIVATE void TRACE_msg_vm_end(msg_vm_t vm);
-
SG_END_DECL()
+
+inline void simdata_task::setUsed()
+{
+ if (this->isused)
+ this->reportMultipleUse();
+ if (msg_global->debug_multiple_use) {
+ // TODO, backtrace
+ }
+ this->isused = true;
+}
+
#endif
