From 5f9c9649e91db8cb9b4df86bf03f77240df05750 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 17 Mar 2010 10:20:25 +0000 Subject: [PATCH] And now, a version that compiles, bummer (load the right includes, even if they are internals because part of simix. Not clean but works) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7259 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/msg/Makefile.am | 1 + examples/msg/actions/actions.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/examples/msg/Makefile.am b/examples/msg/Makefile.am index 2b4286c614..6e1382c76e 100644 --- a/examples/msg/Makefile.am +++ b/examples/msg/Makefile.am @@ -113,6 +113,7 @@ properties_msg_prop_LDADD = $(top_builddir)/src/libsimgrid.la # actions example actions_actions_SOURCES = actions/actions.c actions_actions_LDADD = $(top_builddir)/src/libsimgrid.la +actions_actions_CFLAGS = -I$(top_builddir)/src/include # migration example migration_migration_SOURCES = migration/migration.c diff --git a/examples/msg/actions/actions.c b/examples/msg/actions/actions.c index f1f5fbd350..2f8958d266 100644 --- a/examples/msg/actions/actions.c +++ b/examples/msg/actions/actions.c @@ -8,6 +8,7 @@ #include #include #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simix/simix.h" /* semaphores for the barrier */ #include "xbt.h" /* calloc, printf */ #include "simgrid_config.h" /* getline */ @@ -34,7 +35,7 @@ static double parse_double(const char *string) { /* My actions */ -static void send(xbt_dynar_t action) +static void action_send(xbt_dynar_t action) { char *name = NULL; char to[250]; @@ -94,7 +95,7 @@ static void Isend(xbt_dynar_t action) } -static void recv(xbt_dynar_t action) +static void action_recv(xbt_dynar_t action) { char *name = NULL; char mailbox_name[250]; @@ -161,7 +162,7 @@ static void Irecv(xbt_dynar_t action) } -static void wait_action(xbt_dynar_t action) +static void action_wait(xbt_dynar_t action) { char *name = NULL; char task_name[80]; @@ -345,7 +346,7 @@ static void bcast (xbt_dynar_t action) } -static void sleep(xbt_dynar_t action) +static void action_sleep(xbt_dynar_t action) { char *name = NULL; char *duration = xbt_dynar_get_as(action, 2, char *); @@ -511,16 +512,16 @@ int main(int argc, char *argv[]) /* Action registration */ MSG_action_register("comm_size", comm_size); - MSG_action_register("send", send); + MSG_action_register("send", action_send); MSG_action_register("Isend", Isend); - MSG_action_register("recv", recv); + MSG_action_register("recv", action_recv); MSG_action_register("Irecv", Irecv); - MSG_action_register("wait", wait_action); + MSG_action_register("wait", action_wait); MSG_action_register("barrier", barrier); MSG_action_register("bcast", bcast); MSG_action_register("reduce", reduce); MSG_action_register("allReduce", allReduce); - MSG_action_register("sleep", sleep); + MSG_action_register("sleep", action_sleep); MSG_action_register("compute", compute); -- 2.20.1