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
Give a LD_LIBRARY_PATH to java tests
[simgrid.git]
/
teshsuite
/
msg
/
host_on_off_processes
/
host_on_off_processes.c
diff --git
a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
index
0aa4cbf
..
83071fb
100644
(file)
--- a/
teshsuite/msg/host_on_off_processes/host_on_off_processes.c
+++ b/
teshsuite/msg/host_on_off_processes/host_on_off_processes.c
@@
-13,10
+13,9
@@
int tasks_done = 0;
static int process_daemon(int argc, char *argv[])
{
static int process_daemon(int argc, char *argv[])
{
- msg_task_t task = NULL;
- XBT_INFO(" Start daemon on %s (%f)", MSG_host_get_name(MSG_host_self()), MSG_get_host_speed(MSG_host_self()));
+ XBT_INFO(" Start daemon on %s (%f)", MSG_host_get_name(MSG_host_self()), MSG_host_get_speed(MSG_host_self()));
for(;;){
for(;;){
-
task = MSG_task_create("daemon", MSG_get_hos
t_speed(MSG_host_self()), 0, NULL);
+
msg_task_t task = MSG_task_create("daemon", MSG_host_ge
t_speed(MSG_host_self()), 0, NULL);
XBT_INFO(" Execute daemon");
MSG_task_execute(task);
MSG_task_destroy(task);
XBT_INFO(" Execute daemon");
MSG_task_execute(task);
MSG_task_destroy(task);
@@
-39,8
+38,7
@@
static int process_sleep(int argc, char *argv[])
static int commTX(int argc, char *argv[])
{
msg_task_t task = NULL;
static int commTX(int argc, char *argv[])
{
msg_task_t task = NULL;
- char mailbox[80];
- sprintf(mailbox, "comm");
+ const char * mailbox = "comm";
XBT_INFO(" Start TX");
task = MSG_task_create("COMM", 0, 100000000, NULL);
MSG_task_isend(task, mailbox);
XBT_INFO(" Start TX");
task = MSG_task_create("COMM", 0, 100000000, NULL);
MSG_task_isend(task, mailbox);
@@
-53,8
+51,7
@@
static int commTX(int argc, char *argv[])
static int commRX(int argc, char *argv[])
{
msg_task_t task = NULL;
static int commRX(int argc, char *argv[])
{
msg_task_t task = NULL;
- char mailbox[80];
- sprintf(mailbox, "comm");
+ const char * mailbox = "comm";
XBT_INFO(" Start RX");
msg_error_t error = MSG_task_receive(&(task), mailbox);
if (error==MSG_OK) {
XBT_INFO(" Start RX");
msg_error_t error = MSG_task_receive(&(task), mailbox);
if (error==MSG_OK) {
@@
-74,8
+71,6
@@
static int test_launcher(int argc, char *argv[])
{
int test = 0;
char **argvF;
{
int test = 0;
char **argvF;
- argvF = xbt_new(char*, 2);
- argvF[0] = xbt_strdup("process_daemon");
msg_host_t jupiter = MSG_host_by_name("Jupiter");
test = 1;
msg_host_t jupiter = MSG_host_by_name("Jupiter");
test = 1;
@@
-105,7
+100,7
@@
static int test_launcher(int argc, char *argv[])
argvF[0] = xbt_strdup("process_daemon");
MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, jupiter, 1, argvF);
MSG_process_sleep(10);
argvF[0] = xbt_strdup("process_daemon");
MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, jupiter, 1, argvF);
MSG_process_sleep(10);
- XBT_INFO(" Test 2 does not crash
, WTF ?!
(number of Process : %d, it should be 1)", MSG_process_get_number());
+ XBT_INFO(" Test 2 does not crash
as it should
(number of Process : %d, it should be 1)", MSG_process_get_number());
XBT_INFO(" Ok so let's turn on/off the node to see whether the process is correctly bound to Jupiter");
MSG_host_on(jupiter);
XBT_INFO(" Turn off");
XBT_INFO(" Ok so let's turn on/off the node to see whether the process is correctly bound to Jupiter");
MSG_host_on(jupiter);
XBT_INFO(" Turn off");
@@
-181,7
+176,7
@@
static int test_launcher(int argc, char *argv[])
msg_vm_t vm0;
msg_process_t daemon;
msg_vm_t vm0;
msg_process_t daemon;
- vm0 = MSG_vm_create
(jupiter, "vm0", 1, 2048, 125, NULL, -1
, 125, dpRate);
+ vm0 = MSG_vm_create
(jupiter, "vm0", 2048
, 125, dpRate);
MSG_vm_start(vm0);
argvF = xbt_new(char*, 2);
MSG_vm_start(vm0);
argvF = xbt_new(char*, 2);