Parcourir la source

fix build with enable-debug

Samuel Thibault il y a 8 ans
Parent
commit
387e8b0789
2 fichiers modifiés avec 12 ajouts et 5 suppressions
  1. 4 4
      src/core/jobs.c
  2. 8 1
      src/core/jobs.h

+ 4 - 4
src/core/jobs.c

@@ -38,7 +38,7 @@ static int njobs, maxnjobs;
 
 #ifdef STARPU_DEBUG
 /* List of all jobs, for debugging */
-static struct _starpu_job_list all_jobs_list;
+static struct _starpu_job_multilist_all_submitted all_jobs_list;
 static starpu_pthread_mutex_t all_jobs_list_mutex = STARPU_PTHREAD_MUTEX_INITIALIZER;
 #endif
 
@@ -46,7 +46,7 @@ void _starpu_job_init(void)
 {
 	max_memory_use = starpu_get_env_number_default("STARPU_MAX_MEMORY_USE", 0);
 #ifdef STARPU_DEBUG
-	_starpu_job_list_init(&all_jobs_list);
+	_starpu_job_multilist_init_all_submitted(&all_jobs_list);
 #endif
 }
 
@@ -255,7 +255,7 @@ void _starpu_handle_job_submission(struct _starpu_job *j)
 
 #ifdef STARPU_DEBUG
 	STARPU_PTHREAD_MUTEX_LOCK(&all_jobs_list_mutex);
-	_starpu_job_list_push_back(&all_jobs_list, j, all_submitted);
+	_starpu_job_multilist_push_back_all_submitted(&all_jobs_list, j);
 	STARPU_PTHREAD_MUTEX_UNLOCK(&all_jobs_list_mutex);
 #endif
 }
@@ -275,7 +275,7 @@ void _starpu_handle_job_termination(struct _starpu_job *j)
 
 #ifdef STARPU_DEBUG
 	STARPU_PTHREAD_MUTEX_LOCK(&all_jobs_list_mutex);
-	_starpu_job_list_erase(&all_jobs_list, j, all_submitted);
+	_starpu_job_multilist_erase_all_submitted(&all_jobs_list, j);
 	STARPU_PTHREAD_MUTEX_UNLOCK(&all_jobs_list_mutex);
 #endif
 

+ 8 - 1
src/core/jobs.h

@@ -64,6 +64,9 @@ struct _starpu_data_descr
 	int node;
 };
 
+#ifdef STARPU_DEBUG
+MULTILIST_CREATE_TYPE(_starpu_job, all_submitted)
+#endif
 /* A job is the internal representation of a task. */
 struct _starpu_job {
 
@@ -192,10 +195,14 @@ struct _starpu_job {
 
 #ifdef STARPU_DEBUG
 	/* Linked-list of all jobs, for debugging */
-	struct _starpu_job_list all_submitted;
+	struct _starpu_job_multilist_all_submitted all_submitted;
 #endif
 };
 
+#ifdef STARPU_DEBUG
+MULTILIST_CREATE_INLINES(struct _starpu_job, _starpu_job, all_submitted)
+#endif
+
 void _starpu_job_init(void);
 void _starpu_job_fini(void);