From: Giuseppe Lettieri <g.lettieri@iet.unipi.it>
Date: Sat, 6 Jul 2013 17:00:44 +0000 (+0200)
Subject: Merge branch 'mainstream'
X-Git-Tag: sliver-openvswitch-1.10.90-3~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a12945b3b8cd4d483e5e8f2a1adb6576badf1d4d;hp=-c;p=sliver-openvswitch.git

Merge branch 'mainstream'
---

a12945b3b8cd4d483e5e8f2a1adb6576badf1d4d
diff --combined Makefile.am
index eed5a74d8,08aea0fc1..4c58b93c6
--- a/Makefile.am
+++ b/Makefile.am
@@@ -108,7 -108,6 +108,7 @@@ ro_shell = printf '\043 Generated autom
  
  SUFFIXES += .in
  .in:
 +	@mkdir -p $$(dirname $@)
  	$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \
  	    sed \
  		-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@@ -150,7 -149,7 +150,7 @@@ dist-hook-git: distfile
  	  (cd datapath && $(MAKE) distfiles);				    \
  	  (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) |	    \
  	    sort -u > all-distfiles;					    \
 -	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' |	    \
 +	  (cd $(srcdir) && git ls-files) | grep -vFf $(srcdir)/.non-distfiles |	    \
  	    sort -u > all-gitfiles;					    \
  	  comm -1 -3 all-distfiles all-gitfiles > missing-distfiles;	    \
  	  if test -s missing-distfiles; then				    \
@@@ -211,6 -210,20 +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,5 -273,4 +274,5 @@@ include rhel/automake.m
  include xenserver/automake.mk
  include python/automake.mk
  include python/compat/automake.mk
 +include planetlab/automake.mk
  include tutorial/automake.mk