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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
smpi_replay.cpp
diff --git
a/src/smpi/smpi_replay.cpp
b/src/smpi/smpi_replay.cpp
index
5301420
..
1b6dd41
100644
(file)
--- a/
src/smpi/smpi_replay.cpp
+++ b/
src/smpi/smpi_replay.cpp
@@
-1,12
+1,10
@@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-2017. 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 "private.h"
/* 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 <xbt.h>
-#include <xbt/replay.h>
+#include "xbt/replay.h"
#include <unordered_map>
#include <vector>
#include <unordered_map>
#include <vector>
@@
-169,7
+167,7
@@
static void action_init(const char *const *action)
static void action_finalize(const char *const *action)
{
static void action_finalize(const char *const *action)
{
- /*
do nothing
*/
+ /*
Nothing to do
*/
}
static void action_comm_size(const char *const *action)
}
static void action_comm_size(const char *const *action)
@@
-847,8
+845,8
@@
static void action_allToAllv(const char *const *action) {
CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2)
int sendcounts[comm_size];
int recvcounts[comm_size];
CHECK_ACTION_PARAMS(action, 2*comm_size+2, 2)
int sendcounts[comm_size];
int recvcounts[comm_size];
- int senddisps[comm_size];
;
- int recvdisps[comm_size];
;
+ int senddisps[comm_size];
+ int recvdisps[comm_size];
MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
MPI_Datatype MPI_CURRENT_TYPE2 = MPI_DEFAULT_TYPE;
@@
-971,6
+969,7
@@
void smpi_replay_run(int *argc, char***argv){
}
smpi_mpi_waitall(count_requests, requests, status);
}
}
smpi_mpi_waitall(count_requests, requests, status);
}
+ delete get_reqq_self();
active_processes--;
if(active_processes==0){
active_processes--;
if(active_processes==0){