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
kill that ruby script that nobody will ever use
[simgrid.git]
/
examples
/
msg
/
icomms
/
peer3.c
diff --git
a/examples/msg/icomms/peer3.c
b/examples/msg/icomms/peer3.c
index
128d01f
..
155b702
100644
(file)
--- a/
examples/msg/icomms/peer3.c
+++ b/
examples/msg/icomms/peer3.c
@@
-1,11
+1,11
@@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
-#include "
msg/msg.h" /* Yeah! If you want to use msg, you need to include msg
/msg.h */
+#include "
simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid
/msg.h */
#include "xbt/sysdep.h" /* calloc, printf */
#include <math.h>
/* Create a log channel to have nice outputs. */
#include "xbt/sysdep.h" /* calloc, printf */
#include <math.h>
/* Create a log channel to have nice outputs. */
@@
-22,7
+22,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
int sender(int argc, char *argv[]);
int receiver(int argc, char *argv[]);
int sender(int argc, char *argv[]);
int receiver(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);
/** Sender function */
const char *application_file);
/** Sender function */
@@
-36,7
+36,7
@@
int sender(int argc, char *argv[])
double coef = 0;
xbt_dynar_t d = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int i;
double coef = 0;
xbt_dynar_t d = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int i;
- m_task_t task;
+ m
sg
_task_t task;
char mailbox[256];
char sprintf_buffer[256];
msg_comm_t comm;
char mailbox[256];
char sprintf_buffer[256];
msg_comm_t comm;
@@
-69,7
+69,7
@@
int sender(int argc, char *argv[])
sprintf(mailbox, "finalize");
msg_comm_t res_irecv;
sprintf(mailbox, "finalize");
msg_comm_t res_irecv;
-
_XBT_GNUC_UNUSED MSG
_error_t res_wait;
+
XBT_ATTRIB_UNUSED msg
_error_t res_wait;
for (i = 0; i < receivers_count; i++) {
task = NULL;
res_irecv = MSG_task_irecv(&(task), mailbox);
for (i = 0; i < receivers_count; i++) {
task = NULL;
res_irecv = MSG_task_irecv(&(task), mailbox);
@@
-91,9
+91,9
@@
int receiver(int argc, char *argv[])
char mailbox[80];
xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int tasks = atof(argv[2]);
char mailbox[80];
xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int tasks = atof(argv[2]);
- m
_task_t *task = xbt_new(m
_task_t, tasks);
+ m
sg_task_t *task = xbt_new(msg
_task_t, tasks);
-
_XBT_GNUC
_UNUSED int read;
+
XBT_ATTRIB
_UNUSED int read;
read = sscanf(argv[1], "%d", &id);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "receiver-%d", id);
read = sscanf(argv[1], "%d", &id);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "receiver-%d", id);
@@
-107,9
+107,9
@@
int receiver(int argc, char *argv[])
}
/* Here we are waiting for the receiving of all communications */
}
/* Here we are waiting for the receiving of all communications */
- m_task_t task_com;
+ m
sg
_task_t task_com;
while (!xbt_dynar_is_empty(comms)) {
while (!xbt_dynar_is_empty(comms)) {
-
_XBT_GNUC_UNUSED MSG
_error_t err;
+
XBT_ATTRIB_UNUSED msg
_error_t err;
xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
task_com = MSG_comm_get_task(res_irecv);
MSG_comm_destroy(res_irecv);
xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
task_com = MSG_comm_get_task(res_irecv);
MSG_comm_destroy(res_irecv);
@@
-132,12
+132,11
@@
int receiver(int argc, char *argv[])
} /* end_of_receiver */
/** Test function */
} /* end_of_receiver */
/** Test function */
-
MSG
_error_t test_all(const char *platform_file,
+
msg
_error_t test_all(const char *platform_file,
const char *application_file)
{
const char *application_file)
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
- /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
@@
-156,19
+155,14
@@
MSG_error_t test_all(const char *platform_file,
/** Main function */
int main(int argc, char *argv[])
{
/** Main function */
int main(int argc, char *argv[])
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
- MSG_global_init(&argc, argv);
- if (argc < 3) {
- printf("Usage: %s platform_file deployment_file\n", argv[0]);
- printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
- exit(1);
- }
+ 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]);
+
res = test_all(argv[1], argv[2]);
res = test_all(argv[1], argv[2]);
- MSG_clean();
-
- if (res == MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+
+ return res != MSG_OK;
+}