diff --git a/src/engine_redistribute.c b/src/engine_redistribute.c
index 2c54a4466f138f7b945739e4ca15d48ed24fb61d..276fd61894e337045272a8d84e15710bceeeccff 100644
--- a/src/engine_redistribute.c
+++ b/src/engine_redistribute.c
@@ -293,7 +293,7 @@ struct redist_mapper_data {
*
* part version.
*/
-static void ENGINE_REDISTRIBUTE_DEST_MAPPER(part);
+void ENGINE_REDISTRIBUTE_DEST_MAPPER(part);
/**
* @brief Accumulate the counts of star particles per cell.
@@ -301,7 +301,7 @@ static void ENGINE_REDISTRIBUTE_DEST_MAPPER(part);
*
* spart version.
*/
-static void ENGINE_REDISTRIBUTE_DEST_MAPPER(spart);
+void ENGINE_REDISTRIBUTE_DEST_MAPPER(spart);
/**
* @brief Accumulate the counts of gravity particles per cell.
@@ -309,7 +309,7 @@ static void ENGINE_REDISTRIBUTE_DEST_MAPPER(spart);
*
* gpart version.
*/
-static void ENGINE_REDISTRIBUTE_DEST_MAPPER(gpart);
+void ENGINE_REDISTRIBUTE_DEST_MAPPER(gpart);
/**
* @brief Accumulate the counts of black holes particles per cell.
@@ -317,7 +317,7 @@ static void ENGINE_REDISTRIBUTE_DEST_MAPPER(gpart);
*
* bpart version.
*/
-static void ENGINE_REDISTRIBUTE_DEST_MAPPER(bpart);
+void ENGINE_REDISTRIBUTE_DEST_MAPPER(bpart);
#endif /* redist_mapper_data */
@@ -374,9 +374,9 @@ struct savelink_mapper_data {
* Threadpool helper for accumulating the counts of particles per cell.
*/
#ifdef SWIFT_DEBUG_CHECKS
-static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(part, 1);
+void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(part, 1);
#else
-static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(part, 0);
+void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(part, 0);
#endif
/**
@@ -384,9 +384,9 @@ static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(part, 0);
* Threadpool helper for accumulating the counts of particles per cell.
*/
#ifdef SWIFT_DEBUG_CHECKS
-static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(spart, 1);
+void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(spart, 1);
#else
-static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(spart, 0);
+void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(spart, 0);
#endif
/**
@@ -394,9 +394,9 @@ static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(spart, 0);
* Threadpool helper for accumulating the counts of particles per cell.
*/
#ifdef SWIFT_DEBUG_CHECKS
-static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(bpart, 1);
+void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(bpart, 1);
#else
-static void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(bpart, 0);
+void ENGINE_REDISTRIBUTE_SAVELINK_MAPPER(bpart, 0);
#endif
#endif /* savelink_mapper_data */
@@ -423,8 +423,8 @@ struct relink_mapper_data {
* @param extra_data additional data defining the context (a
* relink_mapper_data).
*/
-static void engine_redistribute_relink_mapper(void *map_data, int num_elements,
- void *extra_data) {
+void engine_redistribute_relink_mapper(void *map_data, int num_elements,
+ void *extra_data) {
int *nodes = (int *)map_data;
struct relink_mapper_data *mydata = (struct relink_mapper_data *)extra_data;
diff --git a/src/partition.c b/src/partition.c
index b038aaf699753c016bc240164ec30c54753b80e8..00b8d0c2c360f085e3a45ac2353db5bab03e79b0 100644
--- a/src/partition.c
+++ b/src/partition.c
@@ -337,8 +337,8 @@ struct counts_mapper_data {
* local memory to reduce contention, the amount of memory required is
* precalculated by an additional loop determining the range of cell IDs. */
#define ACCUMULATE_SIZES_MAPPER(TYPE) \
- accumulate_sizes_mapper_##TYPE(void *map_data, int num_elements, \
- void *extra_data) { \
+ partition_accumulate_sizes_mapper_##TYPE(void *map_data, int num_elements, \
+ void *extra_data) { \
struct TYPE *parts = (struct TYPE *)map_data; \
struct counts_mapper_data *mydata = \
(struct counts_mapper_data *)extra_data; \
@@ -383,7 +383,7 @@ struct counts_mapper_data {
*
* part version.
*/
-static void ACCUMULATE_SIZES_MAPPER(part);
+void ACCUMULATE_SIZES_MAPPER(part);
/**
* @brief Accumulate the sized counts of particles per cell.
@@ -391,7 +391,7 @@ static void ACCUMULATE_SIZES_MAPPER(part);
*
* gpart version.
*/
-static void ACCUMULATE_SIZES_MAPPER(gpart);
+void ACCUMULATE_SIZES_MAPPER(gpart);
/**
* @brief Accumulate the sized counts of particles per cell.
@@ -399,7 +399,7 @@ static void ACCUMULATE_SIZES_MAPPER(gpart);
*
* spart version.
*/
-static void ACCUMULATE_SIZES_MAPPER(spart);
+void ACCUMULATE_SIZES_MAPPER(spart);
/* qsort support. */
static int ptrcmp(const void *p1, const void *p2) {
@@ -440,9 +440,9 @@ static void accumulate_sizes(struct space *s, int verbose, double *counts) {
mapper_data.counts = gcounts;
mapper_data.size = gsize;
- threadpool_map(&s->e->threadpool, accumulate_sizes_mapper_gpart, s->gparts,
- s->nr_gparts, sizeof(struct gpart), space_splitsize,
- &mapper_data);
+ threadpool_map(&s->e->threadpool, partition_accumulate_sizes_mapper_gpart,
+ s->gparts, s->nr_gparts, sizeof(struct gpart),
+ space_splitsize, &mapper_data);
/* Get all the counts from all the nodes. */
if (MPI_Allreduce(MPI_IN_PLACE, gcounts, s->nr_cells, MPI_DOUBLE, MPI_SUM,
@@ -480,17 +480,17 @@ static void accumulate_sizes(struct space *s, int verbose, double *counts) {
mapper_data.counts = counts;
hsize = (double)sizeof(struct part);
mapper_data.size = hsize;
- threadpool_map(&s->e->threadpool, accumulate_sizes_mapper_part, s->parts,
- s->nr_parts, sizeof(struct part), space_splitsize,
+ threadpool_map(&s->e->threadpool, partition_accumulate_sizes_mapper_part,
+ s->parts, s->nr_parts, sizeof(struct part), space_splitsize,
&mapper_data);
}
if (s->nr_sparts > 0) {
ssize = (double)sizeof(struct spart);
mapper_data.size = ssize;
- threadpool_map(&s->e->threadpool, accumulate_sizes_mapper_spart, s->sparts,
- s->nr_sparts, sizeof(struct spart), space_splitsize,
- &mapper_data);
+ threadpool_map(&s->e->threadpool, partition_accumulate_sizes_mapper_spart,
+ s->sparts, s->nr_sparts, sizeof(struct spart),
+ space_splitsize, &mapper_data);
}
/* Merge the counts arrays across all nodes, if needed. Doesn't include any
@@ -1379,8 +1379,8 @@ static void check_weights(struct task *tasks, int nr_tasks,
* @param num_elements the number of data elements to process.
* @param extra_data additional data for the mapper context.
*/
-static void partition_gather_weights(void *map_data, int num_elements,
- void *extra_data) {
+void partition_gather_weights(void *map_data, int num_elements,
+ void *extra_data) {
struct task *tasks = (struct task *)map_data;
struct weights_mapper_data *mydata = (struct weights_mapper_data *)extra_data;