瀏覽代碼

rename no_auto_profile into no_auto_start_trace to avoid confusing FxT tracing with task profiling

Samuel Thibault 12 年之前
父節點
當前提交
2f54cfb3d1
共有 4 個文件被更改,包括 9 次插入9 次删除
  1. 4 4
      include/starpu.h
  2. 2 2
      src/common/fxt.c
  3. 1 1
      src/common/fxt.h
  4. 2 2
      src/core/workers.c

+ 4 - 4
include/starpu.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009-2012  Université de Bordeaux 1
+ * Copyright (C) 2009-2013  Université de Bordeaux 1
  * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -148,9 +148,9 @@ struct starpu_conf
 	struct starpu_driver *not_launched_drivers;
 	unsigned n_not_launched_drivers;
 
-	/* Indicates whether we start the profiling automatically
-	   or we leave the appl start it if it wants to */
-	unsigned no_auto_profile;
+	/* Indicates whether we start the tracing automatically
+	   or we leave the appl start it when it wants to */
+	unsigned no_auto_start_trace;
 };
 
 /* Initialize a starpu_conf structure with default values. */

+ 2 - 2
src/common/fxt.c

@@ -107,7 +107,7 @@ void starpu_start_fxt_profiling()
 	fut_keychange(FUT_ENABLE, FUT_KEYMASKALL, threadid);
 }
 
-void _starpu_init_fxt_profiling(unsigned no_auto_profile)
+void _starpu_init_fxt_profiling(unsigned no_auto_start_trace)
 {
 	unsigned threadid;
 
@@ -134,7 +134,7 @@ void _starpu_init_fxt_profiling(unsigned no_auto_profile)
 
 	atexit(_starpu_stop_fxt_profiling);
 
-	unsigned int key_mask = no_auto_profile ? 0 : FUT_KEYMASKALL;
+	unsigned int key_mask = no_auto_start_trace ? 0 : FUT_KEYMASKALL;
 
 	if (fut_setup(_STARPU_PROF_BUFFER_SIZE, key_mask, threadid) < 0)
 	{

+ 1 - 1
src/common/fxt.h

@@ -122,7 +122,7 @@ void fut_set_filename(char *filename);
 long _starpu_gettid(void);
 
 /* Initialize the FxT library. */
-void _starpu_init_fxt_profiling(unsigned no_auto_profile);
+void _starpu_init_fxt_profiling(unsigned no_auto_start_trace);
 
 /* Stop the FxT library, and generate the trace file. */
 void _starpu_stop_fxt_profiling(void);

+ 2 - 2
src/core/workers.c

@@ -677,7 +677,7 @@ int starpu_conf_init(struct starpu_conf *conf)
 		conf->disable_asynchronous_opencl_copy = 0;
 #endif
 
-	conf->no_auto_profile = 0;
+	conf->no_auto_start_trace = 0;
 	return 0;
 }
 
@@ -804,7 +804,7 @@ int starpu_init(struct starpu_conf *user_conf)
 	_starpu_init_tags();
 
 #ifdef STARPU_USE_FXT
-	_starpu_init_fxt_profiling(config.conf->no_auto_profile);
+	_starpu_init_fxt_profiling(config.conf->no_auto_start_trace);
 #endif
 
 	_starpu_open_debug_logfile();