merge fixes

Makefile.am

@@ -38,14 +38,14 @@ if BUILD_GCC_PLUGIN
 SUBDIRS += gcc-plugin
 endif
 
-if BUILD_SCHED_CTX_HYPERVISOR
-SUBDIRS += sched_ctx_hypervisor
-endif
-
 if BUILD_STARPUFFT
 SUBDIRS += starpufft
 endif
 
+if BUILD_SCHED_CTX_HYPERVISOR
+SUBDIRS += sched_ctx_hypervisor
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libstarpu.pc starpu-1.0.pc
 

examples/cholesky/cholesky_implicit.c

@@ -300,6 +300,7 @@ static void execute_cholesky(unsigned size, unsigned nblocks)
 	        }
 		free(test_mat);
 	}
+	starpu_free(mat);
 }
 
 int main(int argc, char **argv)
@@ -333,7 +334,6 @@ int main(int argc, char **argv)
 		execute_cholesky(size, nblocks);
 
 	starpu_helper_cublas_shutdown();
-	starpu_free(mat);
 	starpu_shutdown();
 
 	return 0;

sched_ctx_hypervisor/include/sched_ctx_hypervisor.h

@@ -78,7 +78,7 @@ struct hypervisor_policy {
 	void (*handle_pushed_task)(unsigned sched_ctx, int worker);
 	void (*handle_poped_task)(unsigned sched_ctx, int worker);
 	void (*handle_idle_end)(unsigned sched_ctx, int worker);
-	void (*handle_post_exec_hook)(unsigned sched_ctx, struct starpu_htbl32_node_s* resize_requests, int task_tag);
+	void (*handle_post_exec_hook)(unsigned sched_ctx, struct starpu_htbl32_node* resize_requests, int task_tag);
 };
 
 

sched_ctx_hypervisor/src/Makefile.am

@@ -15,7 +15,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 
 AM_CFLAGS = -Wall $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS)
-LIBS = $(top_builddir)/src/libstarpu.la
+LIBS = $(top_builddir)/src/libstarpu-1.0.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/include/ -I$(top_builddir)/include/ -I$(top_builddir)/src/ -I$(top_srcdir)/sched_ctx_hypervisor/include/
 
@@ -23,7 +23,7 @@ AM_LDFLAGS = $(STARPU_CUDA_LDFLAGS) $(STARPU_OPENCL_LDFLAGS)
 
 lib_LTLIBRARIES = libsched_ctx_hypervisor.la
 
-libsched_ctx_hypervisor_la_LIBADD = $(top_builddir)/src/libstarpu.la
+libsched_ctx_hypervisor_la_LIBADD = $(top_builddir)/src/libstarpu-1.0.la
 
 libsched_ctx_hypervisor_la_SOURCES = 			\
 	sched_ctx_hypervisor.c				\

sched_ctx_hypervisor/src/sched_ctx_hypervisor.c

@@ -182,8 +182,8 @@ void sched_ctx_hypervisor_shutdown(void)
 /* the hypervisor is in charge only of the contexts registered to it*/
 void sched_ctx_hypervisor_register_ctx(unsigned sched_ctx, double total_flops)
 {	
-	hypervisor.configurations[sched_ctx] = (struct starpu_htbl32_node_s*)malloc(sizeof(struct starpu_htbl32_node_s));
-	hypervisor.resize_requests[sched_ctx] = (struct starpu_htbl32_node_s*)malloc(sizeof(struct starpu_htbl32_node_s));
+	hypervisor.configurations[sched_ctx] = (struct starpu_htbl32_node*)malloc(sizeof(struct starpu_htbl32_node));
+	hypervisor.resize_requests[sched_ctx] = (struct starpu_htbl32_node*)malloc(sizeof(struct starpu_htbl32_node));
 
 	_add_config(sched_ctx);
 	hypervisor.sched_ctx_w[sched_ctx].sched_ctx = sched_ctx;
@@ -459,7 +459,7 @@ static void notify_post_exec_hook(unsigned sched_ctx, int task_tag)
 
 		if(hypervisor.resize[sched_ctx])
 		{
-			struct starpu_htbl32_node_s* resize_requests = hypervisor.resize_requests[sched_ctx];
+			struct starpu_htbl32_node* resize_requests = hypervisor.resize_requests[sched_ctx];
 
 			if(hypervisor.policy.handle_post_exec_hook)
 				hypervisor.policy.handle_post_exec_hook(sched_ctx, resize_requests, task_tag);

sched_ctx_hypervisor/src/sched_ctx_hypervisor_intern.h

@@ -8,8 +8,8 @@ struct sched_ctx_hypervisor {
 	unsigned resize[STARPU_NMAX_SCHED_CTXS];
 	int min_tasks;
 	struct hypervisor_policy policy;
-	struct starpu_htbl32_node_s *configurations[STARPU_NMAX_SCHED_CTXS];
-	struct starpu_htbl32_node_s *resize_requests[STARPU_NMAX_SCHED_CTXS];
+	struct starpu_htbl32_node *configurations[STARPU_NMAX_SCHED_CTXS];
+	struct starpu_htbl32_node *resize_requests[STARPU_NMAX_SCHED_CTXS];
 };
 
 struct sched_ctx_hypervisor_adjustment {