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
Typo.
[simgrid.git]
/
src
/
smpi
/
smpi_replay.c
diff --git
a/src/smpi/smpi_replay.c
b/src/smpi/smpi_replay.c
index
507957f
..
9e00ae9
100644
(file)
--- a/
src/smpi/smpi_replay.c
+++ b/
src/smpi/smpi_replay.c
@@
-1,10
+1,9
@@
-/* Copyright (c) 2009-201
3
. The SimGrid Team.
+/* Copyright (c) 2009-201
4
. 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. */
* 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 "private.h"
#include <stdio.h>
#include <xbt.h>
#include "private.h"
#include <stdio.h>
#include <xbt.h>
@@
-259,6
+258,12
@@
static void action_recv(const char *const *action) {
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
#endif
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
#endif
+ //unknow size from the receiver pov
+ if(size==-1){
+ smpi_mpi_probe(from, 0, MPI_COMM_WORLD, &status);
+ size=status.count;
+ }
+
smpi_mpi_recv(NULL, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
#ifdef HAVE_TRACING
smpi_mpi_recv(NULL, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
#ifdef HAVE_TRACING
@@
-290,6
+295,12
@@
static void action_Irecv(const char *const *action)
extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE);
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
#endif
extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE);
TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra);
#endif
+ MPI_Status status;
+ //unknow size from the receiver pov
+ if(size==-1){
+ smpi_mpi_probe(from, 0, MPI_COMM_WORLD, &status);
+ size=status.count;
+ }
request = smpi_mpi_irecv(NULL, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD);
request = smpi_mpi_irecv(NULL, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD);
@@
-986,7
+997,7
@@
int smpi_replay_finalize(){
/* Last process alive speaking */
/* end the simulated timer */
sim_time = smpi_process_simulated_elapsed();
/* Last process alive speaking */
/* end the simulated timer */
sim_time = smpi_process_simulated_elapsed();
- XBT_INFO("Simulation time %
g
", sim_time);
+ XBT_INFO("Simulation time %
f
", sim_time);
_xbt_replay_action_exit();
xbt_free(reqq);
reqq = NULL;
_xbt_replay_action_exit();
xbt_free(reqq);
reqq = NULL;