Bläddra i källkod

fix paje output with contexts and codelet details

Terry Cojean 9 år sedan
förälder
incheckning
c0f83d9284
2 ändrade filer med 4 tillägg och 3 borttagningar
  1. 3 2
      src/debug/traces/starpu_fxt.c
  2. 1 1
      src/util/starpu_clusters_create.h

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

@@ -1152,6 +1152,7 @@ static void handle_start_codelet_body(struct fxt_ev_64 *ev, struct starpu_fxt_op
 		unsigned sched_ctx = ev->param[1];
 
 		worker_set_state(start_codelet_time, prefix, ev->param[2], name);
+		printf("ev->param[2]: %ld\n", ev->param[2]);
 		if (trace_file)
 			recfmt_worker_set_state(start_codelet_time, ev->param[2], name, "Task");
 		if (sched_ctx != 0)
@@ -1250,10 +1251,10 @@ static void handle_codelet_details(struct fxt_ev_64 *ev, struct starpu_fxt_optio
 			char container[STARPU_POTI_STR_LEN];
 			char ctx[6];
 			snprintf(ctx, sizeof(ctx), "Ctx%d", sched_ctx);
-			worker_container_alias(container, STARPU_POTI_STR_LEN, prefix, ev->param[5]);
+			worker_container_alias(container, STARPU_POTI_STR_LEN, prefix, worker);
 			poti_SetState(last_codelet_start[worker], container, ctx, _starpu_last_codelet_symbol[worker]);
 #else
-			fprintf(out_paje_file, "20	%.9f	%sw%"PRIu64"	Ctx%d	%s	%lu	%s	%08lx	%016llx	%lu\n", last_codelet_start[worker], prefix, ev->param[2], sched_ctx, _starpu_last_codelet_symbol[worker], (unsigned long) ev->param[2], parameters, (unsigned long) ev->param[3], (unsigned long long) ev->param[4], job_id);
+			fprintf(out_paje_file, "20	%.9f	%sw%d	Ctx%u	%s	%ld	%s	%08lx	%016lx	%ld\n", last_codelet_start[worker], prefix, worker, sched_ctx, _starpu_last_codelet_symbol[worker], ev->param[2], parameters,  ev->param[3], ev->param[4], job_id);
 #endif
 		}
 #endif /* STARPU_ENABLE_PAJE_CODELET_DETAILS */

+ 1 - 1
src/util/starpu_clusters_create.h

@@ -106,7 +106,7 @@ static struct starpu_codelet _starpu_cluster_bind_cl=
 {
 		.cpu_funcs = {_starpu_cluster_noop},
 		.nbuffers = 0,
-		.name = "cluster internal runtime init"
+		.name = "cluster_internal_runtime_init"
 };