Fixed compilation issues

src/Makefile.am

@@ -49,7 +49,7 @@ include_HEADERS = space.h runner.h queue.h task.h lock.h cell.h part.h const.h \
     gravity_softened_derivatives.h vector_power.h collectgroup.h hydro_space.h sort_part.h \
     chemistry.h chemistry_io.h chemistry_struct.h cosmology.h restart.h space_getsid.h utilities.h \
     mesh_gravity.h cbrt.h velociraptor_interface.h swift_velociraptor_part.h outputlist.h \
-    logger_io.h
+    logger_io.h numa_helper.h
 
 # Common source files
 AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c engine_maketasks.c \
@@ -62,7 +62,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c engine_maketasks.c
     part_type.c xmf.c gravity_properties.c gravity.c \
     collectgroup.c hydro_space.c equation_of_state.c \
     chemistry.c cosmology.c restart.c mesh_gravity.c velociraptor_interface.c \
-    outputlist.c velociraptor_dummy.c logger_io.c
+    outputlist.c velociraptor_dummy.c logger_io.c numa_helper.c
 
 # Include files for distribution, not installation.
 nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h inline.h kernel_hydro.h kernel_gravity.h \

src/numa_helper.c

@@ -54,7 +54,7 @@
  * @param node The numa node to move to.
  * @param verbose Are we talkative/do we check things.
  */
-int swiftnuma_cell_move_hydro_parts(struct cell *c, int32_t node, int32_t verbose){
+void swiftnuma_cell_move_hydro_parts(struct cell *c, int32_t node, int32_t verbose){
 #ifdef HAVE_LIBNUMA
   struct part *start_part = c->hydro.parts;
   struct part *end_part = &c->hydro.parts[c->hydro.count];
@@ -66,7 +66,7 @@ int swiftnuma_cell_move_hydro_parts(struct cell *c, int32_t node, int32_t verbos
     start_page += page_size;
   }
   if( ((uintptr_t)(((uint8_t*)(end_part+1)) - last_page)) <= (page_size/2) ){
-    end_page -= page_size;
+    last_page -= page_size;
   }
   uintptr_t nr_pages = ((uintptr_t)(last_page - start_page)) / page_size;
   if(nr_pages > 0){

src/numa_helper.h

@@ -22,6 +22,6 @@
 #include <stdint.h>
 #include "cell.h"
 
-int swiftnuma_cell_move_hydro_parts(struct cell *c, int32_t node, int32_t verbose);
+void swiftnuma_cell_move_hydro_parts(struct cell *c, int32_t node, int32_t verbose);
 
 #endif

src/runner.c

@@ -2503,7 +2503,6 @@ void *runner_main(void *data) {
       DRAM_hits.exclude_hv = 1;
       DRAM_miss.exclude_hv = 1;
       ins_ret.exclude_hv = 1;
-      printf("%i %i\n", r->id, r->cpuid);
       r->local_DRAM_hits_handle = swift_perf_event_open(&DRAM_hits,0,r->cpuid,-1,0);
       r->local_DRAM_miss_handle = swift_perf_event_open(&DRAM_miss,0,r->cpuid,-1,0);
       r->instructions_retired_handle = swift_perf_event_open(&ins_ret,0,r->cpuid,-1,0);

src/swift.h

@@ -50,6 +50,7 @@
 #include "map.h"
 #include "mesh_gravity.h"
 #include "multipole.h"
+#include "numa_helper.h"
 #include "outputlist.h"
 #include "parallel_io.h"
 #include "parser.h"