A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_process_private.h
diff --git
a/src/simix/smx_process_private.h
b/src/simix/smx_process_private.h
index
bf93b7f
..
da6cf69
100644
(file)
--- a/
src/simix/smx_process_private.h
+++ b/
src/simix/smx_process_private.h
@@
-7,8
+7,13
@@
#ifndef _SIMIX_PROCESS_PRIVATE_H
#define _SIMIX_PROCESS_PRIVATE_H
#ifndef _SIMIX_PROCESS_PRIVATE_H
#define _SIMIX_PROCESS_PRIVATE_H
+#include <functional>
+#include <string>
+
#include <xbt/base.h>
#include <xbt/base.h>
+#include <xbt/string.hpp>
+#include <simgrid/simix.hpp>
#include "simgrid/simix.h"
#include "popping_private.h"
#include "simgrid/simix.h"
#include "popping_private.h"
@@
-17,21
+22,20
@@
typedef struct s_smx_process_exit_fun {
void *arg;
} s_smx_process_exit_fun_t, *smx_process_exit_fun_t;
void *arg;
} s_smx_process_exit_fun_t, *smx_process_exit_fun_t;
-typedef struct s_smx_process_arg {
- char *name;
- xbt_main_func_t code;
- void *data;
- const char *hostname;
- int argc;
- char **argv;
- double kill_time;
- xbt_dict_t properties;
- unsigned auto_restart:1;
-} s_smx_process_arg_t, *smx_process_arg_t;
-
namespace simgrid {
namespace simix {
namespace simgrid {
namespace simix {
+class ProcessArg {
+public:
+ std::string name;
+ std::function<void()> code;
+ void *data = nullptr;
+ const char *hostname = nullptr;
+ double kill_time = 0.0;
+ xbt_dict_t properties = nullptr;
+ bool auto_restart = false;
+};
+
class Process {
public:
class Process {
public:
@@
-43,7
+47,7
@@
public:
unsigned long pid = 0;
unsigned long ppid = 0;
unsigned long pid = 0;
unsigned long ppid = 0;
- char *name = nullptr; /**< @brief process name if any */
+ simgrid::xbt::string name;
sg_host_t host = nullptr; /* the host on which the process is running */
smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
xbt_running_ctx_t *running_ctx = nullptr;
sg_host_t host = nullptr; /* the host on which the process is running */
smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
xbt_running_ctx_t *running_ctx = nullptr;
@@
-62,9
+66,7
@@
public:
void *data = nullptr; /* kept for compatibility, it should be replaced with moddata */
xbt_dynar_t on_exit = nullptr; /* list of functions executed when the process dies */
void *data = nullptr; /* kept for compatibility, it should be replaced with moddata */
xbt_dynar_t on_exit = nullptr; /* list of functions executed when the process dies */
- xbt_main_func_t code = nullptr;
- int argc = 0;
- char **argv = nullptr;
+ std::function<void()> code;
smx_timer_t kill_timer = nullptr;
int segment_index = 0; /*Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
};
smx_timer_t kill_timer = nullptr;
int segment_index = 0; /*Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
};
@@
-72,17
+74,18
@@
public:
}
}
}
}
+typedef simgrid::simix::ProcessArg *smx_process_arg_t;
+
typedef simgrid::simix::Process* smx_process_t;
SG_BEGIN_DECL()
XBT_PRIVATE smx_process_t SIMIX_process_create(
const char *name,
typedef simgrid::simix::Process* smx_process_t;
SG_BEGIN_DECL()
XBT_PRIVATE smx_process_t SIMIX_process_create(
const char *name,
-
xbt_main_func_t
code,
+
std::function<void()>
code,
void *data,
const char *hostname,
double kill_time,
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_dict_t properties,
int auto_restart,
smx_process_t parent_process);
@@
-90,7
+93,6
@@
XBT_PRIVATE smx_process_t SIMIX_process_create(
XBT_PRIVATE void SIMIX_process_runall(void);
XBT_PRIVATE void SIMIX_process_kill(smx_process_t process, smx_process_t issuer);
XBT_PRIVATE void SIMIX_process_killall(smx_process_t issuer, int reset_pid);
XBT_PRIVATE void SIMIX_process_runall(void);
XBT_PRIVATE void SIMIX_process_kill(smx_process_t process, smx_process_t issuer);
XBT_PRIVATE void SIMIX_process_killall(smx_process_t issuer, int reset_pid);
-XBT_PRIVATE smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args);
XBT_PRIVATE void SIMIX_process_stop(smx_process_t arg);
XBT_PRIVATE void SIMIX_process_cleanup(smx_process_t arg);
XBT_PRIVATE void SIMIX_process_empty_trash(void);
XBT_PRIVATE void SIMIX_process_stop(smx_process_t arg);
XBT_PRIVATE void SIMIX_process_cleanup(smx_process_t arg);
XBT_PRIVATE void SIMIX_process_empty_trash(void);
@@
-117,8
+119,8
@@
XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_synchro_t synchro);
XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart);
XBT_PRIVATE smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer);
XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_process_t process, int auto_restart);
XBT_PRIVATE smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer);
-void SIMIX_segment_index_set(smx_process_t
, int
);
-extern void (*SMPI_switch_data_segment)(int);
+void SIMIX_segment_index_set(smx_process_t
process, int segment_index
);
+extern void (*SMPI_switch_data_segment)(int
dest
);
SG_END_DECL()
SG_END_DECL()