Explorar o código

backport r14795 from trunk: add missing suppr file

Samuel Thibault %!s(int64=10) %!d(string=hai) anos
pai
achega
1ed21aa857
Modificáronse 2 ficheiros con 2 adicións e 11 borrados
  1. 1 11
      src/core/dependencies/data_concurrency.c
  2. 1 0
      tools/Makefile.am

+ 1 - 11
src/core/dependencies/data_concurrency.c

@@ -82,25 +82,15 @@ static struct _starpu_data_requester *may_unlock_data_req_list_head(starpu_data_
 		return _starpu_data_requester_list_pop_front(req_list);
 
 	/* Already writing to it, do not let another write access through */
-	// WIP_COMMUTE Was
-	// if (handle->current_mode == STARPU_W)
-	//	return NULL;
-	// WIP_COMMUTE Begin
 	if (handle->current_mode & STARPU_W)
 		return NULL;
-	// WIP_COMMUTE End
 
 	/* data->current_mode == STARPU_R, so we can process more readers */
 	struct _starpu_data_requester *r = _starpu_data_requester_list_front(req_list);
 
 	enum starpu_data_access_mode r_mode = r->mode;
-	// WIP_COMMUTE Was
-	// if (r_mode == STARPU_RW)
-	//	r_mode = STARPU_W;
-	// WIP_COMMUTE Begin
-	if (r_mode & STARPU_RW)
+	if ((r_mode & STARPU_RW) == STARPU_RW)
 		r_mode &= ~STARPU_R;
-	// WIP_COMMUTE End
 
 	/* If this is a STARPU_R, STARPU_SCRATCH or STARPU_REDUX type of
 	 * access, we only proceed if the current mode is the same as the

+ 1 - 0
tools/Makefile.am

@@ -79,6 +79,7 @@ EXTRA_DIST =				\
 	dev/rename.sed			\
 	dev/rename.sh			\
 	perfmodels/README		\
+	valgrind/libc.suppr		\
 	valgrind/hwloc.suppr		\
 	valgrind/libnuma.suppr		\
 	valgrind/openmpi.suppr		\