Forráskód Böngészése

Revert "optionally output dependence labels in tasks.rec"

This reverts commit a9d4a636bf266aebcd4304b2629e5928dbbd25b6.
Olivier Aumage 5 éve
szülő
commit
d66627a402
1 módosított fájl, 2 hozzáadás és 22 törlés
  1. 2 22
      src/debug/traces/starpu_fxt.c

+ 2 - 22
src/debug/traces/starpu_fxt.c

@@ -115,7 +115,6 @@ struct task_info
 	char *parameters;
 	unsigned int ndeps;
 	unsigned long *dependencies;
-	char **deplabels;
 	unsigned long ndata;
 	struct data_parameter_info *data;
 	int mpi_rank;
@@ -154,7 +153,6 @@ static struct task_info *get_task(unsigned long job_id, int mpi_rank)
 		task->parameters = NULL;
 		task->ndeps = 0;
 		task->dependencies = NULL;
-		task->deplabels = NULL;
 		task->ndata = 0;
 		task->data = NULL;
 		task->mpi_rank = mpi_rank;
@@ -209,21 +207,9 @@ static void task_dump(struct task_info *task, struct starpu_fxt_options *options
 	{
 		fprintf(tasks_file, "DependsOn:");
 		for (i = 0; i < task->ndeps; i++)
-		{
-			char *name = task->deplabels[i];
-			if (name)
-			{
-				fprintf(tasks_file, " %s/%s%lu", name, prefix, task->dependencies[i]);
-				free(name);
-			}
-			else
-			{
-				fprintf(tasks_file, " %s%lu", prefix, task->dependencies[i]);
-			}
-		}
+			fprintf(tasks_file, " %s%lu", prefix, task->dependencies[i]);
 		fprintf(tasks_file, "\n");
 		free(task->dependencies);
-		free(task->deplabels);
 	}
 	fprintf(tasks_file, "Tag: %"PRIx64"\n", task->tag);
 	if (task->workerid >= 0)
@@ -2754,14 +2740,8 @@ static void handle_task_deps(struct fxt_ev_64 *ev, struct starpu_fxt_options *op
 	if (alloc)
 	{
 		_STARPU_REALLOC(task->dependencies, sizeof(*task->dependencies) * alloc);
-		_STARPU_REALLOC(task->deplabels, sizeof(*task->deplabels) * alloc);
 	}
-	task->dependencies[task->ndeps] = dep_prev;
-	if (options->label_deps)
-		task->deplabels[task->ndeps] = name?strdup(name):NULL;
-	else
-		task->deplabels[task->ndeps] = NULL;
-	task->ndeps++;
+	task->dependencies[task->ndeps++] = dep_prev;
 
 	/* There is a dependency between both job id : dep_prev -> dep_succ */
 	if (show_task(task, options))