From bb7e8677b0d2992857b0b1f43c945c4c6dfc5b9f Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 17 Feb 2015 11:51:30 +0100 Subject: [PATCH] Replace remaining smx_action by smx_synchro. --- doc/simix.fig | 2 +- src/msg/msg_gos.c | 4 ++-- src/simix/README_attempt_without_stack | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/simix.fig b/doc/simix.fig index c4df1aaaeb..90b8e3f19c 100644 --- a/doc/simix.fig +++ b/doc/simix.fig @@ -108,7 +108,7 @@ Single 3375 2700 3375 3375 5130 3375 5130 2835 4949 2700 3375 2700 2 3 0 1 0 31 101 0 17 0.000 0 0 7 0 0 4 4950 2700 4950 2835 5130 2835 4950 2700 -4 0 0 100 0 16 10 0.0000 4 150 945 3404 2890 smx_action_t\001 +4 0 0 100 0 16 10 0.0000 4 150 945 3404 2890 smx_synchro_t\001 4 0 0 100 0 16 10 0.0000 4 120 360 3420 3105 Dsc1\001 4 0 0 100 0 16 10 0.0000 4 120 360 3420 3285 Dsc2\001 -6 diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c index c2e853b9d9..b36b3eb1cf 100644 --- a/src/msg/msg_gos.c +++ b/src/msg/msg_gos.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -511,7 +511,7 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, * \param match_fun boolean function which parameters are: * - match_data_provided_here * - match_data_provided_by_other_side_if_any - * - the_smx_action_describing_the_other_side + * - the_smx_synchro_describing_the_other_side * \param match_data user provided data passed to match_fun * \return the msg_comm_t communication created */ diff --git a/src/simix/README_attempt_without_stack b/src/simix/README_attempt_without_stack index a7b145fad7..1652308da7 100644 --- a/src/simix/README_attempt_without_stack +++ b/src/simix/README_attempt_without_stack @@ -66,7 +66,7 @@ simcall_* functions). Moreover, you must know that each blocking simcall will result in an interruption of your execution flow. Let's take an example: If your code contains: - smx_action_t act = simcall_comm_isend(......); + smx_synchro_t act = simcall_comm_isend(......); simcall_comm_wait(act); simcall_comm_destroy(act); -- 2.20.1