Browse Source

disable racy watchdog with TSAN, and update TSAN suppressions

Samuel Thibault 10 years ago
parent
commit
795add2d98
2 changed files with 6 additions and 0 deletions
  1. 2 0
      src/core/sched_ctx.c
  2. 4 0
      tools/tsan/starpu.suppr

+ 2 - 0
src/core/sched_ctx.c

@@ -1200,8 +1200,10 @@ int _starpu_wait_for_n_submitted_tasks_of_sched_ctx(unsigned sched_ctx_id, unsig
 void _starpu_decrement_nsubmitted_tasks_of_sched_ctx(unsigned sched_ctx_id)
 {
 	struct _starpu_machine_config *config = (struct _starpu_machine_config *)_starpu_get_machine_config();
+#ifndef STARPU_SANITIZE_THREAD
 	if (!config->watchdog_ok)
 		config->watchdog_ok = 1;
+#endif
 
 	struct _starpu_sched_ctx *sched_ctx = _starpu_get_sched_ctx_struct(sched_ctx_id);
 	int reached = _starpu_barrier_counter_get_reached_start(&sched_ctx->tasks_barrier);

+ 4 - 0
tools/tsan/starpu.suppr

@@ -23,6 +23,7 @@ race:^mc_cache_size$
 race:^mc_nb$
 race:^mc_clean_nb$
 race:^alloc_cnt$
+race:^used_size$
 race:^data_requests_npending$
 race:^_starpu_profiling$
 race:^_starpu_history_based_job_expected_perf$
@@ -30,6 +31,9 @@ race:^compute_ntasks_end$
 race:^compute_expected_end$
 race:^compute_all_performance_predictions$
 
+# There is actually no race with busy_count, see comment
+race:_starpu_data_unregister
+
 # ignore other libraries' races
 called_from_lib:^libmpi.so$
 called_from_lib:^libhwloc*.so$