-/* 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. */
#include "simgrid/msg.h"
-#include "src/kernel/activity/SynchroExec.hpp"
-#include "src/kernel/activity/SynchroComm.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ExecImpl.hpp"
+#include "xbt/Extendable.hpp"
-#include <xbt/Extendable.hpp>
+#include <atomic>
/**************** datatypes **********************************/
/**************************** Host Extension *********************************/
typedef struct simdata_task {
~simdata_task()
{
- if (this->compute)
- this->compute->unref();
-
/* parallel tasks only */
xbt_free(this->host_list);
}
this->isused = false;
}
- simgrid::kernel::activity::Exec *compute = nullptr; /* SIMIX modeling of computation */
- simgrid::kernel::activity::Comm *comm = nullptr; /* SIMIX modeling of communication */
+ simgrid::kernel::activity::ExecImplPtr compute = nullptr; /* SIMIX modeling of computation */
+ simgrid::kernel::activity::CommImplPtr 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 = 0.0;
- double bound = 0.0; /* Capping for CPU resource */
- double rate = 0.0; /* Capping for network resource */
+
+ 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 */
void reportMultipleUse() const;
} s_simdata_task_t;
-/********************************* File **************************************/
-typedef struct simdata_file {
- smx_file_t smx_file;
-} s_simdata_file_t;
-
/******************************* Process *************************************/
-class MsgActorExt {
+namespace simgrid {
+namespace msg {
+class ActorExt {
public:
- msg_host_t m_host; /* the host on which the process is running */
- smx_activity_t waiting_action = nullptr;
- msg_task_t waiting_task = nullptr;
- msg_error_t last_errno = MSG_OK; /* the last value returned by a MSG_function */
-
+ explicit ActorExt(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 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;
-
-typedef struct msg_comm {
- smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+class Comm {
+public:
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;
+ smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+ msg_error_t status = MSG_OK; /* status of the communication once finished */
+ Comm(msg_task_t sent, msg_task_t* received, smx_activity_t comm)
+ : task_sent(sent), task_received(received), s_comm(std::move(comm))
+ {
+ }
+};
+}
+}
/************************** Global variables ********************************/
typedef struct MSG_Global {
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 */
+ std::atomic_int_fast32_t 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;
-
-XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
+} s_MSG_Global_t;
+typedef s_MSG_Global_t* MSG_Global_t;
-/*************************************************************/
SG_BEGIN_DECL()
-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_storage_destroy(msg_storage_priv_t host);
-XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
+XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
+/*************************************************************/
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, double kill_time,
- xbt_dict_t properties, int auto_restart,
- smx_actor_t parent_process);
+XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function<void()> code, void* data,
+ sg_host_t host, std::map<std::string, std::string>* 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();
-
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);
/* 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 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);
XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process);
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);
-
inline void simdata_task::setUsed()
{
if (this->isused)
