Browse Source

Drop unused field

Samuel Thibault 10 years ago
parent
commit
5d7facd505
4 changed files with 5 additions and 18 deletions
  1. 5 8
      src/core/simgrid.c
  2. 0 8
      src/core/workers.c
  3. 0 1
      src/core/workers.h
  4. 0 1
      src/drivers/mp_common/sink_common.c

+ 5 - 8
src/core/simgrid.c

@@ -396,7 +396,7 @@ LIST_TYPE(transfer,
 	unsigned nwait;
 	unsigned nwait;
 )
 )
 
 
-struct transfer_list *pending;
+struct transfer_list pending;
 
 
 /* Tell for two transfers whether they should be handled in sequence */
 /* Tell for two transfers whether they should be handled in sequence */
 static int transfers_are_sequential(struct transfer *new_transfer, struct transfer *old_transfer)
 static int transfers_are_sequential(struct transfer *new_transfer, struct transfer *old_transfer)
@@ -482,7 +482,7 @@ static int transfer_execute(int argc STARPU_ATTRIBUTE_UNUSED, char *argv[] STARP
 	}
 	}
 
 
 	free(transfer->wake);
 	free(transfer->wake);
-	transfer_list_erase(pending, transfer);
+	transfer_list_erase(&pending, transfer);
 	transfer_delete(transfer);
 	transfer_delete(transfer);
 	return 0;
 	return 0;
 }
 }
@@ -492,11 +492,8 @@ static void transfer_submit(struct transfer *transfer)
 {
 {
 	struct transfer *old;
 	struct transfer *old;
 
 
-	if (!pending)
-		pending = transfer_list_new();
-
-	for (old  = transfer_list_begin(pending);
-	     old != transfer_list_end(pending);
+	for (old  = transfer_list_begin(&pending);
+	     old != transfer_list_end(&pending);
 	     old  = transfer_list_next(old))
 	     old  = transfer_list_next(old))
 	{
 	{
 		if (transfers_are_sequential(transfer, old))
 		if (transfers_are_sequential(transfer, old))
@@ -513,7 +510,7 @@ static void transfer_submit(struct transfer *transfer)
 		}
 		}
 	}
 	}
 
 
-	transfer_list_push_front(pending, transfer);
+	transfer_list_push_front(&pending, transfer);
 
 
 	if (!transfer->nwait)
 	if (!transfer->nwait)
 	{
 	{

+ 0 - 8
src/core/workers.c

@@ -526,14 +526,6 @@ static void _starpu_worker_init(struct _starpu_worker *workerarg, struct _starpu
 	workerarg->pipeline_length = 0;
 	workerarg->pipeline_length = 0;
 	workerarg->pipeline_stuck = 0;
 	workerarg->pipeline_stuck = 0;
 	workerarg->set = NULL;
 	workerarg->set = NULL;
-
-	/* if some codelet's termination cannot be handled directly :
-	 * for instance in the Gordon driver, Gordon tasks' callbacks
-	 * may be executed by another thread than that of the Gordon
-	 * driver so that we cannot call the push_codelet_output method
-	 * directly */
-	workerarg->terminated_jobs = _starpu_job_list_new();
-
 	workerarg->worker_is_running = 0;
 	workerarg->worker_is_running = 0;
 	workerarg->worker_is_initialized = 0;
 	workerarg->worker_is_initialized = 0;
 	workerarg->status = STATUS_INITIALIZING;
 	workerarg->status = STATUS_INITIALIZING;

+ 0 - 1
src/core/workers.h

@@ -86,7 +86,6 @@ LIST_TYPE(_starpu_worker,
 	unsigned char pipeline_length; /* number of tasks to be put in the pipeline */
 	unsigned char pipeline_length; /* number of tasks to be put in the pipeline */
 	unsigned char pipeline_stuck; /* whether a task prevents us from pipelining */
 	unsigned char pipeline_stuck; /* whether a task prevents us from pipelining */
 	struct _starpu_worker_set *set; /* in case this worker belongs to a set */
 	struct _starpu_worker_set *set; /* in case this worker belongs to a set */
-	struct _starpu_job_list *terminated_jobs; /* list of pending jobs which were executed */
 	unsigned worker_is_running;
 	unsigned worker_is_running;
 	unsigned worker_is_initialized;
 	unsigned worker_is_initialized;
 	enum _starpu_worker_status status; /* what is the worker doing now ? (eg. CALLBACK) */
 	enum _starpu_worker_status status; /* what is the worker doing now ? (eg. CALLBACK) */

+ 0 - 1
src/drivers/mp_common/sink_common.c

@@ -200,7 +200,6 @@ static void _starpu_sink_common_recv_workers(struct _starpu_mp_node * node, void
 
 
 		workers[i].current_task = NULL;
 		workers[i].current_task = NULL;
 		workers[i].set = NULL;
 		workers[i].set = NULL;
-		workers[i].terminated_jobs = NULL;
 	}
 	}
 
 
 	/* Retrieve combined workers */
 	/* Retrieve combined workers */