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 framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
include
/
xbt
/
parmap.hpp
diff --git
a/src/include/xbt/parmap.hpp
b/src/include/xbt/parmap.hpp
index
fc8f6da
..
4e073a1
100644
(file)
--- a/
src/include/xbt/parmap.hpp
+++ b/
src/include/xbt/parmap.hpp
@@
-162,7
+162,7
@@
template <typename T> Parmap<T>::Parmap(unsigned num_workers, e_xbt_parmap_mode_
/* Initialize the thread pool data structure */
this->status = PARMAP_WORK;
this->work_round = 0;
/* Initialize the thread pool data structure */
this->status = PARMAP_WORK;
this->work_round = 0;
- this->workers.res
erv
e(num_workers);
+ this->workers.res
iz
e(num_workers);
this->num_workers = num_workers;
this->synchro = new_synchro(mode);
this->num_workers = num_workers;
this->synchro = new_synchro(mode);
@@
-205,7
+205,6
@@
template <typename T> Parmap<T>::~Parmap()
for (unsigned i = 1; i < num_workers; i++)
workers[i]->join();
for (unsigned i = 1; i < num_workers; i++)
workers[i]->join();
- workers.clear();
delete synchro;
}
delete synchro;
}