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
attempt to replace internal dynar by std::vector
[simgrid.git]
/
src
/
xbt
/
parmap.cpp
diff --git
a/src/xbt/parmap.cpp
b/src/xbt/parmap.cpp
index
2445b0b
..
7a0fab3
100644
(file)
--- a/
src/xbt/parmap.cpp
+++ b/
src/xbt/parmap.cpp
@@
-116,7
+116,7
@@
xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
/* Create the pool of worker threads */
xbt_parmap_thread_data_t data;
/* Create the pool of worker threads */
xbt_parmap_thread_data_t data;
- parmap->workers[0] =
NULL
;
+ parmap->workers[0] =
nullptr
;
#if HAVE_PTHREAD_SETAFFINITY
int core_bind = 0;
#endif
#if HAVE_PTHREAD_SETAFFINITY
int core_bind = 0;
#endif
@@
-124,10
+124,10
@@
xbt_parmap_t xbt_parmap_new(unsigned int num_workers, e_xbt_parmap_mode_t mode)
data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
data->parmap = parmap;
data->worker_id = i;
data = xbt_new0(s_xbt_parmap_thread_data_t, 1);
data->parmap = parmap;
data->worker_id = i;
- parmap->workers[i] = xbt_os_thread_create(
NULL, xbt_parmap_worker_main, data, NULL
);
+ parmap->workers[i] = xbt_os_thread_create(
nullptr, xbt_parmap_worker_main, data, nullptr
);
#if HAVE_PTHREAD_SETAFFINITY
#if HAVE_PTHREAD_SETAFFINITY
- xbt_os_thread_bind(parmap->workers[i], core_bind);
- if (core_bind != xbt_os_get_numcores())
+ xbt_os_thread_bind(parmap->workers[i], core_bind);
+ if (core_bind != xbt_os_get_numcores()
- 1
)
core_bind++;
else
core_bind = 0;
core_bind++;
else
core_bind = 0;
@@
-151,7
+151,7
@@
void xbt_parmap_destroy(xbt_parmap_t parmap)
unsigned int i;
for (i = 1; i < parmap->num_workers; i++)
unsigned int i;
for (i = 1; i < parmap->num_workers; i++)
- xbt_os_thread_join(parmap->workers[i],
NULL
);
+ xbt_os_thread_join(parmap->workers[i],
nullptr
);
xbt_os_cond_destroy(parmap->ready_cond);
xbt_os_mutex_destroy(parmap->ready_mutex);
xbt_os_cond_destroy(parmap->ready_cond);
xbt_os_mutex_destroy(parmap->ready_mutex);
@@
-245,7
+245,7
@@
void xbt_parmap_apply(xbt_parmap_t parmap, void_f_pvoid_t fun, xbt_dynar_t data)
*
* Worker threads call this function to get more work.
*
*
* Worker threads call this function to get more work.
*
- * \return the next task to process, or
NULL
if there is no more work
+ * \return the next task to process, or
nullptr
if there is no more work
*/
void* xbt_parmap_next(xbt_parmap_t parmap)
{
*/
void* xbt_parmap_next(xbt_parmap_t parmap)
{
@@
-253,14
+253,16
@@
void* xbt_parmap_next(xbt_parmap_t parmap)
if (index < xbt_dynar_length(parmap->data)) {
return xbt_dynar_get_as(parmap->data, index, void*);
}
if (index < xbt_dynar_length(parmap->data)) {
return xbt_dynar_get_as(parmap->data, index, void*);
}
- return
NULL
;
+ return
nullptr
;
}
static void xbt_parmap_work(xbt_parmap_t parmap)
{
}
static void xbt_parmap_work(xbt_parmap_t parmap)
{
- unsigned in
dex
;
- while (
(index = parmap->index++) < xbt_dynar_length(parmap->data))
+ unsigned in
t index = parmap->index++
;
+ while (
index < xbt_dynar_length(parmap->data)){
parmap->fun(xbt_dynar_get_as(parmap->data, index, void*));
parmap->fun(xbt_dynar_get_as(parmap->data, index, void*));
+ index = parmap->index++;
+ }
}
/**
}
/**
@@
-269,17
+271,18
@@
static void xbt_parmap_work(xbt_parmap_t parmap)
*/
static void *xbt_parmap_worker_main(void *arg)
{
*/
static void *xbt_parmap_worker_main(void *arg)
{
- xbt_parmap_thread_data_t data =
(xbt_parmap_thread_data_t) arg
;
+ xbt_parmap_thread_data_t data =
static_cast<xbt_parmap_thread_data_t>(arg)
;
xbt_parmap_t parmap = data->parmap;
unsigned round = 0;
xbt_parmap_t parmap = data->parmap;
unsigned round = 0;
- smx_context_t context = SIMIX_context_new(std::function<void()>(),
NULL, NULL
);
+ smx_context_t context = SIMIX_context_new(std::function<void()>(),
nullptr, nullptr
);
SIMIX_context_set_current(context);
XBT_DEBUG("New worker thread created");
/* Worker's main loop */
while (1) {
SIMIX_context_set_current(context);
XBT_DEBUG("New worker thread created");
/* Worker's main loop */
while (1) {
- parmap->worker_wait_f(parmap, ++round);
+ round++;
+ parmap->worker_wait_f(parmap, round);
if (parmap->status == XBT_PARMAP_WORK) {
XBT_DEBUG("Worker %d got a job", data->worker_id);
if (parmap->status == XBT_PARMAP_WORK) {
XBT_DEBUG("Worker %d got a job", data->worker_id);
@@
-291,7
+294,7
@@
static void *xbt_parmap_worker_main(void *arg)
} else {
delete context;
xbt_free(data);
} else {
delete context;
xbt_free(data);
- return
NULL
;
+ return
nullptr
;
}
}
}
}
}
}
@@
-300,13
+303,13
@@
static void *xbt_parmap_worker_main(void *arg)
static void futex_wait(unsigned *uaddr, unsigned val)
{
XBT_VERB("Waiting on futex %p", uaddr);
static void futex_wait(unsigned *uaddr, unsigned val)
{
XBT_VERB("Waiting on futex %p", uaddr);
- syscall(SYS_futex, uaddr, FUTEX_WAIT_PRIVATE, val,
NULL, NULL
, 0);
+ syscall(SYS_futex, uaddr, FUTEX_WAIT_PRIVATE, val,
nullptr, nullptr
, 0);
}
static void futex_wake(unsigned *uaddr, unsigned val)
{
XBT_VERB("Waking futex %p", uaddr);
}
static void futex_wake(unsigned *uaddr, unsigned val)
{
XBT_VERB("Waking futex %p", uaddr);
- syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val,
NULL, NULL
, 0);
+ syscall(SYS_futex, uaddr, FUTEX_WAKE_PRIVATE, val,
nullptr, nullptr
, 0);
}
#endif
}
#endif
@@
-337,7
+340,8
@@
static void xbt_parmap_posix_master_wait(xbt_parmap_t parmap)
static void xbt_parmap_posix_worker_signal(xbt_parmap_t parmap)
{
xbt_os_mutex_acquire(parmap->done_mutex);
static void xbt_parmap_posix_worker_signal(xbt_parmap_t parmap)
{
xbt_os_mutex_acquire(parmap->done_mutex);
- if (++parmap->thread_counter == parmap->num_workers) {
+ parmap->thread_counter++;
+ if (parmap->thread_counter == parmap->num_workers) {
/* all workers have finished, wake the controller */
xbt_os_cond_signal(parmap->done_cond);
}
/* all workers have finished, wake the controller */
xbt_os_cond_signal(parmap->done_cond);
}