set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.tesh PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.c PARENT_SCOPE)
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/get_sender_d.xml PARENT_SCOPE)
ADD_TESH_FACTORIES(tesh-msg-get-sender "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/get_sender ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender/get_sender.tesh)
MSG_create_environment(argv[1]);
- MSG_function_register("send", &sender_fun);
- MSG_function_register("receive", &receiver_fun);
- MSG_launch_application(argv[2]);
- res = MSG_main();
+ MSG_process_create("send", sender_fun, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("receive", receiver_fun, NULL, MSG_get_host_by_name("Tremblay"));
+ res = MSG_main();
return res != MSG_OK;
}
! output sort
-$ ./get_sender ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/get_sender_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./get_sender ${srcdir:=.}/../../../examples/platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
> [ 0.000000] (1:send@Tremblay) Sending
> [ 0.000000] (2:receive@Tremblay) Receiving
> [ 0.000195] (2:receive@Tremblay) Got a message sent by 'send'
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="Tremblay" function="send"/>
- <process host="Tremblay" function="receive"/>
-</platform>
ADD_TESH_FACTORIES(tesh-msg-${x} "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/host_on_off ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off/${x}.tesh)
endforeach()
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_d.xml PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} PARENT_SCOPE)
set(tesh_files ${tesh_files} PARENT_SCOPE)
msg_error_t res;
MSG_init(&argc, argv);
- xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+ xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
MSG_create_environment(argv[1]);
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(argv[2]);
+ MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Jupiter"));
res = MSG_main();
-$ ./host_on_off ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_d.xml
+$ ./host_on_off ${srcdir:=.}/../../../examples/platforms/small_platform.xml
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "task on"
> [Jupiter:slave:(2) 0.824497] [msg_test/INFO] Task "task on" done
> [Tremblay:master:(1) 1.169155] [msg_test/INFO] Sending "task off"
> [Tremblay:master:(1) 2.169155] [msg_test/INFO] Sending "task on without proc"
> [Tremblay:master:(1) 3.169155] [msg_test/INFO] Sending "task on with proc"
> [Tremblay:master:(1) 3.338309] [msg_test/INFO] Sending "finalize"
-> [Jupiter:slave:(4) 3.993652] [msg_test/INFO] Task "task on with proc" done
+> [Jupiter:slave:(3) 3.993652] [msg_test/INFO] Task "task on with proc" done
> [Tremblay:master:(1) 4.012666] [msg_test/INFO] Goodbye now!
-> [Jupiter:slave:(4) 4.012666] [msg_test/INFO] I'm done. See you!
+> [Jupiter:slave:(3) 4.012666] [msg_test/INFO] I'm done. See you!
> [4.012666] [msg_test/INFO] Simulation time 4.01267
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="Tremblay" function="master"/>
- <process host="Jupiter" function="slave"/>
-</platform>
msg_error_t res;
MSG_init(&argc, argv);
- xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+ xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
MSG_create_environment(argv[1]);
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(argv[2]);
+ MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Jupiter"));
res = MSG_main();
-$ ./host_on_off_recv ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_d.xml
+$ ./host_on_off_recv ${srcdir:=.}/../../../examples/platforms/small_platform.xml
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Master starting
> [Jupiter:slave:(2) 0.000000] [msg_test/INFO] Slave receiving
> [Tremblay:master:(1) 1.000000] [msg_test/INFO] Turning off the slave host
msg_error_t res;
MSG_init(&argc, argv);
- xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+ xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
MSG_create_environment(argv[1]);
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(argv[2]);
+ MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Jupiter"));
res = MSG_main();
-$ ./host_on_off_wait ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_d.xml
+$ ./host_on_off_wait ${srcdir:=.}/../../../examples/platforms/small_platform.xml
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Master waiting
> [Jupiter:slave:(2) 0.000000] [msg_test/INFO] Slave waiting
> [Tremblay:master:(1) 1.000000] [msg_test/INFO] Turning off the slave host
target_link_libraries(host_on_off_processes simgrid)
set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_processes.tesh PARENT_SCOPE)
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_processes_d.xml PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_processes.c PARENT_SCOPE)
ADD_TESH_FACTORIES(tesh-msg-host-on-off-processes "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off_processes --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/host_on_off_processes ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh)
msg_error_t res;
MSG_init(&argc, argv);
- xbt_assert(argc > 3,"Usage: %s platform_file deployment_file test_number\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml 1\n", argv[0], argv[0]);
+ xbt_assert(argc == 3,"Usage: %s platform_file test_number\n\tExample: %s msg_platform.xml 1\n", argv[0], argv[0]);
unsigned int iter;
char *groups;
MSG_create_environment(argv[1]);
- MSG_function_register("test_launcher", test_launcher);
- MSG_function_register("process_daemon", process_daemon);
- MSG_function_register("process_sleep", process_sleep);
-
- MSG_launch_application(argv[2]);
+ MSG_process_create("test_launcher", test_launcher, NULL, MSG_get_host_by_name("Tremblay"));
res = MSG_main();
-$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_processes_d.xml 1 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
+$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml 1 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 1:
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Create a process on Jupiter
> [Jupiter:process_daemon:(2) 0.000000] [msg_test/INFO] Start daemon on Jupiter (76296000.000000)
> [Tremblay:test_launcher:(1) 13.000000] [msg_test/INFO] Test done. See you!
> [13.000000] [msg_test/INFO] Simulation time 13
-$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_processes_d.xml 2 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
+$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml 2 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 2:
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Turn off Jupiter
> [0.000000] [simix_process/WARNING] Cannot launch process 'process_daemon' on failed host 'Jupiter'
> [Tremblay:test_launcher:(1) 20.000000] [msg_test/INFO] Test done. See you!
> [20.000000] [msg_test/INFO] Simulation time 20
-$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_processes_d.xml 3 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
+$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml 3 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 3:
> [Jupiter:process_sleep:(2) 0.000000] [msg_test/INFO] I'm alive but I should sleep
> [Jupiter:process_sleep:(2) 10.000000] [msg_test/INFO] I'm alive but I should sleep
> [Tremblay:test_launcher:(1) 10100.000000] [msg_test/INFO] Test done. See you!
> [10100.000000] [msg_test/INFO] Simulation time 10100
-$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_processes_d.xml 4 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
+$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml 4 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 4 (turn off src during a communication) : Create a Process/task to make a communication between Jupiter and Tremblay and turn off Jupiter during the communication
> [Tremblay:commRX:(2) 10.000000] [msg_test/INFO] Start RX
> [Jupiter:commTX:(3) 10.000000] [msg_test/INFO] Start TX
> [Tremblay:commRX:(2) 20.000000] [msg_test/INFO] RX Done
> [20.000000] [msg_test/INFO] Simulation time 20
-$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_processes_d.xml 5 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
+$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml 5 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 5 (turn off dest during a communication : Create a Process/task to make a communication between Tremblay and Jupiter and turn off Jupiter during the communication
> [Jupiter:commRX:(2) 10.000000] [msg_test/INFO] Start RX
> [Tremblay:commTX:(3) 10.000000] [msg_test/INFO] Start TX
> [Tremblay:commTX:(3) 40.000000] [msg_test/INFO] TX done
> [40.000000] [msg_test/INFO] Simulation time 40
-$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/host_on_off_processes_d.xml 6 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
+$ ./host_on_off_processes ${srcdir:=.}/../../../examples/platforms/small_platform.xml 6 --log=no_loc --log=msg.thresh:error --log=surf_maxmin.thresh:error
> [Tremblay:test_launcher:(1) 0.000000] [msg_test/INFO] Test 6: Turn on Jupiter, assign a VM on Jupiter, launch a process inside the VM, and turn off the node
> [vm0:process_daemon:(2) 0.000000] [msg_test/INFO] Start daemon on vm0 (76296000.000000)
> [vm0:process_daemon:(2) 0.000000] [msg_test/INFO] Execute daemon
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="Tremblay" function="test_launcher"/>
-</platform>
target_link_libraries(pid simgrid)
set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/pid.tesh PARENT_SCOPE)
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/pid_d.xml PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/pid.c PARENT_SCOPE)
ADD_TESH_FACTORIES(tesh-msg-pid "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/pid --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/pid ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/pid/pid.tesh)
MSG_init(&argc, argv);
- MSG_function_register("sendpid", &sendpid);
- MSG_function_register("killall", &killall);
-
- MSG_process_killall(atoi(argv[3]));
+ MSG_process_killall(atoi(argv[2]));
MSG_create_environment(argv[1]);
- MSG_launch_application(argv[2]);
+ MSG_process_create("sendpid", sendpid, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("sendpid", sendpid, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("sendpid", sendpid, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("killall", killall, NULL, MSG_get_host_by_name("Tremblay"));
+
res = MSG_main();
return res != MSG_OK;
-$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/pid_d.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
> [ 0.000000] (1:sendpid@Tremblay) Sending pid of "1".
> [ 0.000000] (2:sendpid@Tremblay) Sending pid of "2".
> [ 0.000000] (3:sendpid@Tremblay) Sending pid of "3".
> [ 0.001206] (4:killall@Tremblay) Killing process "3".
> [ 0.001206] (3:sendpid@Tremblay) Process "3" killed.
-$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/pid_d.xml 2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./pid ${srcdir:=.}/../../../examples/platforms/small_platform.xml 2 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
> [ 0.000000] (2:sendpid@Tremblay) Sending pid of "2".
> [ 0.000000] (3:sendpid@Tremblay) Sending pid of "3".
> [ 0.000000] (4:sendpid@Tremblay) Sending pid of "4".
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="Tremblay" function="sendpid"/>
- <process host="Tremblay" function="sendpid"/>
- <process host="Tremblay" function="sendpid"/>
- <process host="Tremblay" function="killall"/>
-</platform>
set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/process.tesh PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/process.c PARENT_SCOPE)
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/process_d.xml PARENT_SCOPE)
ADD_TESH_FACTORIES(tesh-msg-process "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/process ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process/process.tesh)
msg_error_t res;
MSG_init(&argc, argv);
- xbt_assert(argc == 3, "Usage: %s platform_file deployment_file\n"
- "\n Example: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+ xbt_assert(argc == 2, "Usage: %s platform_file\n\t Example: %s msg_platform.xml\n", argv[0], argv[0]);
MSG_create_environment(argv[1]);
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
-
- MSG_launch_application(argv[2]);
+ MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Tremblay"));
res = MSG_main();
-$ ./process ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/process_d.xml
+$ ./process ${srcdir:=.}/../../../examples/platforms/small_platform.xml
> [Tremblay:slave:(2) 0.500000] [msg_test/INFO] Slave started (PID:2, PPID:0)
> [Tremblay:slave:(2) 0.500000] [msg_test/INFO] Plop i am not suspended
> [Tremblay:master:(1) 1.000000] [msg_test/INFO] Process(pid=1, ppid=0, name=master)
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="Tremblay" function="master"/>
- <process host="Tremblay" function="slave"/>
-</platform>
set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/process_join.tesh PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/process_join.c PARENT_SCOPE)
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/process_join_d.xml PARENT_SCOPE)
ADD_TESH_FACTORIES(tesh-msg-process-join "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process_join --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/process_join ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process_join/process_join.tesh)
msg_error_t res;
MSG_init(&argc, argv);
- xbt_assert(argc == 3, "Usage: %s platform_file deployment_file\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+ xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
MSG_create_environment(argv[1]);
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(argv[2]);
+ MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
res = MSG_main();
-$ ./process_join$EXEEXT ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/process_join_d.xml
+$ ./process_join$EXEEXT ${srcdir:=.}/../../../examples/platforms/small_platform.xml
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Start slave
> [Tremblay:slave from master:(2) 0.000000] [msg_test/INFO] Slave started
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Join the slave (timeout 2)
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="Tremblay" function="master"/>
-</platform>
set(tesh_files ${tesh_files} PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} PARENT_SCOPE)
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml PARENT_SCOPE)
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="alice" function="server" />
- <process host="bob" function="client" />
-</platform>
MSG_init(&argc, argv);
/* Check the arguments */
- xbt_assert(argc > 2,"Usage: %s platform_file deployment_file \n", argv[0]);
+ xbt_assert(argc == 2,"Usage: %s platform_file\n", argv[0]);
MSG_create_environment(argv[1]);
- MSG_function_register("client", client);
- MSG_function_register("server", server);
- MSG_launch_application(argv[2]);
+ MSG_process_create("server", server, NULL, MSG_get_host_by_name("alice"));
+ MSG_process_create("client", client, NULL, MSG_get_host_by_name("bob"));
msg_error_t res = MSG_main();
XBT_INFO("Simulated time: %g", MSG_get_clock());
-$ ./storage_basic$EXEEXT --cfg=path:${srcdir:=.} ${srcdir:=.}/../../../examples/platforms/storage/storage.xml ${srcdir:=.}/deployment.xml 0 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [ 0.000000] (0:maestro@) The custom configuration 'path' is already defined by user!
+$ ./storage_basic$EXEEXT ${srcdir:=.}/../../../examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
> [ 0.000000] (1:server@alice) *** Storage info on alice ***
> [ 0.000000] (1:server@alice) Storage name: Disk2, mount name: c:
> [ 0.000000] (1:server@alice) Free size: 534479374867 bytes
set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/task_destroy_cancel.tesh PARENT_SCOPE)
set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/task_destroy_cancel.c PARENT_SCOPE)
-set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/task_destroy_cancel_d.xml PARENT_SCOPE)
ADD_TESH_FACTORIES(tesh-msg-task-destroy-cancel "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/task_destroy_cancel --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/task_destroy_cancel ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh)
msg_error_t res;
MSG_init(&argc, argv);
- xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
- "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+ xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
MSG_create_environment(argv[1]);
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
-
- MSG_launch_application(argv[2]);
+ MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+ MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Jupiter"));
res = MSG_main();
-$ ./task_destroy_cancel ${srcdir:=.}/../../../examples/platforms/small_platform.xml ${srcdir:=.}/task_destroy_cancel_d.xml
+$ ./task_destroy_cancel ${srcdir:=.}/../../../examples/platforms/small_platform.xml
> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending task: "normal"
> [Jupiter:slave:(2) 0.169155] [msg_test/INFO] Handling task "normal"
> [Tremblay:master:(1) 0.169155] [msg_test/INFO] Canceling task "cancel directly" directly
+++ /dev/null
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <process host="Tremblay" function="master"/>
- <process host="Jupiter" function="slave"/>
-</platform>
add_executable (test_trace_integration test_trace_integration.c)
target_link_libraries(test_trace_integration simgrid)
-set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/trace.tesh PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/test_trace_integration.c PARENT_SCOPE)
-set(xml_files
- ${xml_files}
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp1.0-hbp1.0.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp3.0-hbp4.0.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.5-hbp1.5.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c0s1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c1s0.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c0s2.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c2s2.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s0.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s1.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c1s2.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c3s2.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp2.5-hbp1.5.xml
- PARENT_SCOPE)
+set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/trace.tesh PARENT_SCOPE)
+set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/test_trace_integration.c PARENT_SCOPE)
+set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp1.0-hbp1.0.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.0-hbp3.0-hbp4.0.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1.5-hbp1.5.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c0s1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s0-c1s0.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c0s2.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s1-c2s2.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s0.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c0s2-c1s1.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c1s2.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp1-c1s1-c3s2.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/test-hbp2.5-hbp1.5.xml PARENT_SCOPE)
ADD_TESH_FACTORIES(tesh-msg-trace "thread;ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/msg/trace --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace/trace.tesh)
