X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/693f30b46244c152cd79cdf3ad35d4a79b866c9c..56d5fef422211eb776ae8d6205816d382e26ecec:/examples/msg/parallel_task/test_ptask.c diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c index 07c340fc7b..efe1356ecd 100644 --- a/examples/msg/parallel_task/test_ptask.c +++ b/examples/msg/parallel_task/test_ptask.c @@ -17,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, int execute(int argc, char *argv[]); int redistribute(int argc, char *argv[]); -MSG_error_t test_all(const char *platform_file, +msg_error_t test_all(const char *platform_file, const char *application_file); @@ -25,8 +25,8 @@ int execute(int argc, char *argv[]) { char buffer[32]; int i, j; - m_host_t *m_host_list = NULL; - m_task_t task = NULL; + msg_host_t *m_host_list = NULL; + msg_task_t task = NULL; int host_list_size; double *computation_duration = NULL; double *communication_table = NULL; @@ -37,7 +37,7 @@ int execute(int argc, char *argv[]) host_list_size = argc - 3; XBT_DEBUG("host_list_size=%d", host_list_size); - m_host_list = calloc(host_list_size, sizeof(m_host_t)); + m_host_list = calloc(host_list_size, sizeof(msg_host_t)); for (i = 1; i <= host_list_size; i++) { m_host_list[i - 1] = MSG_get_host_by_name(argv[i]); xbt_assert(m_host_list[i - 1] != NULL, @@ -82,8 +82,8 @@ int redistribute(int argc, char *argv[]) { char buffer[32]; int i, j; - m_host_t *m_host_list = NULL; - m_task_t task = NULL; + msg_host_t *m_host_list = NULL; + msg_task_t task = NULL; int host_list_size; double *computation_duration = NULL; double *communication_table = NULL; @@ -93,7 +93,7 @@ int redistribute(int argc, char *argv[]) host_list_size = argc - 2; XBT_DEBUG("host_list_size=%d", host_list_size); - m_host_list = calloc(host_list_size, sizeof(m_host_t)); + m_host_list = calloc(host_list_size, sizeof(msg_host_t)); for (i = 1; i <= host_list_size; i++) { m_host_list[i - 1] = MSG_get_host_by_name(argv[i]); xbt_assert(m_host_list[i - 1] != NULL, @@ -131,10 +131,10 @@ int redistribute(int argc, char *argv[]) } -MSG_error_t test_all(const char *platform_file, +msg_error_t test_all(const char *platform_file, const char *application_file) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; MSG_config("workstation/model", "ptask_L07"); @@ -156,7 +156,7 @@ MSG_error_t test_all(const char *platform_file, int main(int argc, char *argv[]) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; MSG_init(&argc, argv); if (argc < 3) { @@ -164,7 +164,6 @@ int main(int argc, char *argv[]) exit(1); } res = test_all(argv[1], argv[2]); - MSG_clean(); if (res == MSG_OK) return 0;