X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=32e85d1e6246fa7aa2fe9576bedb365f6d0559c4;hb=cc36576070df622d0fc7a6e26ce01027e12b5b59;hp=5dce7aa81b4c5989a4079c84e461a8785851b0f6;hpb=67680b012be30d9c26eab999b83b08c6eb32dbd2;p=sliver-openvswitch.git

diff --git a/Makefile.am b/Makefile.am
index 5dce7aa81..32e85d1e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -55,6 +55,7 @@ EXTRA_DIST = \
 	NOTICE \
 	OPENFLOW-1.1+ \
 	PORTING \
+	README-OFTest \
 	README-gcov \
 	README-lisp \
 	REPORTING-BUGS \
@@ -185,24 +186,24 @@ config-h-check:
 	fi
 .PHONY: config-h-check
 
-# Check that "struct vlog_ratelimit" is always declared "static".
-ALL_LOCAL += rate-limit-check
-rate-limit-check:
+# Check that certain data structures are always declared "static".
+ALL_LOCAL += static-check
+static-check:
 	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
-	    git --no-pager grep -n -E '^[ 	]+struct vlog_rate_limit.*=' $(srcdir); \
+	    git --no-pager grep -n -E '^[ 	]+(struct vlog_rate_limit|pthread_once_t|struct ovsthread_once).*=' $(srcdir); \
          then \
 	    echo "See above for list of violations of the rule that "; \
-	    echo "'struct vlog_rate_limit' must always be 'static'"; \
+	    echo "certain data structures must always be 'static'"; \
 	    exit 1; \
 	 fi
-.PHONY: rate-limit-check
+.PHONY: static-check
 
 # Check that assert.h is not used outside a whitelist of files.
 ALL_LOCAL += check-assert-h-usage
 check-assert-h-usage:
 	@if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \
 	    (cd $(srcdir) && git --no-pager grep -l -E '[<]assert.h[>]') | \
-	    $(EGREP) -v '^lib/(sflow_receiver|vlog|worker).c$$|^tests/'; \
+	    $(EGREP) -v '^lib/(sflow_receiver|vlog).c$$|^tests/'; \
          then \
 	    echo "Files listed above unexpectedly #include <""assert.h"">."; \
 	    echo "Please use ovs_assert (from util.h) instead of assert."; \
@@ -210,6 +211,20 @@ check-assert-h-usage:
 	 fi
 .PHONY: check-assert-h-usage
 
+ALL_LOCAL += thread-safety-check
+thread-safety-check:
+	@if test -e '$(srcdir)'/.git && (git --version) >/dev/null 2>&1 && \
+	   grep -n -f '$(srcdir)'/build-aux/thread-safety-blacklist \
+	       `git ls-files '$(srcdir)' | grep '\.[ch]$$' \
+                | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` \
+	       | $(EGREP) -v ':[ 	]*/?\*'; \
+	then \
+	    echo "See above for list of calls to functions that are"; \
+	    echo "blacklisted due to thread safety issues"; \
+	    exit 1; \
+	fi
+EXTRA_DIST += build-aux/thread-safety-blacklist
+
 if HAVE_GROFF
 ALL_LOCAL += manpage-check
 manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS)
@@ -260,3 +275,4 @@ include xenserver/automake.mk
 include python/automake.mk
 include python/compat/automake.mk
 include planetlab/automake.mk
+include tutorial/automake.mk