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
* Cleanup the DTD by renaming:
[simgrid.git]
/
include
/
msg
/
msg.h
diff --git
a/include/msg/msg.h
b/include/msg/msg.h
index
4d12e2d
..
744dcdd
100644
(file)
--- a/
include/msg/msg.h
+++ b/
include/msg/msg.h
@@
-8,7
+8,7
@@
#ifndef MSG_H
#define MSG_H
#ifndef MSG_H
#define MSG_H
-#include "xbt
/misc
.h"
+#include "xbt.h"
#include "msg/datatypes.h"
SG_BEGIN_DECL()
#include "msg/datatypes.h"
SG_BEGIN_DECL()
@@
-22,8
+22,8
@@
XBT_PUBLIC(MSG_error_t) MSG_set_channel_number(int number);
XBT_PUBLIC(int) MSG_get_channel_number(void);
XBT_PUBLIC(MSG_error_t) MSG_main(void);
XBT_PUBLIC(MSG_error_t) MSG_clean(void);
XBT_PUBLIC(int) MSG_get_channel_number(void);
XBT_PUBLIC(MSG_error_t) MSG_main(void);
XBT_PUBLIC(MSG_error_t) MSG_clean(void);
-XBT_PUBLIC(void) MSG_function_register(const char *name,
m_process_code
_t code);
-XBT_PUBLIC(
m_process_code
_t) MSG_get_registered_function(const char *name);
+XBT_PUBLIC(void) MSG_function_register(const char *name,
xbt_main_func
_t code);
+XBT_PUBLIC(
xbt_main_func
_t) MSG_get_registered_function(const char *name);
XBT_PUBLIC(void) MSG_launch_application(const char *file);
XBT_PUBLIC(void) MSG_paje_output(const char *filename);
XBT_PUBLIC(void) MSG_launch_application(const char *file);
XBT_PUBLIC(void) MSG_paje_output(const char *filename);
@@
-39,6
+39,10
@@
XBT_PUBLIC(int) MSG_get_host_msgload(m_host_t host);
XBT_PUBLIC(double) MSG_get_host_speed(m_host_t h);
XBT_PUBLIC(int) MSG_host_is_avail (m_host_t h);
XBT_PUBLIC(double) MSG_get_host_speed(m_host_t h);
XBT_PUBLIC(int) MSG_host_is_avail (m_host_t h);
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(m_host_t host);
+XBT_PUBLIC(const char*) MSG_host_get_property_value(m_host_t host, char* name);
+
XBT_PUBLIC(void) MSG_create_environment(const char *file);
XBT_PUBLIC(m_host_t) MSG_get_host_by_name(const char *name);
XBT_PUBLIC(void) MSG_create_environment(const char *file);
XBT_PUBLIC(m_host_t) MSG_get_host_by_name(const char *name);
@@
-47,11
+51,14
@@
XBT_PUBLIC(m_host_t *)MSG_get_host_table(void);
/************************** Process handling *********************************/
XBT_PUBLIC(m_process_t) MSG_process_create(const char *name,
/************************** Process handling *********************************/
XBT_PUBLIC(m_process_t) MSG_process_create(const char *name,
-
m_process_code
_t code, void *data,
+
xbt_main_func
_t code, void *data,
m_host_t host);
XBT_PUBLIC(m_process_t) MSG_process_create_with_arguments(const char *name,
m_host_t host);
XBT_PUBLIC(m_process_t) MSG_process_create_with_arguments(const char *name,
-
m_process_code
_t code, void *data,
+
xbt_main_func
_t code, void *data,
m_host_t host, int argc, char **argv);
m_host_t host, int argc, char **argv);
+XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char *name,
+ xbt_main_func_t code, void *data,
+ m_host_t host, int argc, char **argv, xbt_dict_t properties);
XBT_PUBLIC(void) MSG_process_kill(m_process_t process);
XBT_PUBLIC(int) MSG_process_killall(int reset_PIDs);
XBT_PUBLIC(void) MSG_process_kill(m_process_t process);
XBT_PUBLIC(int) MSG_process_killall(int reset_PIDs);
@@
-68,6
+75,10
@@
XBT_PUBLIC(int) MSG_process_self_PID(void);
XBT_PUBLIC(int) MSG_process_self_PPID(void);
XBT_PUBLIC(m_process_t) MSG_process_self(void);
XBT_PUBLIC(int) MSG_process_self_PPID(void);
XBT_PUBLIC(m_process_t) MSG_process_self(void);
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(m_process_t process);
+XBT_PUBLIC(const char*) MSG_process_get_property_value(m_process_t process, char* name);
+
XBT_PUBLIC(MSG_error_t) MSG_process_suspend(m_process_t process);
XBT_PUBLIC(MSG_error_t) MSG_process_resume(m_process_t process);
XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process);
XBT_PUBLIC(MSG_error_t) MSG_process_suspend(m_process_t process);
XBT_PUBLIC(MSG_error_t) MSG_process_resume(m_process_t process);
XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process);