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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
examples
/
smpi
/
mc
/
bugged1_liveness.c
diff --git
a/examples/smpi/mc/bugged1_liveness.c
b/examples/smpi/mc/bugged1_liveness.c
index
7305370
..
213c888
100644
(file)
--- a/
examples/smpi/mc/bugged1_liveness.c
+++ b/
examples/smpi/mc/bugged1_liveness.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-11,7
+11,7
@@
/******************************************************************************/
/* Run :
/******************************************************************************/
/* Run :
- /usr/bin/time -f "clock:%e user:%U sys:%S swapped:%W exitval:%x max:%Mk" "$@" ../../../smpi_script/bin/smpirun -hostfile hostfile_bugged1_liveness -platform ../../platforms/cluster.xml --cfg=
model-check:1 --cfg=contexts/factory:ucontext --cfg=model-check/reduction:none --cfg=model-check/property:promela_bugged1_liveness --cfg=smpi/send_is_detached_thres
:0 --cfg=contexts/stack_size:128 --cfg=model-check/visited:100000 --cfg=model-check/max_depth:100000 ./bugged1_liveness */
+ /usr/bin/time -f "clock:%e user:%U sys:%S swapped:%W exitval:%x max:%Mk" "$@" ../../../smpi_script/bin/smpirun -hostfile hostfile_bugged1_liveness -platform ../../platforms/cluster.xml --cfg=
contexts/factory:ucontext --cfg=model-check/reduction:none --cfg=model-check/property:promela_bugged1_liveness --cfg=smpi/send-is-detached-thresh
:0 --cfg=contexts/stack_size:128 --cfg=model-check/visited:100000 --cfg=model-check/max_depth:100000 ./bugged1_liveness */
#include <stdio.h>
#include <mpi.h>
#include <stdio.h>
#include <mpi.h>
@@
-23,23
+23,13
@@
int r, cs;
int r, cs;
-static int predR(){
- return r;
-}
-
-static int predCS(){
- return cs;
-}
-
-
int main(int argc, char **argv){
int main(int argc, char **argv){
-
int err, size, rank;
int recv_buff;
MPI_Status status;
int CS_used = 0;
xbt_dynar_t requests = xbt_dynar_new(sizeof(int), NULL);
int err, size, rank;
int recv_buff;
MPI_Status status;
int CS_used = 0;
xbt_dynar_t requests = xbt_dynar_new(sizeof(int), NULL);
-
+
/* Initialize MPI */
err = MPI_Init(&argc, &argv);
if(err != MPI_SUCCESS){
/* Initialize MPI */
err = MPI_Init(&argc, &argv);
if(err != MPI_SUCCESS){
@@
-47,15
+37,15
@@
int main(int argc, char **argv){
exit(1);
}
exit(1);
}
- MC_automaton_new_propositional_symbol
("r", &predR
);
- MC_automaton_new_propositional_symbol
("cs", &predCS
);
+ MC_automaton_new_propositional_symbol
_pointer("r", &r
);
+ MC_automaton_new_propositional_symbol
_pointer("cs", &cs
);
MC_ignore(&(status.count), sizeof(status.count));
/* Get number of processes */
MC_ignore(&(status.count), sizeof(status.count));
/* Get number of processes */
-
err =
MPI_Comm_size(MPI_COMM_WORLD, &size);
+ MPI_Comm_size(MPI_COMM_WORLD, &size);
/* Get id of this process */
/* Get id of this process */
-
err =
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
+ MPI_Comm_rank(MPI_COMM_WORLD, &rank);
if(rank == 0){ /* Coordinator */
while(1){
if(rank == 0){ /* Coordinator */
while(1){