From 73edb43f64394e3e12c43b296601d5d7b016004a Mon Sep 17 00:00:00 2001 From: Aleksandr Mogylchenko Date: Thu, 5 Mar 2015 12:35:21 +0200 Subject: [PATCH] Maintenance release 0.80.8 from upstream Since we ship custom version of ceph anyway, we should install all available maintenance releases. Sources: http://gitbuilder.ceph.com/ceph-deb-trusty-x86_64-basic/ref/v0.80.8/ Change-Id: I28d084be8cc0e326123bd18416346fc0ab94f15d --- ceph/Makefile.in | 319 +- ceph/aclocal.m4 | 742 ++-- ceph/ceph.spec | 65 +- ceph/ceph.spec.in | 63 +- ceph/compile | 99 +- ceph/config.guess | 184 +- ceph/config.sub | 106 +- ceph/configure | 934 +++-- ceph/configure.ac | 2 +- ceph/depcomp | 487 ++- ceph/install-sh | 14 +- ceph/ltmain.sh | 4 +- ceph/man/Makefile.in | 129 +- ceph/missing | 414 +-- ceph/src/.git_version | 4 +- ceph/src/Makefile.am | 1 + ceph/src/Makefile.in | 3150 +++++++++-------- ceph/src/acconfig.h.in | 3 - ceph/src/ceph-crush-location | 8 +- ceph/src/ceph-disk | 114 +- ceph/src/ceph.in | 6 +- ceph/src/ceph_mon.cc | 20 + ceph/src/civetweb/civetweb.h | 24 +- ceph/src/civetweb/include/civetweb.h | 24 +- ceph/src/civetweb/src/civetweb.c | 771 ++-- ceph/src/client/Client.cc | 3 +- ceph/src/common/Thread.cc | 3 +- ceph/src/common/Thread.h | 1 + ceph/src/common/TrackedOp.cc | 2 +- ceph/src/common/WorkQueue.cc | 4 + ceph/src/common/ceph_crypto.h | 8 +- ceph/src/common/config.cc | 4 +- ceph/src/common/config_opts.h | 5 + ceph/src/common/crc32c_intel_fast_asm.S | 2 + ceph/src/common/crc32c_intel_fast_zero_asm.S | 2 + ceph/src/common/hobject.cc | 4 +- ceph/src/common/io_priority.cc | 4 +- ceph/src/common/util.cc | 22 + ceph/src/crush/CrushWrapper.cc | 27 +- ceph/src/crush/CrushWrapper.h | 6 +- ceph/src/crush/builder.c | 24 +- ceph/src/crush/crush.h | 2 + ceph/src/crush/mapper.c | 16 +- ceph/src/gtest/Makefile.in | 932 +++-- ceph/src/gtest/aclocal.m4 | 723 ++-- ceph/src/gtest/build-aux/compile | 347 ++ ceph/src/gtest/build-aux/test-driver | 139 + ceph/src/gtest/configure | 573 +-- ceph/src/include/ceph_features.h | 2 + ceph/src/include/util.h | 24 + ceph/src/init-radosgw.sysv | 2 +- ceph/src/java/Makefile.in | 101 +- ceph/src/librbd/internal.cc | 8 +- ceph/src/mds/Dumper.cc | 23 +- ceph/src/mds/Locker.cc | 20 +- ceph/src/mds/MDCache.cc | 8 +- ceph/src/mds/Server.cc | 5 +- ceph/src/mon/DataHealthService.cc | 39 +- ceph/src/mon/Monitor.cc | 27 +- ceph/src/mon/MonitorDBStore.h | 27 +- ceph/src/mon/OSDMonitor.cc | 91 +- ceph/src/mon/PGMap.cc | 37 +- ceph/src/mon/PGMonitor.cc | 1 + ceph/src/mon/Paxos.cc | 169 +- ceph/src/mon/Paxos.h | 44 + ceph/src/mon/mon_types.h | 45 +- ceph/src/ocf/Makefile.in | 103 +- ceph/src/os/FileJournal.cc | 62 +- ceph/src/osd/ECBackend.cc | 50 +- ceph/src/osd/OSD.cc | 108 +- ceph/src/osd/OSD.h | 2 + ceph/src/osd/OSDMap.h | 12 + ceph/src/osd/PG.cc | 106 +- ceph/src/osd/PG.h | 19 +- ceph/src/osd/ReplicatedPG.cc | 108 +- ceph/src/osd/ReplicatedPG.h | 6 +- ceph/src/osd/Watch.h | 7 +- ceph/src/osd/osd_types.cc | 14 +- ceph/src/osdc/ObjectCacher.cc | 28 +- ceph/src/osdc/ObjectCacher.h | 1 + ceph/src/osdc/Objecter.cc | 9 +- ceph/src/pybind/rados.py | 8 +- ceph/src/rgw/Makefile.am | 2 + ceph/src/rgw/rgw_civetweb_log.cc | 14 + ceph/src/rgw/rgw_civetweb_log.h | 6 + ceph/src/rgw/rgw_http_client.cc | 52 +- ceph/src/rgw/rgw_main.cc | 13 +- ceph/src/rgw/rgw_op.cc | 10 +- ceph/src/rgw/rgw_rados.cc | 110 +- ceph/src/rgw/rgw_rados.h | 17 +- ceph/src/rgw/rgw_rest_s3.cc | 14 +- ceph/src/rgw/rgw_rest_swift.cc | 3 +- ceph/src/rgw/rgw_swift.cc | 2 + ceph/src/rgw/rgw_user.cc | 11 +- ceph/src/test/Makefile.am | 10 +- .../cli/crushtool/test-map-firstn-indep.t | 14 + .../cli/crushtool/test-map-firstn-indep.txt | 443 +++ ceph/src/test/cli/osdmaptool/test-map-pgs.t | 4 +- ceph/src/test/common/histogram.cc | 113 +- ceph/src/test/common/test_io_priority.cc | 51 + ceph/src/test/erasure-code/Makefile.am | 8 + .../erasure-code/TestErasureCodeJerasure.cc | 30 - .../ceph_erasure_code_non_regression.cc | 325 ++ ceph/src/test/libcephfs/test.cc | 1 + ceph/src/test/librados/tier.cc | 76 + ceph/src/test/mon/mon-test-helpers.sh | 3 +- ceph/test-driver | 139 + debian/changelog | 11 + debian/control | 18 +- ...s-get_obj-returns-wrong-len-if-len-0.patch | 31 - ...-to-identify-whether-object-has-tail.patch | 41 - debian/patches/series | 2 - 112 files changed, 8666 insertions(+), 4764 deletions(-) create mode 100755 ceph/src/gtest/build-aux/compile create mode 100755 ceph/src/gtest/build-aux/test-driver create mode 100644 ceph/src/rgw/rgw_civetweb_log.cc create mode 100644 ceph/src/rgw/rgw_civetweb_log.h create mode 100644 ceph/src/test/cli/crushtool/test-map-firstn-indep.t create mode 100644 ceph/src/test/cli/crushtool/test-map-firstn-indep.txt create mode 100644 ceph/src/test/common/test_io_priority.cc create mode 100644 ceph/src/test/erasure-code/ceph_erasure_code_non_regression.cc create mode 100755 ceph/test-driver delete mode 100644 debian/patches/0001-rgw-RGWRados-get_obj-returns-wrong-len-if-len-0.patch delete mode 100644 debian/patches/0001-rgw-fix-test-to-identify-whether-object-has-tail.patch diff --git a/ceph/Makefile.in b/ceph/Makefile.in index eb16431e..5ee5d298 100644 --- a/ceph/Makefile.in +++ b/ceph/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,11 +79,11 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/ceph.spec.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - ar-lib compile config.guess config.sub depcomp install-sh \ - ltmain.sh missing py-compile +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/ceph.spec.in COPYING ar-lib compile config.guess \ + config.sub install-sh missing py-compile ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_classpath.m4 \ $(top_srcdir)/m4/ac_prog_jar.m4 \ @@ -63,28 +107,61 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/acconfig.h CONFIG_CLEAN_FILES = ceph.spec CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -95,6 +172,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -122,6 +200,7 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -363,22 +442,25 @@ distclean-libtool: -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -393,57 +475,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -459,12 +496,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -476,15 +508,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -493,9 +521,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -531,13 +581,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -566,40 +613,42 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -610,8 +659,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -623,18 +670,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -657,7 +705,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -793,15 +841,14 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local am--refresh check check-am check-local \ - clean clean-generic clean-libtool clean-local ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-libtool distclean-tags \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + am--refresh check check-am check-local clean clean-cscope \ + clean-generic clean-libtool clean-local cscope cscopelist-am \ + ctags ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-libtool distclean-tags \ distcleancheck distdir distuninstallcheck dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-data-local install-dvi install-dvi-am \ @@ -811,7 +858,7 @@ uninstall-am: installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am + tags tags-am uninstall uninstall-am # why is it so hard to make autotools to this? diff --git a/ceph/aclocal.m4 b/ceph/aclocal.m4 index fa0745ae..ed318195 100644 --- a/ceph/aclocal.m4 +++ b/ceph/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,33 +11,31 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,19 +51,17 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_AR([ACT-IF-FAIL]) # ------------------------- # Try to determine the archiver interface, and trigger the ar-lib wrapper @@ -81,7 +76,8 @@ AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) : ${AR=ar} AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], - [am_cv_ar_interface=ar + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([am_ar_try]) @@ -98,7 +94,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], fi rm -f conftest.lib libconftest.a ]) - ]) + AC_LANG_POP([C])]) case $am_cv_ar_interface in ar) @@ -122,14 +118,12 @@ AC_SUBST([AR])dnl # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_PROG_AS # ---------- AC_DEFUN([AM_PROG_AS], @@ -144,17 +138,15 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -173,7 +165,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -199,22 +191,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -233,16 +222,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -252,7 +239,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -265,12 +252,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -278,8 +266,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -319,16 +307,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -337,8 +325,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -346,7 +334,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -394,7 +382,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -404,9 +392,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -421,20 +413,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -447,7 +437,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -459,21 +449,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -491,7 +479,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -501,18 +489,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -525,7 +516,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -554,31 +545,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -589,34 +589,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -638,15 +682,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -660,16 +701,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -685,14 +724,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -710,7 +747,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -735,52 +772,14 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -788,11 +787,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -805,54 +803,22 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -862,7 +828,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -876,14 +842,59 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- @@ -912,7 +923,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -928,10 +939,11 @@ AC_DEFUN([AM_PATH_PYTHON], dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies @@ -980,6 +992,25 @@ AC_DEFUN([AM_PATH_PYTHON], [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" dnl Set up 4 directories: @@ -996,7 +1027,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -1031,7 +1069,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -1079,14 +1124,12 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1100,22 +1143,16 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1126,32 +1163,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1161,31 +1206,50 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -1203,7 +1267,7 @@ else am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -1220,44 +1284,40 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1271,18 +1331,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1292,76 +1350,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/ceph/ceph.spec b/ceph/ceph.spec index 1e9a2a62..30636faf 100644 --- a/ceph/ceph.spec +++ b/ceph/ceph.spec @@ -9,13 +9,16 @@ # common ################################################################################# Name: ceph -Version: 0.80.7 +Version: 0.80.8 Release: 0%{?dist} Summary: User space components of the Ceph file system License: GPL-2.0 Group: System Environment/Base URL: http://ceph.com/ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 +%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} +Patch0: init-ceph.in-fedora.patch +%endif Requires: librbd1 = %{version}-%{release} Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} @@ -24,13 +27,13 @@ Requires: python Requires: python-argparse Requires: python-ceph Requires: python-requests +Requires: python-flask Requires: xfsprogs Requires: cryptsetup Requires: parted Requires: util-linux Requires: hdparm Requires(post): binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libtool @@ -50,14 +53,14 @@ BuildRequires: libblkid-devel >= 2.17 BuildRequires: leveldb-devel > 1.2 BuildRequires: xfsprogs-devel BuildRequires: yasm -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} BuildRequires: snappy-devel %endif ################################################################################# # specific ################################################################################# -%if ! 0%{?rhel} +%if ! 0%{?rhel} || 0%{?fedora} BuildRequires: sharutils %endif @@ -173,8 +176,8 @@ managers such as Pacemaker. Summary: RADOS distributed object store client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} +Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster @@ -187,8 +190,8 @@ Summary: RADOS block device client library Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} +Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librbd1 RBD is a block device striped across multiple distributed objects in @@ -200,8 +203,9 @@ shared library allowing applications to manage these block devices. Summary: Ceph distributed file system client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} +Obsoletes: ceph-libs < %{version}-%{release} +Obsoletes: ceph-libcephfs %endif %description -n libcephfs1 Ceph is a distributed network file system designed to provide excellent @@ -215,7 +219,6 @@ Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} Requires: librbd1 = %{version}-%{release} -Requires: python-flask %if 0%{defined suse_version} %py_requires %endif @@ -264,6 +267,23 @@ BuildRequires: junit4 %description -n cephfs-java This package contains the Java libraries for the Ceph File System. +%package libs-compat +Summary: Meta package to include ceph libraries. +Group: System Environment/Libraries +License: LGPL-2.0 +Obsoletes: ceph-libs +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Provides: ceph-libs + +%description libs-compat +This is a meta package, that pulls in librados2, librbd1 and libcephfs1. It +is included for backwards compatibility with distributions that depend on the +former ceph-libs package, which is now split up into these three subpackages. +Packages still depending on ceph-libs should be fixed to depend on librados2, +librbd1 or libcephfs1 instead. + %if 0%{?opensuse} || 0%{?suse_version} %debug_package %endif @@ -273,6 +293,9 @@ This package contains the Java libraries for the Ceph File System. ################################################################################# %prep %setup -q +%if 0%{?fedora} || 0%{?rhel} || 0%{?centos} +%patch0 -p1 -b .init +%endif %build # Find jni.h @@ -329,7 +352,7 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config # udev rules -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/50-rbd.rules install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules %else @@ -337,13 +360,13 @@ install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rul install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules %endif -%if (0%{?rhel} || 0%{?rhel} < 7) +%if (0%{?rhel} && 0%{?rhel} < 7) install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules %else install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} mv $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/95-ceph-osd.rules mv $RPM_BUILD_ROOT/sbin/mkcephfs $RPM_BUILD_ROOT/usr/sbin/mkcephfs mv $RPM_BUILD_ROOT/sbin/mount.ceph $RPM_BUILD_ROOT/usr/sbin/mount.ceph @@ -404,6 +427,7 @@ fi %{_bindir}/cephfs %{_bindir}/ceph-clsinfo %{_bindir}/ceph-rest-api +%{python_sitelib}/ceph_rest_api.py* %{_bindir}/crushtool %{_bindir}/monmaptool %{_bindir}/osdmaptool @@ -424,7 +448,7 @@ fi %{_sbindir}/ceph-disk-udev %{_sbindir}/ceph-create-keys %{_sbindir}/rcceph -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} %{_sbindir}/mount.ceph %else /sbin/mount.ceph @@ -451,7 +475,7 @@ fi %{_libdir}/ceph/erasure-code/libec_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_test_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_missing_entry_point.so* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} /usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules /usr/lib/udev/rules.d/95-ceph-osd.rules %else @@ -529,7 +553,7 @@ fi %defattr(-,root,root,-) %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} %{_sbindir}/mount.fuse.ceph %else /sbin/mount.fuse.ceph @@ -624,7 +648,7 @@ fi %files -n librbd1 %defattr(-,root,root,-) %{_libdir}/librbd.so.* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} /usr/lib/udev/rules.d/50-rbd.rules %else /lib/udev/rules.d/50-rbd.rules @@ -656,7 +680,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{python_sitelib}/rbd.py* %{python_sitelib}/cephfs.py* %{python_sitelib}/ceph_argparse.py* -%{python_sitelib}/ceph_rest_api.py* ################################################################################# %files -n rest-bench @@ -702,4 +725,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_javadir}/libcephfs.jar %{_javadir}/libcephfs-test.jar +%files libs-compat +# We need an empty %files list for ceph-libs-compat, to tell rpmbuild to actually +# build this meta package. + %changelog diff --git a/ceph/ceph.spec.in b/ceph/ceph.spec.in index 54544540..02b300bd 100644 --- a/ceph/ceph.spec.in +++ b/ceph/ceph.spec.in @@ -16,6 +16,9 @@ License: GPL-2.0 Group: System Environment/Base URL: http://ceph.com/ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 +%if 0%{?fedora} || 0%{?centos} || 0%{?rhel} +Patch0: init-ceph.in-fedora.patch +%endif Requires: librbd1 = %{version}-%{release} Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} @@ -24,13 +27,13 @@ Requires: python Requires: python-argparse Requires: python-ceph Requires: python-requests +Requires: python-flask Requires: xfsprogs Requires: cryptsetup Requires: parted Requires: util-linux Requires: hdparm Requires(post): binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libtool @@ -50,14 +53,14 @@ BuildRequires: libblkid-devel >= 2.17 BuildRequires: leveldb-devel > 1.2 BuildRequires: xfsprogs-devel BuildRequires: yasm -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} BuildRequires: snappy-devel %endif ################################################################################# # specific ################################################################################# -%if ! 0%{?rhel} +%if ! 0%{?rhel} || 0%{?fedora} BuildRequires: sharutils %endif @@ -173,8 +176,8 @@ managers such as Pacemaker. Summary: RADOS distributed object store client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} +Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster @@ -187,8 +190,8 @@ Summary: RADOS block device client library Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} +Obsoletes: ceph-libs < %{version}-%{release} %endif %description -n librbd1 RBD is a block device striped across multiple distributed objects in @@ -200,8 +203,9 @@ shared library allowing applications to manage these block devices. Summary: Ceph distributed file system client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} +Obsoletes: ceph-libs < %{version}-%{release} +Obsoletes: ceph-libcephfs %endif %description -n libcephfs1 Ceph is a distributed network file system designed to provide excellent @@ -215,7 +219,6 @@ Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} Requires: librbd1 = %{version}-%{release} -Requires: python-flask %if 0%{defined suse_version} %py_requires %endif @@ -264,6 +267,23 @@ BuildRequires: junit4 %description -n cephfs-java This package contains the Java libraries for the Ceph File System. +%package libs-compat +Summary: Meta package to include ceph libraries. +Group: System Environment/Libraries +License: LGPL-2.0 +Obsoletes: ceph-libs +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Provides: ceph-libs + +%description libs-compat +This is a meta package, that pulls in librados2, librbd1 and libcephfs1. It +is included for backwards compatibility with distributions that depend on the +former ceph-libs package, which is now split up into these three subpackages. +Packages still depending on ceph-libs should be fixed to depend on librados2, +librbd1 or libcephfs1 instead. + %if 0%{?opensuse} || 0%{?suse_version} %debug_package %endif @@ -273,6 +293,9 @@ This package contains the Java libraries for the Ceph File System. ################################################################################# %prep %setup -q +%if 0%{?fedora} || 0%{?rhel} || 0%{?centos} +%patch0 -p1 -b .init +%endif %build # Find jni.h @@ -329,7 +352,7 @@ chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.fetch_config # udev rules -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/50-rbd.rules install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules %else @@ -337,13 +360,13 @@ install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rul install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules %endif -%if (0%{?rhel} || 0%{?rhel} < 7) +%if (0%{?rhel} && 0%{?rhel} < 7) install -m 0644 -D udev/95-ceph-osd-alt.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules %else install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} mv $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/95-ceph-osd.rules mv $RPM_BUILD_ROOT/sbin/mkcephfs $RPM_BUILD_ROOT/usr/sbin/mkcephfs mv $RPM_BUILD_ROOT/sbin/mount.ceph $RPM_BUILD_ROOT/usr/sbin/mount.ceph @@ -404,6 +427,7 @@ fi %{_bindir}/cephfs %{_bindir}/ceph-clsinfo %{_bindir}/ceph-rest-api +%{python_sitelib}/ceph_rest_api.py* %{_bindir}/crushtool %{_bindir}/monmaptool %{_bindir}/osdmaptool @@ -424,7 +448,7 @@ fi %{_sbindir}/ceph-disk-udev %{_sbindir}/ceph-create-keys %{_sbindir}/rcceph -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} %{_sbindir}/mount.ceph %else /sbin/mount.ceph @@ -451,7 +475,7 @@ fi %{_libdir}/ceph/erasure-code/libec_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_test_jerasure*.so* %{_libdir}/ceph/erasure-code/libec_missing_entry_point.so* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} /usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules /usr/lib/udev/rules.d/95-ceph-osd.rules %else @@ -529,7 +553,7 @@ fi %defattr(-,root,root,-) %{_bindir}/ceph-fuse %{_mandir}/man8/ceph-fuse.8* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} %{_sbindir}/mount.fuse.ceph %else /sbin/mount.fuse.ceph @@ -624,7 +648,7 @@ fi %files -n librbd1 %defattr(-,root,root,-) %{_libdir}/librbd.so.* -%if 0%{?rhel} >= 7 +%if 0%{?rhel} >= 7 || 0%{?fedora} /usr/lib/udev/rules.d/50-rbd.rules %else /lib/udev/rules.d/50-rbd.rules @@ -656,7 +680,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{python_sitelib}/rbd.py* %{python_sitelib}/cephfs.py* %{python_sitelib}/ceph_argparse.py* -%{python_sitelib}/ceph_rest_api.py* ################################################################################# %files -n rest-bench @@ -702,4 +725,8 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_javadir}/libcephfs.jar %{_javadir}/libcephfs-test.jar +%files libs-compat +# We need an empty %files list for ceph-libs-compat, to tell rpmbuild to actually +# build this meta package. + %changelog diff --git a/ceph/compile b/ceph/compile index b1f47491..531136b0 100755 --- a/ceph/compile +++ b/ceph/compile @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -79,6 +78,53 @@ func_file_conv () esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +155,34 @@ func_cl_wrapper () ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false diff --git a/ceph/config.guess b/ceph/config.guess index d622a44e..b79252d6 100755 --- a/ceph/config.guess +++ b/ceph/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ timestamp='2012-02-10' # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,10 +252,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -267,7 +268,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -285,16 +286,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -364,13 +366,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -383,7 +385,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -401,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -782,11 +786,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1013,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1340,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1486,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1537,6 +1546,12 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1577,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/ceph/configure b/ceph/configure index d8d4d5c5..1d42b8c4 100755 --- a/ceph/configure +++ b/ceph/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ceph 0.80.7. +# Generated by GNU Autoconf 2.69 for ceph 0.80.8. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ceph' PACKAGE_TARNAME='ceph' -PACKAGE_VERSION='0.80.7' -PACKAGE_STRING='ceph 0.80.7' +PACKAGE_VERSION='0.80.8' +PACKAGE_STRING='ceph 0.80.8' PACKAGE_BUGREPORT='ceph-devel@vger.kernel.org' PACKAGE_URL='' @@ -717,10 +737,6 @@ FREEBSD_FALSE FREEBSD_TRUE LINUX_FALSE LINUX_TRUE -AM_BACKSLASH -AM_DEFAULT_VERBOSITY -AM_DEFAULT_V -AM_V am__fastdepCCAS_FALSE am__fastdepCCAS_TRUE CCASDEPMODE @@ -746,6 +762,10 @@ EGREP GREP SED LIBTOOL +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -845,6 +865,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_dependency_tracking +enable_silent_rules enable_shared enable_static with_pic @@ -852,7 +873,6 @@ enable_fast_install with_gnu_ld with_sysroot enable_libtool_lock -enable_silent_rules with_cryptopp with_nss with_profiler @@ -1354,8 +1374,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1441,7 +1459,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ceph 0.80.7 to adapt to many kinds of systems. +\`configure' configures ceph 0.80.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1512,7 +1530,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ceph 0.80.7:";; + short | recursive ) echo "Configuration of ceph 0.80.8:";; esac cat <<\_ACEOF @@ -1520,15 +1538,17 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') --enable-coverage enable code coverage tracking --enable-pgrefdebugging enable pg ref debugging --enable-cephfs-java build libcephfs Java bindings @@ -1657,10 +1677,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ceph configure 0.80.7 -generated by GNU Autoconf 2.68 +ceph configure 0.80.8 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1736,7 +1756,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2034,7 +2054,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2161,7 +2181,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2177,7 +2198,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2203,7 +2225,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2219,7 +2242,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2253,7 +2277,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2682,8 +2707,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ceph $as_me 0.80.7, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by ceph $as_me 0.80.8, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3051,7 +3076,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_GIT_CHECK="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3253,7 +3278,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3293,7 +3318,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3346,7 +3371,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3387,7 +3412,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3445,7 +3470,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3489,7 +3514,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3935,8 +3960,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4021,6 +4045,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" @@ -4041,7 +4124,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4085,7 +4168,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4129,7 +4212,13 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; } if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_ar_interface=ar + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; @@ -4160,6 +4249,11 @@ if ac_fn_c_try_compile "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -4184,7 +4278,7 @@ esac # Automake -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4223,7 +4317,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4281,9 +4375,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -4294,32 +4385,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -4331,6 +4430,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -4350,12 +4459,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -4367,10 +4476,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -4389,7 +4498,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4429,7 +4538,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4480,7 +4589,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -4509,12 +4618,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -4533,7 +4636,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4616,7 +4719,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4660,6 +4763,45 @@ else fi +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4682,7 +4824,7 @@ fi # Define the identity of the package. PACKAGE='ceph' - VERSION='0.80.7' + VERSION='0.80.8' cat >>confdefs.h <<_ACEOF @@ -4710,17 +4852,28 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4732,8 +4885,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4768,16 +4921,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4786,8 +4939,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4795,7 +4948,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4850,132 +5003,48 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! -int -main () -{ +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . -fi +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi fi - case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -5092,7 +5161,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5168,7 +5237,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5234,7 +5303,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5301,7 +5370,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5557,7 +5626,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5601,7 +5670,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6025,7 +6094,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6065,7 +6134,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6371,7 +6440,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6411,7 +6480,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6514,7 +6583,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6558,7 +6627,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6683,7 +6752,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6723,7 +6792,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6782,7 +6851,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6822,7 +6891,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7471,7 +7540,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7511,7 +7580,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7591,7 +7660,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7631,7 +7700,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7683,7 +7752,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7723,7 +7792,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7775,7 +7844,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7815,7 +7884,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7867,7 +7936,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7907,7 +7976,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7959,7 +8028,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7999,7 +8068,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12520,8 +12589,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -12554,16 +12623,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -12572,8 +12641,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -12581,7 +12650,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -12660,7 +12729,7 @@ fi # Define the identity of the package. PACKAGE='ceph' - VERSION='0.80.7' + VERSION='0.80.8' cat >>confdefs.h <<_ACEOF @@ -12688,17 +12757,28 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -12710,8 +12790,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -12746,16 +12826,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -12764,8 +12844,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -12773,7 +12853,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -12828,15 +12908,56 @@ fi +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -12928,7 +13049,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12972,7 +13093,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13168,8 +13289,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -13204,16 +13325,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -13222,8 +13343,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -13231,7 +13352,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -16510,8 +16631,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -16546,16 +16667,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -16564,8 +16685,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -16573,7 +16694,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -17119,7 +17240,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_acx_pthread_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17274,7 +17395,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17909,7 +18030,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17952,7 +18073,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19004,7 +19125,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAVAC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19047,7 +19168,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAVAC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19084,7 +19205,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 19087 "configure" */ +/* #line 19208 "configure" */ public class Test { } EOF @@ -19126,7 +19247,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19196,7 +19317,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19239,7 +19360,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_JAR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21588,8 +21709,8 @@ fi if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.4" >&5 -$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.4" >&5 +$as_echo_n "checking whether $PYTHON version is >= 2.4... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -21607,7 +21728,9 @@ sys.exit(sys.hexversion < minverhex)" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - as_fn_error $? "too old" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Python interpreter is too old" "$LINENO" 5 fi am_display_PYTHON=$PYTHON else @@ -21619,7 +21742,7 @@ if ${am_cv_pathless_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -21663,7 +21786,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21729,6 +21852,25 @@ $as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[:3] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 @@ -21742,7 +21884,14 @@ else else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -21779,7 +21928,14 @@ else else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -21923,6 +22079,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -22353,16 +22517,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -22422,28 +22586,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -22464,8 +22616,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ceph $as_me 0.80.7, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by ceph $as_me 0.80.8, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -22530,11 +22682,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ceph config.status 0.80.7 -configured by $0, generated by GNU Autoconf 2.68, +ceph config.status 0.80.8 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -22625,7 +22777,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -23641,7 +23793,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -23654,7 +23806,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -23688,21 +23840,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff --git a/ceph/configure.ac b/ceph/configure.ac index 7255c7c9..9b6448c3 100644 --- a/ceph/configure.ac +++ b/ceph/configure.ac @@ -8,7 +8,7 @@ AC_PREREQ(2.59) # VERSION define is not used by the code. It gets a version string # from 'git describe'; see src/ceph_ver.[ch] -AC_INIT([ceph], [0.80.7], [ceph-devel@vger.kernel.org]) +AC_INIT([ceph], [0.80.8], [ceph-devel@vger.kernel.org]) # Create release string. Used with VERSION for RPMs. RPM_RELEASE=0 diff --git a/ceph/depcomp b/ceph/depcomp index bd0ac089..4ebd5b3a 100755 --- a/ceph/depcomp +++ b/ceph/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2011-12-04.11; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,8 +39,8 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,26 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -122,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -131,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -145,33 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -189,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -198,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -247,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -258,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -307,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -319,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -332,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -343,77 +461,61 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -424,8 +526,7 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -443,14 +544,15 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -478,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -562,11 +664,12 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -583,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -602,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -637,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/ceph/install-sh b/ceph/install-sh index a9244eb0..377bb868 100755 --- a/ceph/install-sh +++ b/ceph/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/ceph/ltmain.sh b/ceph/ltmain.sh index c2852d85..a356acaf 100644 --- a/ceph/ltmain.sh +++ b/ceph/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 diff --git a/ceph/man/Makefile.in b/ceph/man/Makefile.in index e5732312..fea1a771 100644 --- a/ceph/man/Makefile.in +++ b/ceph/man/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,8 +79,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = man -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_classpath.m4 \ $(top_srcdir)/m4/ac_prog_jar.m4 \ @@ -58,14 +102,25 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/acconfig.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -97,6 +152,7 @@ man8dir = $(mandir)/man8 am__installdirs = "$(DESTDIR)$(man8dir)" NROFF = nroff MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -346,11 +402,18 @@ clean-libtool: -rm -rf .libs _libs install-man8: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)" - @list=''; test -n "$(man8dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.8[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -380,27 +443,14 @@ uninstall-man8: } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -538,16 +588,17 @@ uninstall-man: uninstall-man8 .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man8 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-man uninstall-man8 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man8 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-man \ + uninstall-man8 # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/ceph/missing b/ceph/missing index 86a8fc31..db98974f 100755 --- a/ceph/missing +++ b/ceph/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; -esac - -exit 0 + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/ceph/src/.git_version b/ceph/src/.git_version index 1727fed6..178a99ef 100644 --- a/ceph/src/.git_version +++ b/ceph/src/.git_version @@ -1,2 +1,2 @@ -6c0127fcb58008793d3c8b62d925bc91963672a3 -v0.80.7 +69eaad7f8308f21573c604f121956e64679a52a7 +v0.80.8 diff --git a/ceph/src/Makefile.am b/ceph/src/Makefile.am index edec05e6..9c394e80 100644 --- a/ceph/src/Makefile.am +++ b/ceph/src/Makefile.am @@ -258,6 +258,7 @@ TESTS = \ $(check_SCRIPTS) check-local: + $(top_srcdir)/qa/workunits/erasure-code/encode-decode-non-regression.sh $(srcdir)/test/encoding/readable.sh ../ceph-object-corpus diff --git a/ceph/src/Makefile.in b/ceph/src/Makefile.in index afa524ba..ab18162d 100644 --- a/ceph/src/Makefile.in +++ b/ceph/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,6 +20,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,27 +84,27 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -DIST_COMMON = README $(am__noinst_HEADERS_DIST) $(dist_bin_SCRIPTS) \ - $(python_PYTHON) $(srcdir)/Makefile-env.am \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/acconfig.h.in $(srcdir)/arch/Makefile.am \ +DIST_COMMON = $(srcdir)/Makefile-env.am $(srcdir)/arch/Makefile.am \ $(srcdir)/auth/Makefile.am $(srcdir)/brag/Makefile.am \ - $(srcdir)/client/Makefile.am $(srcdir)/cls/Makefile.am \ - $(srcdir)/common/Makefile.am $(srcdir)/crush/Makefile.am \ - $(srcdir)/erasure-code/Makefile.am \ + $(srcdir)/crush/Makefile.am $(srcdir)/mon/Makefile.am \ + $(srcdir)/mds/Makefile.am $(srcdir)/os/Makefile.am \ + $(srcdir)/osd/Makefile.am $(srcdir)/erasure-code/Makefile.am \ $(srcdir)/erasure-code/jerasure/Makefile.am \ - $(srcdir)/global/Makefile.am $(srcdir)/include/Makefile.am \ - $(srcdir)/json_spirit/Makefile.am \ - $(srcdir)/key_value_store/Makefile.am \ + $(srcdir)/osdc/Makefile.am $(srcdir)/client/Makefile.am \ + $(srcdir)/global/Makefile.am $(srcdir)/json_spirit/Makefile.am \ + $(srcdir)/log/Makefile.am $(srcdir)/perfglue/Makefile.am \ + $(srcdir)/common/Makefile.am $(srcdir)/msg/Makefile.am \ + $(srcdir)/messages/Makefile.am $(srcdir)/include/Makefile.am \ $(srcdir)/librados/Makefile.am $(srcdir)/librbd/Makefile.am \ - $(srcdir)/log/Makefile.am $(srcdir)/mds/Makefile.am \ - $(srcdir)/messages/Makefile.am $(srcdir)/mon/Makefile.am \ - $(srcdir)/msg/Makefile.am $(srcdir)/os/Makefile.am \ - $(srcdir)/osd/Makefile.am $(srcdir)/osdc/Makefile.am \ - $(srcdir)/perfglue/Makefile.am $(srcdir)/rgw/Makefile.am \ + $(srcdir)/rgw/Makefile.am $(srcdir)/cls/Makefile.am \ + $(srcdir)/key_value_store/Makefile.am \ $(srcdir)/test/Makefile.am \ $(srcdir)/test/erasure-code/Makefile.am \ - $(srcdir)/tools/Makefile.am TODO + $(srcdir)/tools/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/acconfig.h.in \ + $(dist_bin_SCRIPTS) $(top_srcdir)/depcomp $(python_PYTHON) \ + $(top_srcdir)/py-compile $(am__noinst_HEADERS_DIST) \ + $(top_srcdir)/test-driver README TODO bin_PROGRAMS = $(am__EXEEXT_9) $(am__EXEEXT_10) ceph-dencoder$(EXEEXT) \ ceph_filestore_tool$(EXEEXT) ceph_filestore_dump$(EXEEXT) \ monmaptool$(EXEEXT) crushtool$(EXEEXT) osdmaptool$(EXEEXT) \ @@ -69,7 +113,8 @@ bin_PROGRAMS = $(am__EXEEXT_9) $(am__EXEEXT_10) ceph-dencoder$(EXEEXT) \ ceph-mon$(EXEEXT) ceph-osd$(EXEEXT) ceph-mds$(EXEEXT) \ cephfs$(EXEEXT) librados-config$(EXEEXT) ceph-syn$(EXEEXT) \ $(am__EXEEXT_12) $(am__EXEEXT_13) -noinst_PROGRAMS = get_command_descriptions$(EXEEXT) +noinst_PROGRAMS = ceph_erasure_code_non_regression$(EXEEXT) \ + get_command_descriptions$(EXEEXT) sbin_PROGRAMS = su_sbin_PROGRAMS = $(am__EXEEXT_14) check_PROGRAMS = unittest_erasure_code_plugin$(EXEEXT) \ @@ -88,20 +133,21 @@ check_PROGRAMS = unittest_erasure_code_plugin$(EXEEXT) \ unittest_base64$(EXEEXT) unittest_ceph_argparse$(EXEEXT) \ unittest_ceph_compatset$(EXEEXT) unittest_osd_types$(EXEEXT) \ unittest_pglog$(EXEEXT) unittest_ecbackend$(EXEEXT) \ - unittest_hitset$(EXEEXT) unittest_gather$(EXEEXT) \ - unittest_run_cmd$(EXEEXT) unittest_signals$(EXEEXT) \ - unittest_simple_spin$(EXEEXT) unittest_librados$(EXEEXT) \ - unittest_bufferlist$(EXEEXT) unittest_crc32c$(EXEEXT) \ - unittest_arch$(EXEEXT) unittest_crypto$(EXEEXT) \ - unittest_crypto_init$(EXEEXT) unittest_perf_counters$(EXEEXT) \ - unittest_admin_socket$(EXEEXT) unittest_ceph_crypto$(EXEEXT) \ - unittest_utf8$(EXEEXT) unittest_mime$(EXEEXT) \ - unittest_escape$(EXEEXT) unittest_chain_xattr$(EXEEXT) \ - unittest_flatindex$(EXEEXT) unittest_strtol$(EXEEXT) \ - unittest_confutils$(EXEEXT) unittest_config$(EXEEXT) \ - unittest_context$(EXEEXT) unittest_heartbeatmap$(EXEEXT) \ - unittest_formatter$(EXEEXT) unittest_libcephfs_config$(EXEEXT) \ - unittest_lfnindex$(EXEEXT) unittest_librados_config$(EXEEXT) \ + unittest_hitset$(EXEEXT) unittest_io_priority$(EXEEXT) \ + unittest_gather$(EXEEXT) unittest_run_cmd$(EXEEXT) \ + unittest_signals$(EXEEXT) unittest_simple_spin$(EXEEXT) \ + unittest_librados$(EXEEXT) unittest_bufferlist$(EXEEXT) \ + unittest_crc32c$(EXEEXT) unittest_arch$(EXEEXT) \ + unittest_crypto$(EXEEXT) unittest_crypto_init$(EXEEXT) \ + unittest_perf_counters$(EXEEXT) unittest_admin_socket$(EXEEXT) \ + unittest_ceph_crypto$(EXEEXT) unittest_utf8$(EXEEXT) \ + unittest_mime$(EXEEXT) unittest_escape$(EXEEXT) \ + unittest_chain_xattr$(EXEEXT) unittest_flatindex$(EXEEXT) \ + unittest_strtol$(EXEEXT) unittest_confutils$(EXEEXT) \ + unittest_config$(EXEEXT) unittest_context$(EXEEXT) \ + unittest_heartbeatmap$(EXEEXT) unittest_formatter$(EXEEXT) \ + unittest_libcephfs_config$(EXEEXT) unittest_lfnindex$(EXEEXT) \ + unittest_librados_config$(EXEEXT) \ unittest_daemon_config$(EXEEXT) unittest_osd_osdcap$(EXEEXT) \ unittest_mon_moncap$(EXEEXT) unittest_mon_pgmap$(EXEEXT) \ unittest_ipaddr$(EXEEXT) unittest_texttable$(EXEEXT) \ @@ -177,36 +223,37 @@ check_PROGRAMS = unittest_erasure_code_plugin$(EXEEXT) \ @LINUX_TRUE@am__append_43 = -ldl @LINUX_TRUE@am__append_44 = -ldl @LINUX_TRUE@am__append_45 = -ldl -@COMPILER_HAS_VTA_TRUE@am__append_46 = -fno-var-tracking-assignments +@LINUX_TRUE@am__append_46 = -ldl @COMPILER_HAS_VTA_TRUE@am__append_47 = -fno-var-tracking-assignments -@WITH_BUILD_TESTS_TRUE@am__append_48 = test_build_libcommon \ +@COMPILER_HAS_VTA_TRUE@am__append_48 = -fno-var-tracking-assignments +@WITH_BUILD_TESTS_TRUE@am__append_49 = test_build_libcommon \ @WITH_BUILD_TESTS_TRUE@ test_build_librados test_build_librgw \ @WITH_BUILD_TESTS_TRUE@ test_build_libcephfs -@LINUX_TRUE@am__append_49 = ceph_kvstorebench \ +@LINUX_TRUE@am__append_50 = ceph_kvstorebench \ @LINUX_TRUE@ ceph_test_rados_list_parallel \ @LINUX_TRUE@ ceph_test_rados_open_pools_parallel \ @LINUX_TRUE@ ceph_test_rados_delete_pools_parallel \ @LINUX_TRUE@ ceph_test_rados_watch_notify -@LINUX_TRUE@am__append_50 = libsystest.la -@LINUX_TRUE@am__append_51 = -ldl -@WITH_RADOSGW_TRUE@am__append_52 = ceph_test_cors \ +@LINUX_TRUE@am__append_51 = libsystest.la +@LINUX_TRUE@am__append_52 = -ldl +@WITH_RADOSGW_TRUE@am__append_53 = ceph_test_cors \ @WITH_RADOSGW_TRUE@ ceph_test_rgw_manifest \ @WITH_RADOSGW_TRUE@ ceph_test_cls_rgw_meta \ @WITH_RADOSGW_TRUE@ ceph_test_cls_rgw_log \ @WITH_RADOSGW_TRUE@ ceph_test_cls_rgw_opstate -@LINUX_TRUE@am__append_53 = ceph_test_librbd_fsx -@WITH_RADOSGW_TRUE@am__append_54 = ceph_test_cls_rgw -@LINUX_TRUE@am__append_55 = ceph_test_objectstore -@LINUX_TRUE@am__append_56 = -ldl +@LINUX_TRUE@am__append_54 = ceph_test_librbd_fsx +@WITH_RADOSGW_TRUE@am__append_55 = ceph_test_cls_rgw +@LINUX_TRUE@am__append_56 = ceph_test_objectstore @LINUX_TRUE@am__append_57 = -ldl -@WITH_REST_BENCH_TRUE@am__append_58 = rest-bench -@WITH_REST_BENCH_TRUE@@WITH_SYSTEM_LIBS3_TRUE@am__append_59 = -ls3 -@WITH_REST_BENCH_TRUE@@WITH_SYSTEM_LIBS3_FALSE@am__append_60 = libs3/build/lib/libs3.a -lcurl -lxml2 -@WITH_REST_BENCH_TRUE@@WITH_SYSTEM_LIBS3_FALSE@am__append_61 = libs3 -@LINUX_TRUE@am__append_62 = mount.ceph -@LINUX_TRUE@am__append_63 = rbd -@WITH_FUSE_TRUE@am__append_64 = ceph-fuse rbd-fuse -@ENABLE_CEPHFS_JAVA_TRUE@am__append_65 = libcephfs_jni.la +@LINUX_TRUE@am__append_58 = -ldl +@WITH_REST_BENCH_TRUE@am__append_59 = rest-bench +@WITH_REST_BENCH_TRUE@@WITH_SYSTEM_LIBS3_TRUE@am__append_60 = -ls3 +@WITH_REST_BENCH_TRUE@@WITH_SYSTEM_LIBS3_FALSE@am__append_61 = libs3/build/lib/libs3.a -lcurl -lxml2 +@WITH_REST_BENCH_TRUE@@WITH_SYSTEM_LIBS3_FALSE@am__append_62 = libs3 +@LINUX_TRUE@am__append_63 = mount.ceph +@LINUX_TRUE@am__append_64 = rbd +@WITH_FUSE_TRUE@am__append_65 = ceph-fuse rbd-fuse +@ENABLE_CEPHFS_JAVA_TRUE@am__append_66 = libcephfs_jni.la subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_classpath.m4 \ @@ -233,10 +280,8 @@ LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru AM_V_AR = $(am__v_AR_@AM_V@) am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) -am__v_AR_0 = @echo " AR " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libcls_log_client_a_AR = $(AR) $(ARFLAGS) libcls_log_client_a_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp @@ -321,6 +366,7 @@ libarch_la_OBJECTS = $(am_libarch_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libauth_la_LIBADD = am_libauth_la_OBJECTS = auth/AuthAuthorizeHandler.lo \ auth/AuthClientHandler.lo auth/AuthSessionHandler.lo \ @@ -1073,6 +1119,13 @@ ceph_erasure_code_benchmark_OBJECTS = \ ceph_erasure_code_benchmark_DEPENDENCIES = $(am__DEPENDENCIES_10) \ $(LIBCOMMON) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \ $(am__DEPENDENCIES_1) +am_ceph_erasure_code_non_regression_OBJECTS = \ + test/erasure-code/ceph_erasure_code_non_regression.$(OBJEXT) +ceph_erasure_code_non_regression_OBJECTS = \ + $(am_ceph_erasure_code_non_regression_OBJECTS) +ceph_erasure_code_non_regression_DEPENDENCIES = \ + $(am__DEPENDENCIES_10) $(LIBCOMMON) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1) am_ceph_filestore_dump_OBJECTS = tools/ceph_filestore_dump.$(OBJEXT) ceph_filestore_dump_OBJECTS = $(am_ceph_filestore_dump_OBJECTS) ceph_filestore_dump_DEPENDENCIES = $(am__DEPENDENCIES_10) \ @@ -1774,8 +1827,8 @@ am__radosgw_SOURCES_DIST = rgw/rgw_resolve.cc rgw/rgw_rest.cc \ rgw/rgw_rest_log.cc rgw/rgw_rest_opstate.cc \ rgw/rgw_rest_replica_log.cc rgw/rgw_rest_config.cc \ rgw/rgw_http_client.cc rgw/rgw_swift.cc rgw/rgw_swift_auth.cc \ - rgw/rgw_loadgen.cc rgw/rgw_civetweb.cc civetweb/src/civetweb.c \ - rgw/rgw_main.cc + rgw/rgw_loadgen.cc rgw/rgw_civetweb.cc rgw/rgw_civetweb_log.cc \ + civetweb/src/civetweb.c rgw/rgw_main.cc @WITH_RADOSGW_TRUE@am_radosgw_OBJECTS = rgw/rgw_resolve.$(OBJEXT) \ @WITH_RADOSGW_TRUE@ rgw/rgw_rest.$(OBJEXT) \ @WITH_RADOSGW_TRUE@ rgw/rgw_rest_swift.$(OBJEXT) \ @@ -1794,6 +1847,7 @@ am__radosgw_SOURCES_DIST = rgw/rgw_resolve.cc rgw/rgw_rest.cc \ @WITH_RADOSGW_TRUE@ rgw/rgw_swift_auth.$(OBJEXT) \ @WITH_RADOSGW_TRUE@ rgw/rgw_loadgen.$(OBJEXT) \ @WITH_RADOSGW_TRUE@ rgw/rgw_civetweb.$(OBJEXT) \ +@WITH_RADOSGW_TRUE@ rgw/rgw_civetweb_log.$(OBJEXT) \ @WITH_RADOSGW_TRUE@ civetweb/src/radosgw-civetweb.$(OBJEXT) \ @WITH_RADOSGW_TRUE@ rgw/rgw_main.$(OBJEXT) radosgw_OBJECTS = $(am_radosgw_OBJECTS) @@ -2356,6 +2410,15 @@ unittest_hitset_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ $(unittest_hitset_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ +am_unittest_io_priority_OBJECTS = \ + test/common/unittest_io_priority-test_io_priority.$(OBJEXT) +unittest_io_priority_OBJECTS = $(am_unittest_io_priority_OBJECTS) +unittest_io_priority_DEPENDENCIES = $(am__DEPENDENCIES_13) \ + $(am__DEPENDENCIES_6) +unittest_io_priority_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(unittest_io_priority_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ am_unittest_ipaddr_OBJECTS = \ test/unittest_ipaddr-test_ipaddr.$(OBJEXT) unittest_ipaddr_OBJECTS = $(am_unittest_ipaddr_OBJECTS) @@ -2613,6 +2676,18 @@ unittest_workqueue_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ $(LDFLAGS) -o $@ SCRIPTS = $(bin_SCRIPTS) $(ceph_sbin_SCRIPTS) $(dist_bin_SCRIPTS) \ $(sbin_SCRIPTS) $(shell_common_SCRIPTS) $(su_sbin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -2625,7 +2700,8 @@ LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ $(AM_CCASFLAGS) $(CCASFLAGS) AM_V_CPPAS = $(am__v_CPPAS_@AM_V@) am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@) -am__v_CPPAS_0 = @echo " CPPAS " $@; +am__v_CPPAS_0 = @echo " CPPAS " $@; +am__v_CPPAS_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -2634,14 +2710,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -2650,17 +2728,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(libcls_log_client_a_SOURCES) \ $(libcls_replica_log_client_a_SOURCES) \ $(libcls_statelog_client_a_SOURCES) \ @@ -2707,6 +2784,7 @@ SOURCES = $(libcls_log_client_a_SOURCES) \ $(ceph_syn_SOURCES) $(ceph_bench_log_SOURCES) \ $(ceph_dupstore_SOURCES) $(ceph_erasure_code_SOURCES) \ $(ceph_erasure_code_benchmark_SOURCES) \ + $(ceph_erasure_code_non_regression_SOURCES) \ $(ceph_filestore_dump_SOURCES) $(ceph_filestore_tool_SOURCES) \ $(ceph_kvstorebench_SOURCES) \ $(ceph_mon_store_converter_SOURCES) \ @@ -2794,8 +2872,8 @@ SOURCES = $(libcls_log_client_a_SOURCES) \ $(unittest_escape_SOURCES) $(unittest_flatindex_SOURCES) \ $(unittest_formatter_SOURCES) $(unittest_gather_SOURCES) \ $(unittest_heartbeatmap_SOURCES) $(unittest_histogram_SOURCES) \ - $(unittest_hitset_SOURCES) $(unittest_ipaddr_SOURCES) \ - $(unittest_lfnindex_SOURCES) \ + $(unittest_hitset_SOURCES) $(unittest_io_priority_SOURCES) \ + $(unittest_ipaddr_SOURCES) $(unittest_lfnindex_SOURCES) \ $(unittest_libcephfs_config_SOURCES) \ $(unittest_librados_SOURCES) \ $(unittest_librados_config_SOURCES) $(unittest_log_SOURCES) \ @@ -2862,6 +2940,7 @@ DIST_SOURCES = $(libcls_log_client_a_SOURCES) \ $(ceph_bench_log_SOURCES) $(ceph_dupstore_SOURCES) \ $(ceph_erasure_code_SOURCES) \ $(ceph_erasure_code_benchmark_SOURCES) \ + $(ceph_erasure_code_non_regression_SOURCES) \ $(ceph_filestore_dump_SOURCES) $(ceph_filestore_tool_SOURCES) \ $(am__ceph_kvstorebench_SOURCES_DIST) \ $(ceph_mon_store_converter_SOURCES) \ @@ -2955,8 +3034,8 @@ DIST_SOURCES = $(libcls_log_client_a_SOURCES) \ $(unittest_escape_SOURCES) $(unittest_flatindex_SOURCES) \ $(unittest_formatter_SOURCES) $(unittest_gather_SOURCES) \ $(unittest_heartbeatmap_SOURCES) $(unittest_histogram_SOURCES) \ - $(unittest_hitset_SOURCES) $(unittest_ipaddr_SOURCES) \ - $(unittest_lfnindex_SOURCES) \ + $(unittest_hitset_SOURCES) $(unittest_io_priority_SOURCES) \ + $(unittest_ipaddr_SOURCES) $(unittest_lfnindex_SOURCES) \ $(unittest_libcephfs_config_SOURCES) \ $(unittest_librados_SOURCES) \ $(unittest_librados_config_SOURCES) $(unittest_log_SOURCES) \ @@ -2975,14 +3054,22 @@ DIST_SOURCES = $(libcls_log_client_a_SOURCES) \ $(unittest_texttable_SOURCES) $(unittest_throttle_SOURCES) \ $(unittest_utf8_SOURCES) $(unittest_util_SOURCES) \ $(unittest_workqueue_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) +am__pep3147_tweak = \ + sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' py_compile = $(top_srcdir)/py-compile DATA = $(bash_completion_DATA) $(doc_DATA) $(libcephfs_include_DATA) \ $(librbd_include_DATA) $(rados_include_DATA) @@ -3219,11 +3306,12 @@ am__noinst_HEADERS_DIST = arch/intel.h arch/neon.h arch/probe.h \ rgw/rgw_rest_log.h rgw/rgw_rest_opstate.h \ rgw/rgw_rest_replica_log.h rgw/rgw_rest_config.h \ rgw/rgw_usage.h rgw/rgw_user.h rgw/rgw_bucket.h \ - rgw/rgw_keystone.h rgw/rgw_civetweb.h civetweb/civetweb.h \ - civetweb/include/civetweb.h civetweb/src/md5.h \ - cls/lock/cls_lock_types.h cls/lock/cls_lock_ops.h \ - cls/lock/cls_lock_client.h cls/rbd/cls_rbd.h \ - cls/rbd/cls_rbd_client.h cls/refcount/cls_refcount_ops.h \ + rgw/rgw_keystone.h rgw/rgw_civetweb.h rgw/rgw_civetweb_log.h \ + civetweb/civetweb.h civetweb/include/civetweb.h \ + civetweb/src/md5.h cls/lock/cls_lock_types.h \ + cls/lock/cls_lock_ops.h cls/lock/cls_lock_client.h \ + cls/rbd/cls_rbd.h cls/rbd/cls_rbd_client.h \ + cls/refcount/cls_refcount_ops.h \ cls/refcount/cls_refcount_client.h \ cls/version/cls_version_types.h cls/version/cls_version_ops.h \ cls/version/cls_version_client.h cls/log/cls_log_types.h \ @@ -3272,13 +3360,208 @@ am__noinst_HEADERS_DIST = arch/intel.h arch/neon.h arch/probe.h \ HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)acconfig.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -3485,7 +3768,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = gnu subdir-objects -SUBDIRS = ocf java $(am__append_61) +SUBDIRS = ocf java $(am__append_62) DIST_SUBDIRS = gtest ocf libs3 java BUILT_SOURCES = init-ceph @@ -3763,11 +4046,12 @@ noinst_HEADERS = arch/intel.h arch/neon.h arch/probe.h \ rgw/rgw_rest_log.h rgw/rgw_rest_opstate.h \ rgw/rgw_rest_replica_log.h rgw/rgw_rest_config.h \ rgw/rgw_usage.h rgw/rgw_user.h rgw/rgw_bucket.h \ - rgw/rgw_keystone.h rgw/rgw_civetweb.h civetweb/civetweb.h \ - civetweb/include/civetweb.h civetweb/src/md5.h \ - cls/lock/cls_lock_types.h cls/lock/cls_lock_ops.h \ - cls/lock/cls_lock_client.h cls/rbd/cls_rbd.h \ - cls/rbd/cls_rbd_client.h cls/refcount/cls_refcount_ops.h \ + rgw/rgw_keystone.h rgw/rgw_civetweb.h rgw/rgw_civetweb_log.h \ + civetweb/civetweb.h civetweb/include/civetweb.h \ + civetweb/src/md5.h cls/lock/cls_lock_types.h \ + cls/lock/cls_lock_ops.h cls/lock/cls_lock_client.h \ + cls/rbd/cls_rbd.h cls/rbd/cls_rbd_client.h \ + cls/refcount/cls_refcount_ops.h \ cls/refcount/cls_refcount_client.h \ cls/version/cls_version_types.h cls/version/cls_version_ops.h \ cls/version/cls_version_client.h cls/log/cls_log_types.h \ @@ -3819,7 +4103,7 @@ bin_SCRIPTS = brag/client/ceph-brag ceph ceph-run ceph-rest-api \ sbin_SCRIPTS = su_sbin_SCRIPTS = mount.fuse.ceph mkcephfs dist_bin_SCRIPTS = -lib_LTLIBRARIES = librados.la librbd.la libcephfs.la $(am__append_65) +lib_LTLIBRARIES = librados.la librbd.la libcephfs.la $(am__append_66) noinst_LTLIBRARIES = libarch.la libauth.la libcrush.la libmon_types.la \ libmon.la libmds.la libos_types.la libos.la libosd_types.la \ libosd.la liberasure_code.la libosdc.la libclient.la \ @@ -3827,7 +4111,7 @@ noinst_LTLIBRARIES = libarch.la libauth.la libcrush.la libmon_types.la \ libperfglue.la libcommon_crc.la libcommon.la libmsg.la \ $(am__append_35) libcls_lock_client.la \ libcls_refcount_client.la libcls_rgw_client.la \ - libcls_rbd_client.la $(am__append_50) libradostest.la + libcls_rbd_client.la $(am__append_51) libradostest.la noinst_LIBRARIES = $(am__append_17) libcls_version_client.a \ libcls_log_client.a libcls_statelog_client.a \ libcls_replica_log_client.a libcls_user_client.a @@ -3842,14 +4126,14 @@ bin_DEBUGPROGRAMS = ceph_test_ioctls $(am__append_38) \ ceph_test_signal_handlers ceph_test_rados ceph_test_mutate \ ceph_test_rewrite_latency ceph_test_msgr ceph_streamtest \ ceph_test_trans ceph_test_crypto ceph_test_keys \ - $(am__append_48) ceph_smalliobench ceph_smalliobenchfs \ + $(am__append_49) ceph_smalliobench ceph_smalliobenchfs \ ceph_smalliobenchdumb ceph_smalliobenchrbd ceph_tpbench \ - ceph_omapbench $(am__append_49) ceph_bench_log \ - $(am__append_52) ceph_multi_stress_watch ceph_test_librbd \ - $(am__append_53) ceph_test_cls_rbd ceph_test_cls_refcount \ + ceph_omapbench $(am__append_50) ceph_bench_log \ + $(am__append_53) ceph_multi_stress_watch ceph_test_librbd \ + $(am__append_54) ceph_test_cls_rbd ceph_test_cls_refcount \ ceph_test_cls_version ceph_test_cls_log ceph_test_cls_statelog \ ceph_test_cls_replica_log ceph_test_cls_lock \ - ceph_test_cls_hello $(am__append_54) ceph_test_mon_workloadgen \ + ceph_test_cls_hello $(am__append_55) ceph_test_mon_workloadgen \ ceph_test_rados_api_cmd ceph_test_rados_api_io \ ceph_test_rados_api_c_write_operations \ ceph_test_rados_api_c_read_operations ceph_test_rados_api_aio \ @@ -3857,7 +4141,7 @@ bin_DEBUGPROGRAMS = ceph_test_ioctls $(am__append_38) \ ceph_test_rados_api_stat ceph_test_rados_api_watch_notify \ ceph_test_rados_api_snapshots ceph_test_rados_api_cls \ ceph_test_rados_api_misc ceph_test_rados_api_tier \ - ceph_test_rados_api_lock ceph_test_libcephfs $(am__append_55) \ + ceph_test_rados_api_lock ceph_test_libcephfs $(am__append_56) \ ceph_test_objectstore_workloadgen \ ceph_test_filestore_idempotent \ ceph_test_filestore_idempotent_sequence ceph_xattr_bench \ @@ -4384,6 +4668,7 @@ librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 $(am__append_34) @WITH_RADOSGW_TRUE@ rgw/rgw_swift_auth.cc \ @WITH_RADOSGW_TRUE@ rgw/rgw_loadgen.cc \ @WITH_RADOSGW_TRUE@ rgw/rgw_civetweb.cc \ +@WITH_RADOSGW_TRUE@ rgw/rgw_civetweb_log.cc \ @WITH_RADOSGW_TRUE@ civetweb/src/civetweb.c \ @WITH_RADOSGW_TRUE@ rgw/rgw_main.cc @@ -4477,11 +4762,16 @@ ceph_erasure_code_benchmark_SOURCES = \ ceph_erasure_code_benchmark_LDADD = $(LIBOSD) $(LIBCOMMON) \ $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) $(am__append_41) +ceph_erasure_code_non_regression_SOURCES = \ + test/erasure-code/ceph_erasure_code_non_regression.cc + +ceph_erasure_code_non_regression_LDADD = $(LIBOSD) $(LIBCOMMON) \ + $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) $(am__append_42) ceph_erasure_code_SOURCES = \ test/erasure-code/ceph_erasure_code.cc ceph_erasure_code_LDADD = $(LIBOSD) $(LIBCOMMON) \ - $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) $(am__append_42) + $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) $(am__append_43) libec_example_la_SOURCES = test/erasure-code/ErasureCodePluginExample.cc libec_example_la_CFLAGS = ${AM_CFLAGS} libec_example_la_CXXFLAGS = ${AM_CXXFLAGS} @@ -4525,7 +4815,7 @@ libec_test_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -export-symbols-regex '.* unittest_erasure_code_plugin_SOURCES = test/erasure-code/TestErasureCodePlugin.cc unittest_erasure_code_plugin_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_erasure_code_plugin_LDADD = $(LIBOSD) $(LIBCOMMON) \ - $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(am__append_43) + $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(am__append_44) unittest_erasure_code_jerasure_SOURCES = \ test/erasure-code/TestErasureCodeJerasure.cc \ ${jerasure_sources} @@ -4539,13 +4829,13 @@ unittest_erasure_code_jerasure_CXXFLAGS = $(UNITTEST_CXXFLAGS) \ -Ierasure-code/jerasure/jerasure/include unittest_erasure_code_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) \ - $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(am__append_44) + $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(am__append_45) unittest_erasure_code_plugin_jerasure_SOURCES = \ test/erasure-code/TestErasureCodePluginJerasure.cc unittest_erasure_code_plugin_jerasure_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS} unittest_erasure_code_plugin_jerasure_LDADD = $(LIBOSD) $(LIBCOMMON) \ - $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(am__append_45) + $(UNITTEST_LDADD) $(CEPH_GLOBAL) $(am__append_46) unittest_erasure_code_example_SOURCES = test/erasure-code/TestErasureCodeExample.cc unittest_erasure_code_example_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_erasure_code_example_LDADD = $(LIBOSD) $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) @@ -4588,8 +4878,8 @@ ceph_dencoder_LDADD = \ # These should always use explicit _CFLAGS/_CXXFLAGS so avoid basename conflicts -ceph_dencoder_CFLAGS = ${AM_CFLAGS} $(am__append_46) -ceph_dencoder_CXXFLAGS = ${AM_CXXFLAGS} $(am__append_47) +ceph_dencoder_CFLAGS = ${AM_CFLAGS} $(am__append_47) +ceph_dencoder_CXXFLAGS = ${AM_CXXFLAGS} $(am__append_48) get_command_descriptions_SOURCES = test/common/get_command_descriptions.cc get_command_descriptions_LDADD = $(LIBMON) $(LIBCOMMON) $(CEPH_GLOBAL) @@ -4792,13 +5082,16 @@ unittest_osd_types_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_pglog_SOURCES = test/osd/TestPGLog.cc unittest_pglog_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_pglog_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) \ - $(am__append_51) + $(am__append_52) unittest_ecbackend_SOURCES = test/osd/TestECBackend.cc unittest_ecbackend_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_ecbackend_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_hitset_SOURCES = test/osd/hitset.cc unittest_hitset_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_hitset_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +unittest_io_priority_SOURCES = test/common/test_io_priority.cc +unittest_io_priority_CXXFLAGS = $(UNITTEST_CXXFLAGS) +unittest_io_priority_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_gather_SOURCES = test/gather.cc unittest_gather_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_gather_CXXFLAGS = $(UNITTEST_CXXFLAGS) @@ -5136,10 +5429,10 @@ ceph_kvstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) ceph_kvstore_tool_CXXFLAGS = $(UNITTEST_CXXFLAGS) ceph_filestore_tool_SOURCES = tools/ceph_filestore_tool.cc ceph_filestore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) \ - -lboost_program_options $(am__append_56) + -lboost_program_options $(am__append_57) ceph_filestore_dump_SOURCES = tools/ceph_filestore_dump.cc ceph_filestore_dump_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) \ - $(BOOST_PROGRAM_OPTIONS_LIBS) $(am__append_57) + $(BOOST_PROGRAM_OPTIONS_LIBS) $(am__append_58) monmaptool_SOURCES = tools/monmaptool.cc monmaptool_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON) crushtool_SOURCES = tools/crushtool.cc @@ -5167,7 +5460,7 @@ rados_LDADD = libcls_lock_client.la $(LIBRADOS) $(CEPH_GLOBAL) @WITH_REST_BENCH_TRUE@ common/obj_bencher.cc # needs cleanup so \ @WITH_REST_BENCH_TRUE@ it can go in libcommon.la @WITH_REST_BENCH_TRUE@rest_bench_LDADD = $(CEPH_GLOBAL) \ -@WITH_REST_BENCH_TRUE@ $(am__append_59) $(am__append_60) +@WITH_REST_BENCH_TRUE@ $(am__append_60) $(am__append_61) @WITH_REST_BENCH_TRUE@@WITH_SYSTEM_LIBS3_FALSE@rest_bench_CXXFLAGS = ${AM_CXXFLAGS} -I$(top_srcdir)/src/libs3/inc ceph_conf_SOURCES = tools/ceph_conf.cc ceph_conf_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON) @@ -5278,7 +5571,7 @@ all: $(BUILT_SOURCES) acconfig.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -.SUFFIXES: .S .c .cc .cpp .lo .o .obj +.SUFFIXES: .S .c .cc .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile-env.am $(srcdir)/arch/Makefile.am $(srcdir)/auth/Makefile.am $(srcdir)/brag/Makefile.am $(srcdir)/crush/Makefile.am $(srcdir)/mon/Makefile.am $(srcdir)/mds/Makefile.am $(srcdir)/os/Makefile.am $(srcdir)/osd/Makefile.am $(srcdir)/erasure-code/Makefile.am $(srcdir)/erasure-code/jerasure/Makefile.am $(srcdir)/osdc/Makefile.am $(srcdir)/client/Makefile.am $(srcdir)/global/Makefile.am $(srcdir)/json_spirit/Makefile.am $(srcdir)/log/Makefile.am $(srcdir)/perfglue/Makefile.am $(srcdir)/common/Makefile.am $(srcdir)/msg/Makefile.am $(srcdir)/messages/Makefile.am $(srcdir)/include/Makefile.am $(srcdir)/librados/Makefile.am $(srcdir)/librbd/Makefile.am $(srcdir)/rgw/Makefile.am $(srcdir)/cls/Makefile.am $(srcdir)/key_value_store/Makefile.am $(srcdir)/test/Makefile.am $(srcdir)/test/erasure-code/Makefile.am $(srcdir)/tools/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -5312,8 +5605,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): acconfig.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/acconfig.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -5336,6 +5629,7 @@ cls/log/$(DEPDIR)/$(am__dirstamp): @: > cls/log/$(DEPDIR)/$(am__dirstamp) cls/log/cls_log_client.$(OBJEXT): cls/log/$(am__dirstamp) \ cls/log/$(DEPDIR)/$(am__dirstamp) + libcls_log_client.a: $(libcls_log_client_a_OBJECTS) $(libcls_log_client_a_DEPENDENCIES) $(EXTRA_libcls_log_client_a_DEPENDENCIES) $(AM_V_at)-rm -f libcls_log_client.a $(AM_V_AR)$(libcls_log_client_a_AR) libcls_log_client.a $(libcls_log_client_a_OBJECTS) $(libcls_log_client_a_LIBADD) @@ -5355,6 +5649,7 @@ cls/replica_log/cls_replica_log_ops.$(OBJEXT): \ cls/replica_log/cls_replica_log_client.$(OBJEXT): \ cls/replica_log/$(am__dirstamp) \ cls/replica_log/$(DEPDIR)/$(am__dirstamp) + libcls_replica_log_client.a: $(libcls_replica_log_client_a_OBJECTS) $(libcls_replica_log_client_a_DEPENDENCIES) $(EXTRA_libcls_replica_log_client_a_DEPENDENCIES) $(AM_V_at)-rm -f libcls_replica_log_client.a $(AM_V_AR)$(libcls_replica_log_client_a_AR) libcls_replica_log_client.a $(libcls_replica_log_client_a_OBJECTS) $(libcls_replica_log_client_a_LIBADD) @@ -5368,6 +5663,7 @@ cls/statelog/$(DEPDIR)/$(am__dirstamp): cls/statelog/cls_statelog_client.$(OBJEXT): \ cls/statelog/$(am__dirstamp) \ cls/statelog/$(DEPDIR)/$(am__dirstamp) + libcls_statelog_client.a: $(libcls_statelog_client_a_OBJECTS) $(libcls_statelog_client_a_DEPENDENCIES) $(EXTRA_libcls_statelog_client_a_DEPENDENCIES) $(AM_V_at)-rm -f libcls_statelog_client.a $(AM_V_AR)$(libcls_statelog_client_a_AR) libcls_statelog_client.a $(libcls_statelog_client_a_OBJECTS) $(libcls_statelog_client_a_LIBADD) @@ -5384,6 +5680,7 @@ cls/user/cls_user_types.$(OBJEXT): cls/user/$(am__dirstamp) \ cls/user/$(DEPDIR)/$(am__dirstamp) cls/user/cls_user_ops.$(OBJEXT): cls/user/$(am__dirstamp) \ cls/user/$(DEPDIR)/$(am__dirstamp) + libcls_user_client.a: $(libcls_user_client_a_OBJECTS) $(libcls_user_client_a_DEPENDENCIES) $(EXTRA_libcls_user_client_a_DEPENDENCIES) $(AM_V_at)-rm -f libcls_user_client.a $(AM_V_AR)$(libcls_user_client_a_AR) libcls_user_client.a $(libcls_user_client_a_OBJECTS) $(libcls_user_client_a_LIBADD) @@ -5398,6 +5695,7 @@ cls/version/cls_version_client.$(OBJEXT): cls/version/$(am__dirstamp) \ cls/version/$(DEPDIR)/$(am__dirstamp) cls/version/cls_version_types.$(OBJEXT): cls/version/$(am__dirstamp) \ cls/version/$(DEPDIR)/$(am__dirstamp) + libcls_version_client.a: $(libcls_version_client_a_OBJECTS) $(libcls_version_client_a_DEPENDENCIES) $(EXTRA_libcls_version_client_a_DEPENDENCIES) $(AM_V_at)-rm -f libcls_version_client.a $(AM_V_AR)$(libcls_version_client_a_AR) libcls_version_client.a $(libcls_version_client_a_OBJECTS) $(libcls_version_client_a_LIBADD) @@ -5410,13 +5708,14 @@ os/$(DEPDIR)/$(am__dirstamp): @: > os/$(DEPDIR)/$(am__dirstamp) os/libos_zfs_a-ZFS.$(OBJEXT): os/$(am__dirstamp) \ os/$(DEPDIR)/$(am__dirstamp) + libos_zfs.a: $(libos_zfs_a_OBJECTS) $(libos_zfs_a_DEPENDENCIES) $(EXTRA_libos_zfs_a_DEPENDENCIES) $(AM_V_at)-rm -f libos_zfs.a $(AM_V_AR)$(libos_zfs_a_AR) libos_zfs.a $(libos_zfs_a_OBJECTS) $(libos_zfs_a_LIBADD) $(AM_V_at)$(RANLIB) libos_zfs.a + install-erasure_codelibLTLIBRARIES: $(erasure_codelib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(erasure_codelibdir)" || $(MKDIR_P) "$(DESTDIR)$(erasure_codelibdir)" @list='$(erasure_codelib_LTLIBRARIES)'; test -n "$(erasure_codelibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -5424,6 +5723,8 @@ install-erasure_codelibLTLIBRARIES: $(erasure_codelib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(erasure_codelibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(erasure_codelibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(erasure_codelibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(erasure_codelibdir)"; \ } @@ -5439,15 +5740,17 @@ uninstall-erasure_codelibLTLIBRARIES: clean-erasure_codelibLTLIBRARIES: -test -z "$(erasure_codelib_LTLIBRARIES)" || rm -f $(erasure_codelib_LTLIBRARIES) - @list='$(erasure_codelib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(erasure_codelib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -5455,6 +5758,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -5470,24 +5775,28 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-radoslibLTLIBRARIES: $(radoslib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(radoslibdir)" || $(MKDIR_P) "$(DESTDIR)$(radoslibdir)" @list='$(radoslib_LTLIBRARIES)'; test -n "$(radoslibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -5495,6 +5804,8 @@ install-radoslibLTLIBRARIES: $(radoslib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(radoslibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(radoslibdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(radoslibdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(radoslibdir)"; \ } @@ -5510,12 +5821,14 @@ uninstall-radoslibLTLIBRARIES: clean-radoslibLTLIBRARIES: -test -z "$(radoslib_LTLIBRARIES)" || rm -f $(radoslib_LTLIBRARIES) - @list='$(radoslib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(radoslib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } arch/$(am__dirstamp): @$(MKDIR_P) arch @: > arch/$(am__dirstamp) @@ -5525,6 +5838,7 @@ arch/$(DEPDIR)/$(am__dirstamp): arch/intel.lo: arch/$(am__dirstamp) arch/$(DEPDIR)/$(am__dirstamp) arch/neon.lo: arch/$(am__dirstamp) arch/$(DEPDIR)/$(am__dirstamp) arch/probe.lo: arch/$(am__dirstamp) arch/$(DEPDIR)/$(am__dirstamp) + libarch.la: $(libarch_la_OBJECTS) $(libarch_la_DEPENDENCIES) $(EXTRA_libarch_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libarch_la_OBJECTS) $(libarch_la_LIBADD) $(LIBS) auth/$(am__dirstamp): @@ -5582,8 +5896,10 @@ auth/Crypto.lo: auth/$(am__dirstamp) auth/$(DEPDIR)/$(am__dirstamp) auth/KeyRing.lo: auth/$(am__dirstamp) auth/$(DEPDIR)/$(am__dirstamp) auth/RotatingKeyRing.lo: auth/$(am__dirstamp) \ auth/$(DEPDIR)/$(am__dirstamp) + libauth.la: $(libauth_la_OBJECTS) $(libauth_la_DEPENDENCIES) $(EXTRA_libauth_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libauth_la_OBJECTS) $(libauth_la_LIBADD) $(LIBS) + libcephfs.la: $(libcephfs_la_OBJECTS) $(libcephfs_la_DEPENDENCIES) $(EXTRA_libcephfs_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcephfs_la_LINK) -rpath $(libdir) $(libcephfs_la_OBJECTS) $(libcephfs_la_LIBADD) $(LIBS) java/native/$(am__dirstamp): @@ -5598,6 +5914,7 @@ java/native/libcephfs_jni_la-libcephfs_jni.lo: \ java/native/libcephfs_jni_la-JniConstants.lo: \ java/native/$(am__dirstamp) \ java/native/$(DEPDIR)/$(am__dirstamp) + libcephfs_jni.la: $(libcephfs_jni_la_OBJECTS) $(libcephfs_jni_la_DEPENDENCIES) $(EXTRA_libcephfs_jni_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcephfs_jni_la_LINK) $(am_libcephfs_jni_la_rpath) $(libcephfs_jni_la_OBJECTS) $(libcephfs_jni_la_LIBADD) $(LIBS) client/$(am__dirstamp): @@ -5620,10 +5937,12 @@ client/MetaSession.lo: client/$(am__dirstamp) \ client/$(DEPDIR)/$(am__dirstamp) client/Trace.lo: client/$(am__dirstamp) \ client/$(DEPDIR)/$(am__dirstamp) + libclient.la: $(libclient_la_OBJECTS) $(libclient_la_DEPENDENCIES) $(EXTRA_libclient_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libclient_la_OBJECTS) $(libclient_la_LIBADD) $(LIBS) client/fuse_ll.lo: client/$(am__dirstamp) \ client/$(DEPDIR)/$(am__dirstamp) + libclient_fuse.la: $(libclient_fuse_la_OBJECTS) $(libclient_fuse_la_DEPENDENCIES) $(EXTRA_libclient_fuse_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(am_libclient_fuse_la_rpath) $(libclient_fuse_la_OBJECTS) $(libclient_fuse_la_LIBADD) $(LIBS) cls/hello/$(am__dirstamp): @@ -5634,6 +5953,7 @@ cls/hello/$(DEPDIR)/$(am__dirstamp): @: > cls/hello/$(DEPDIR)/$(am__dirstamp) cls/hello/cls_hello.lo: cls/hello/$(am__dirstamp) \ cls/hello/$(DEPDIR)/$(am__dirstamp) + libcls_hello.la: $(libcls_hello_la_OBJECTS) $(libcls_hello_la_DEPENDENCIES) $(EXTRA_libcls_hello_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_hello_la_LINK) -rpath $(radoslibdir) $(libcls_hello_la_OBJECTS) $(libcls_hello_la_LIBADD) $(LIBS) key_value_store/$(am__dirstamp): @@ -5644,6 +5964,7 @@ key_value_store/$(DEPDIR)/$(am__dirstamp): @: > key_value_store/$(DEPDIR)/$(am__dirstamp) key_value_store/cls_kvs.lo: key_value_store/$(am__dirstamp) \ key_value_store/$(DEPDIR)/$(am__dirstamp) + libcls_kvs.la: $(libcls_kvs_la_OBJECTS) $(libcls_kvs_la_DEPENDENCIES) $(EXTRA_libcls_kvs_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_kvs_la_LINK) $(am_libcls_kvs_la_rpath) $(libcls_kvs_la_OBJECTS) $(libcls_kvs_la_LIBADD) $(LIBS) cls/lock/$(am__dirstamp): @@ -5654,6 +5975,7 @@ cls/lock/$(DEPDIR)/$(am__dirstamp): @: > cls/lock/$(DEPDIR)/$(am__dirstamp) cls/lock/cls_lock.lo: cls/lock/$(am__dirstamp) \ cls/lock/$(DEPDIR)/$(am__dirstamp) + libcls_lock.la: $(libcls_lock_la_OBJECTS) $(libcls_lock_la_DEPENDENCIES) $(EXTRA_libcls_lock_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_lock_la_LINK) -rpath $(radoslibdir) $(libcls_lock_la_OBJECTS) $(libcls_lock_la_LIBADD) $(LIBS) cls/lock/cls_lock_client.lo: cls/lock/$(am__dirstamp) \ @@ -5662,10 +5984,12 @@ cls/lock/cls_lock_types.lo: cls/lock/$(am__dirstamp) \ cls/lock/$(DEPDIR)/$(am__dirstamp) cls/lock/cls_lock_ops.lo: cls/lock/$(am__dirstamp) \ cls/lock/$(DEPDIR)/$(am__dirstamp) + libcls_lock_client.la: $(libcls_lock_client_la_OBJECTS) $(libcls_lock_client_la_DEPENDENCIES) $(EXTRA_libcls_lock_client_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libcls_lock_client_la_OBJECTS) $(libcls_lock_client_la_LIBADD) $(LIBS) cls/log/cls_log.lo: cls/log/$(am__dirstamp) \ cls/log/$(DEPDIR)/$(am__dirstamp) + libcls_log.la: $(libcls_log_la_OBJECTS) $(libcls_log_la_DEPENDENCIES) $(EXTRA_libcls_log_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_log_la_LINK) -rpath $(radoslibdir) $(libcls_log_la_OBJECTS) $(libcls_log_la_LIBADD) $(LIBS) cls/rbd/$(am__dirstamp): @@ -5676,10 +6000,12 @@ cls/rbd/$(DEPDIR)/$(am__dirstamp): @: > cls/rbd/$(DEPDIR)/$(am__dirstamp) cls/rbd/cls_rbd.lo: cls/rbd/$(am__dirstamp) \ cls/rbd/$(DEPDIR)/$(am__dirstamp) + libcls_rbd.la: $(libcls_rbd_la_OBJECTS) $(libcls_rbd_la_DEPENDENCIES) $(EXTRA_libcls_rbd_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_rbd_la_LINK) -rpath $(radoslibdir) $(libcls_rbd_la_OBJECTS) $(libcls_rbd_la_LIBADD) $(LIBS) cls/rbd/cls_rbd_client.lo: cls/rbd/$(am__dirstamp) \ cls/rbd/$(DEPDIR)/$(am__dirstamp) + libcls_rbd_client.la: $(libcls_rbd_client_la_OBJECTS) $(libcls_rbd_client_la_DEPENDENCIES) $(EXTRA_libcls_rbd_client_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libcls_rbd_client_la_OBJECTS) $(libcls_rbd_client_la_LIBADD) $(LIBS) cls/refcount/$(am__dirstamp): @@ -5700,14 +6026,17 @@ common/$(DEPDIR)/$(am__dirstamp): @: > common/$(DEPDIR)/$(am__dirstamp) common/ceph_json.lo: common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) + libcls_refcount.la: $(libcls_refcount_la_OBJECTS) $(libcls_refcount_la_DEPENDENCIES) $(EXTRA_libcls_refcount_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_refcount_la_LINK) -rpath $(radoslibdir) $(libcls_refcount_la_OBJECTS) $(libcls_refcount_la_LIBADD) $(LIBS) cls/refcount/cls_refcount_client.lo: cls/refcount/$(am__dirstamp) \ cls/refcount/$(DEPDIR)/$(am__dirstamp) + libcls_refcount_client.la: $(libcls_refcount_client_la_OBJECTS) $(libcls_refcount_client_la_DEPENDENCIES) $(EXTRA_libcls_refcount_client_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libcls_refcount_client_la_OBJECTS) $(libcls_refcount_client_la_LIBADD) $(LIBS) cls/replica_log/cls_replica_log.lo: cls/replica_log/$(am__dirstamp) \ cls/replica_log/$(DEPDIR)/$(am__dirstamp) + libcls_replica_log.la: $(libcls_replica_log_la_OBJECTS) $(libcls_replica_log_la_DEPENDENCIES) $(EXTRA_libcls_replica_log_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_replica_log_la_LINK) -rpath $(radoslibdir) $(libcls_replica_log_la_OBJECTS) $(libcls_replica_log_la_LIBADD) $(LIBS) cls/rgw/$(am__dirstamp): @@ -5722,22 +6051,27 @@ cls/rgw/cls_rgw_ops.lo: cls/rgw/$(am__dirstamp) \ cls/rgw/$(DEPDIR)/$(am__dirstamp) cls/rgw/cls_rgw_types.lo: cls/rgw/$(am__dirstamp) \ cls/rgw/$(DEPDIR)/$(am__dirstamp) + libcls_rgw.la: $(libcls_rgw_la_OBJECTS) $(libcls_rgw_la_DEPENDENCIES) $(EXTRA_libcls_rgw_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_rgw_la_LINK) -rpath $(radoslibdir) $(libcls_rgw_la_OBJECTS) $(libcls_rgw_la_LIBADD) $(LIBS) cls/rgw/cls_rgw_client.lo: cls/rgw/$(am__dirstamp) \ cls/rgw/$(DEPDIR)/$(am__dirstamp) + libcls_rgw_client.la: $(libcls_rgw_client_la_OBJECTS) $(libcls_rgw_client_la_DEPENDENCIES) $(EXTRA_libcls_rgw_client_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libcls_rgw_client_la_OBJECTS) $(libcls_rgw_client_la_LIBADD) $(LIBS) cls/statelog/cls_statelog.lo: cls/statelog/$(am__dirstamp) \ cls/statelog/$(DEPDIR)/$(am__dirstamp) + libcls_statelog.la: $(libcls_statelog_la_OBJECTS) $(libcls_statelog_la_DEPENDENCIES) $(EXTRA_libcls_statelog_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_statelog_la_LINK) -rpath $(radoslibdir) $(libcls_statelog_la_OBJECTS) $(libcls_statelog_la_LIBADD) $(LIBS) cls/user/cls_user.lo: cls/user/$(am__dirstamp) \ cls/user/$(DEPDIR)/$(am__dirstamp) + libcls_user.la: $(libcls_user_la_OBJECTS) $(libcls_user_la_DEPENDENCIES) $(EXTRA_libcls_user_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_user_la_LINK) -rpath $(radoslibdir) $(libcls_user_la_OBJECTS) $(libcls_user_la_LIBADD) $(LIBS) cls/version/cls_version.lo: cls/version/$(am__dirstamp) \ cls/version/$(DEPDIR)/$(am__dirstamp) + libcls_version.la: $(libcls_version_la_OBJECTS) $(libcls_version_la_DEPENDENCIES) $(EXTRA_libcls_version_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcls_version_la_LINK) -rpath $(radoslibdir) $(libcls_version_la_OBJECTS) $(libcls_version_la_LIBADD) $(LIBS) common/DecayCounter.lo: common/$(am__dirstamp) \ @@ -5907,6 +6241,7 @@ mds/MDSMap.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) mds/inode_backtrace.lo: mds/$(am__dirstamp) \ mds/$(DEPDIR)/$(am__dirstamp) mds/mdstypes.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) + libcommon.la: $(libcommon_la_OBJECTS) $(libcommon_la_DEPENDENCIES) $(EXTRA_libcommon_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libcommon_la_OBJECTS) $(libcommon_la_LIBADD) $(LIBS) common/libcommon_crc_la-sctp_crc32.lo: common/$(am__dirstamp) \ @@ -5921,6 +6256,7 @@ common/libcommon_crc_la-crc32c_intel_fast_asm.lo: \ common/$(am__dirstamp) common/$(DEPDIR)/$(am__dirstamp) common/libcommon_crc_la-crc32c_intel_fast_zero_asm.lo: \ common/$(am__dirstamp) common/$(DEPDIR)/$(am__dirstamp) + libcommon_crc.la: $(libcommon_crc_la_OBJECTS) $(libcommon_crc_la_DEPENDENCIES) $(EXTRA_libcommon_crc_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcommon_crc_la_LINK) $(libcommon_crc_la_OBJECTS) $(libcommon_crc_la_LIBADD) $(LIBS) crush/$(am__dirstamp): @@ -5940,6 +6276,7 @@ crush/CrushCompiler.lo: crush/$(am__dirstamp) \ crush/$(DEPDIR)/$(am__dirstamp) crush/CrushTester.lo: crush/$(am__dirstamp) \ crush/$(DEPDIR)/$(am__dirstamp) + libcrush.la: $(libcrush_la_OBJECTS) $(libcrush_la_DEPENDENCIES) $(EXTRA_libcrush_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libcrush_la_OBJECTS) $(libcrush_la_LIBADD) $(LIBS) test/erasure-code/$(am__dirstamp): @@ -5951,21 +6288,25 @@ test/erasure-code/$(DEPDIR)/$(am__dirstamp): test/erasure-code/libec_example_la-ErasureCodePluginExample.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_example.la: $(libec_example_la_OBJECTS) $(libec_example_la_DEPENDENCIES) $(EXTRA_libec_example_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_example_la_LINK) -rpath $(erasure_codelibdir) $(libec_example_la_OBJECTS) $(libec_example_la_LIBADD) $(LIBS) test/erasure-code/libec_fail_to_initialize_la-ErasureCodePluginFailToInitialize.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_fail_to_initialize.la: $(libec_fail_to_initialize_la_OBJECTS) $(libec_fail_to_initialize_la_DEPENDENCIES) $(EXTRA_libec_fail_to_initialize_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_fail_to_initialize_la_LINK) -rpath $(erasure_codelibdir) $(libec_fail_to_initialize_la_OBJECTS) $(libec_fail_to_initialize_la_LIBADD) $(LIBS) test/erasure-code/libec_fail_to_register_la-ErasureCodePluginFailToRegister.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_fail_to_register.la: $(libec_fail_to_register_la_OBJECTS) $(libec_fail_to_register_la_DEPENDENCIES) $(EXTRA_libec_fail_to_register_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_fail_to_register_la_LINK) -rpath $(erasure_codelibdir) $(libec_fail_to_register_la_OBJECTS) $(libec_fail_to_register_la_LIBADD) $(LIBS) test/erasure-code/libec_hangs_la-ErasureCodePluginHangs.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_hangs.la: $(libec_hangs_la_OBJECTS) $(libec_hangs_la_DEPENDENCIES) $(EXTRA_libec_hangs_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_hangs_la_LINK) -rpath $(erasure_codelibdir) $(libec_hangs_la_OBJECTS) $(libec_hangs_la_LIBADD) $(LIBS) erasure-code/jerasure/$(am__dirstamp): @@ -5977,6 +6318,7 @@ erasure-code/jerasure/$(DEPDIR)/$(am__dirstamp): erasure-code/jerasure/libec_jerasure_la-ErasureCodePluginSelectJerasure.lo: \ erasure-code/jerasure/$(am__dirstamp) \ erasure-code/jerasure/$(DEPDIR)/$(am__dirstamp) + libec_jerasure.la: $(libec_jerasure_la_OBJECTS) $(libec_jerasure_la_DEPENDENCIES) $(EXTRA_libec_jerasure_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_jerasure_la_LINK) -rpath $(erasure_codelibdir) $(libec_jerasure_la_OBJECTS) $(libec_jerasure_la_LIBADD) $(LIBS) erasure-code/jerasure/jerasure/src/$(am__dirstamp): @@ -6045,6 +6387,7 @@ erasure-code/jerasure/libec_jerasure_generic_la-ErasureCodePluginJerasure.lo: \ erasure-code/jerasure/libec_jerasure_generic_la-ErasureCodeJerasure.lo: \ erasure-code/jerasure/$(am__dirstamp) \ erasure-code/jerasure/$(DEPDIR)/$(am__dirstamp) + libec_jerasure_generic.la: $(libec_jerasure_generic_la_OBJECTS) $(libec_jerasure_generic_la_DEPENDENCIES) $(EXTRA_libec_jerasure_generic_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_jerasure_generic_la_LINK) -rpath $(erasure_codelibdir) $(libec_jerasure_generic_la_OBJECTS) $(libec_jerasure_generic_la_LIBADD) $(LIBS) erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-cauchy.lo: \ @@ -6101,6 +6444,7 @@ erasure-code/jerasure/libec_jerasure_sse3_la-ErasureCodePluginJerasure.lo: \ erasure-code/jerasure/libec_jerasure_sse3_la-ErasureCodeJerasure.lo: \ erasure-code/jerasure/$(am__dirstamp) \ erasure-code/jerasure/$(DEPDIR)/$(am__dirstamp) + libec_jerasure_sse3.la: $(libec_jerasure_sse3_la_OBJECTS) $(libec_jerasure_sse3_la_DEPENDENCIES) $(EXTRA_libec_jerasure_sse3_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_jerasure_sse3_la_LINK) -rpath $(erasure_codelibdir) $(libec_jerasure_sse3_la_OBJECTS) $(libec_jerasure_sse3_la_LIBADD) $(LIBS) erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-cauchy.lo: \ @@ -6157,26 +6501,31 @@ erasure-code/jerasure/libec_jerasure_sse4_la-ErasureCodePluginJerasure.lo: \ erasure-code/jerasure/libec_jerasure_sse4_la-ErasureCodeJerasure.lo: \ erasure-code/jerasure/$(am__dirstamp) \ erasure-code/jerasure/$(DEPDIR)/$(am__dirstamp) + libec_jerasure_sse4.la: $(libec_jerasure_sse4_la_OBJECTS) $(libec_jerasure_sse4_la_DEPENDENCIES) $(EXTRA_libec_jerasure_sse4_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_jerasure_sse4_la_LINK) -rpath $(erasure_codelibdir) $(libec_jerasure_sse4_la_OBJECTS) $(libec_jerasure_sse4_la_LIBADD) $(LIBS) test/erasure-code/libec_missing_entry_point_la-ErasureCodePluginMissingEntryPoint.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_missing_entry_point.la: $(libec_missing_entry_point_la_OBJECTS) $(libec_missing_entry_point_la_DEPENDENCIES) $(EXTRA_libec_missing_entry_point_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_missing_entry_point_la_LINK) -rpath $(erasure_codelibdir) $(libec_missing_entry_point_la_OBJECTS) $(libec_missing_entry_point_la_LIBADD) $(LIBS) test/erasure-code/libec_test_jerasure_generic_la-TestJerasurePluginGeneric.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_test_jerasure_generic.la: $(libec_test_jerasure_generic_la_OBJECTS) $(libec_test_jerasure_generic_la_DEPENDENCIES) $(EXTRA_libec_test_jerasure_generic_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_test_jerasure_generic_la_LINK) -rpath $(erasure_codelibdir) $(libec_test_jerasure_generic_la_OBJECTS) $(libec_test_jerasure_generic_la_LIBADD) $(LIBS) test/erasure-code/libec_test_jerasure_sse3_la-TestJerasurePluginSSE3.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_test_jerasure_sse3.la: $(libec_test_jerasure_sse3_la_OBJECTS) $(libec_test_jerasure_sse3_la_DEPENDENCIES) $(EXTRA_libec_test_jerasure_sse3_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_test_jerasure_sse3_la_LINK) -rpath $(erasure_codelibdir) $(libec_test_jerasure_sse3_la_OBJECTS) $(libec_test_jerasure_sse3_la_LIBADD) $(LIBS) test/erasure-code/libec_test_jerasure_sse4_la-TestJerasurePluginSSE4.lo: \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + libec_test_jerasure_sse4.la: $(libec_test_jerasure_sse4_la_OBJECTS) $(libec_test_jerasure_sse4_la_DEPENDENCIES) $(EXTRA_libec_test_jerasure_sse4_la_DEPENDENCIES) $(AM_V_CXXLD)$(libec_test_jerasure_sse4_la_LINK) -rpath $(erasure_codelibdir) $(libec_test_jerasure_sse4_la_OBJECTS) $(libec_test_jerasure_sse4_la_LIBADD) $(LIBS) erasure-code/$(am__dirstamp): @@ -6187,6 +6536,7 @@ erasure-code/$(DEPDIR)/$(am__dirstamp): @: > erasure-code/$(DEPDIR)/$(am__dirstamp) erasure-code/ErasureCodePlugin.lo: erasure-code/$(am__dirstamp) \ erasure-code/$(DEPDIR)/$(am__dirstamp) + liberasure_code.la: $(liberasure_code_la_OBJECTS) $(liberasure_code_la_DEPENDENCIES) $(EXTRA_liberasure_code_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(liberasure_code_la_OBJECTS) $(liberasure_code_la_LIBADD) $(LIBS) global/$(am__dirstamp): @@ -6203,6 +6553,7 @@ global/pidfile.lo: global/$(am__dirstamp) \ global/$(DEPDIR)/$(am__dirstamp) global/signal_handler.lo: global/$(am__dirstamp) \ global/$(DEPDIR)/$(am__dirstamp) + libglobal.la: $(libglobal_la_OBJECTS) $(libglobal_la_DEPENDENCIES) $(EXTRA_libglobal_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libglobal_la_OBJECTS) $(libglobal_la_LIBADD) $(LIBS) json_spirit/$(am__dirstamp): @@ -6215,6 +6566,7 @@ json_spirit/json_spirit_reader.lo: json_spirit/$(am__dirstamp) \ json_spirit/$(DEPDIR)/$(am__dirstamp) json_spirit/json_spirit_writer.lo: json_spirit/$(am__dirstamp) \ json_spirit/$(DEPDIR)/$(am__dirstamp) + libjson_spirit.la: $(libjson_spirit_la_OBJECTS) $(libjson_spirit_la_DEPENDENCIES) $(EXTRA_libjson_spirit_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libjson_spirit_la_OBJECTS) $(libjson_spirit_la_LIBADD) $(LIBS) log/$(am__dirstamp): @@ -6225,6 +6577,7 @@ log/$(DEPDIR)/$(am__dirstamp): @: > log/$(DEPDIR)/$(am__dirstamp) log/Log.lo: log/$(am__dirstamp) log/$(DEPDIR)/$(am__dirstamp) log/SubsystemMap.lo: log/$(am__dirstamp) log/$(DEPDIR)/$(am__dirstamp) + liblog.la: $(liblog_la_OBJECTS) $(liblog_la_DEPENDENCIES) $(EXTRA_liblog_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(liblog_la_OBJECTS) $(liblog_la_LIBADD) $(LIBS) mds/Anchor.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) @@ -6259,6 +6612,7 @@ mds/snap.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) mds/SessionMap.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) mds/MDLog.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) mds/MDSUtility.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) + libmds.la: $(libmds_la_OBJECTS) $(libmds_la_DEPENDENCIES) $(EXTRA_libmds_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libmds_la_OBJECTS) $(libmds_la_LIBADD) $(LIBS) mon/Monitor.lo: mon/$(am__dirstamp) mon/$(DEPDIR)/$(am__dirstamp) @@ -6279,9 +6633,11 @@ mon/DataHealthService.lo: mon/$(am__dirstamp) \ mon/$(DEPDIR)/$(am__dirstamp) mon/ConfigKeyService.lo: mon/$(am__dirstamp) \ mon/$(DEPDIR)/$(am__dirstamp) + libmon.la: $(libmon_la_OBJECTS) $(libmon_la_DEPENDENCIES) $(EXTRA_libmon_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libmon_la_OBJECTS) $(libmon_la_LIBADD) $(LIBS) mon/PGMap.lo: mon/$(am__dirstamp) mon/$(DEPDIR)/$(am__dirstamp) + libmon_types.la: $(libmon_types_la_OBJECTS) $(libmon_types_la_DEPENDENCIES) $(EXTRA_libmon_types_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libmon_types_la_OBJECTS) $(libmon_types_la_LIBADD) $(LIBS) msg/$(am__dirstamp): @@ -6299,6 +6655,7 @@ msg/Pipe.lo: msg/$(am__dirstamp) msg/$(DEPDIR)/$(am__dirstamp) msg/SimpleMessenger.lo: msg/$(am__dirstamp) \ msg/$(DEPDIR)/$(am__dirstamp) msg/msg_types.lo: msg/$(am__dirstamp) msg/$(DEPDIR)/$(am__dirstamp) + libmsg.la: $(libmsg_la_OBJECTS) $(libmsg_la_DEPENDENCIES) $(EXTRA_libmsg_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libmsg_la_OBJECTS) $(libmsg_la_LIBADD) $(LIBS) os/libos_la-chain_xattr.lo: os/$(am__dirstamp) \ @@ -6341,10 +6698,12 @@ os/libos_la-XfsFileStoreBackend.lo: os/$(am__dirstamp) \ os/$(DEPDIR)/$(am__dirstamp) os/libos_la-ZFSFileStoreBackend.lo: os/$(am__dirstamp) \ os/$(DEPDIR)/$(am__dirstamp) + libos.la: $(libos_la_OBJECTS) $(libos_la_DEPENDENCIES) $(EXTRA_libos_la_DEPENDENCIES) $(AM_V_CXXLD)$(libos_la_LINK) $(libos_la_OBJECTS) $(libos_la_LIBADD) $(LIBS) os/libos_types_la-Transaction.lo: os/$(am__dirstamp) \ os/$(DEPDIR)/$(am__dirstamp) + libos_types.la: $(libos_types_la_OBJECTS) $(libos_types_la_DEPENDENCIES) $(EXTRA_libos_types_la_DEPENDENCIES) $(AM_V_CXXLD)$(libos_types_la_LINK) $(libos_types_la_OBJECTS) $(libos_types_la_LIBADD) $(LIBS) osd/libosd_la-PG.lo: osd/$(am__dirstamp) osd/$(DEPDIR)/$(am__dirstamp) @@ -6386,6 +6745,7 @@ objclass/$(DEPDIR)/$(am__dirstamp): @: > objclass/$(DEPDIR)/$(am__dirstamp) objclass/libosd_la-class_api.lo: objclass/$(am__dirstamp) \ objclass/$(DEPDIR)/$(am__dirstamp) + libosd.la: $(libosd_la_OBJECTS) $(libosd_la_DEPENDENCIES) $(EXTRA_libosd_la_DEPENDENCIES) $(AM_V_CXXLD)$(libosd_la_LINK) $(libosd_la_OBJECTS) $(libosd_la_LIBADD) $(LIBS) osd/libosd_types_la-PGLog.lo: osd/$(am__dirstamp) \ @@ -6394,6 +6754,7 @@ osd/libosd_types_la-osd_types.lo: osd/$(am__dirstamp) \ osd/$(DEPDIR)/$(am__dirstamp) osd/libosd_types_la-ECUtil.lo: osd/$(am__dirstamp) \ osd/$(DEPDIR)/$(am__dirstamp) + libosd_types.la: $(libosd_types_la_OBJECTS) $(libosd_types_la_DEPENDENCIES) $(EXTRA_libosd_types_la_DEPENDENCIES) $(AM_V_CXXLD)$(libosd_types_la_LINK) $(libosd_types_la_OBJECTS) $(libosd_types_la_LIBADD) $(LIBS) osdc/$(am__dirstamp): @@ -6408,6 +6769,7 @@ osdc/ObjectCacher.lo: osdc/$(am__dirstamp) \ osdc/Filer.lo: osdc/$(am__dirstamp) osdc/$(DEPDIR)/$(am__dirstamp) osdc/Striper.lo: osdc/$(am__dirstamp) osdc/$(DEPDIR)/$(am__dirstamp) osdc/Journaler.lo: osdc/$(am__dirstamp) osdc/$(DEPDIR)/$(am__dirstamp) + libosdc.la: $(libosdc_la_OBJECTS) $(libosdc_la_DEPENDENCIES) $(EXTRA_libosdc_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libosdc_la_OBJECTS) $(libosdc_la_LIBADD) $(LIBS) perfglue/$(am__dirstamp): @@ -6424,6 +6786,7 @@ perfglue/cpu_profiler.lo: perfglue/$(am__dirstamp) \ perfglue/$(DEPDIR)/$(am__dirstamp) perfglue/disabled_stubs.lo: perfglue/$(am__dirstamp) \ perfglue/$(DEPDIR)/$(am__dirstamp) + libperfglue.la: $(libperfglue_la_OBJECTS) $(libperfglue_la_DEPENDENCIES) $(EXTRA_libperfglue_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(libperfglue_la_OBJECTS) $(libperfglue_la_LIBADD) $(LIBS) librados/$(am__dirstamp): @@ -6440,6 +6803,7 @@ librados/librados_la-IoCtxImpl.lo: librados/$(am__dirstamp) \ librados/$(DEPDIR)/$(am__dirstamp) librados/librados_la-snap_set_diff.lo: librados/$(am__dirstamp) \ librados/$(DEPDIR)/$(am__dirstamp) + librados.la: $(librados_la_OBJECTS) $(librados_la_DEPENDENCIES) $(EXTRA_librados_la_DEPENDENCIES) $(AM_V_CXXLD)$(librados_la_LINK) -rpath $(libdir) $(librados_la_OBJECTS) $(librados_la_LIBADD) $(LIBS) test/librados/$(am__dirstamp): @@ -6453,6 +6817,7 @@ test/librados/libradostest_la-test.lo: test/librados/$(am__dirstamp) \ test/librados/libradostest_la-TestCase.lo: \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + libradostest.la: $(libradostest_la_OBJECTS) $(libradostest_la_DEPENDENCIES) $(EXTRA_libradostest_la_DEPENDENCIES) $(AM_V_CXXLD)$(libradostest_la_LINK) $(libradostest_la_OBJECTS) $(libradostest_la_LIBADD) $(LIBS) librbd/$(am__dirstamp): @@ -6475,6 +6840,7 @@ librbd/LibrbdWriteback.lo: librbd/$(am__dirstamp) \ librbd/$(DEPDIR)/$(am__dirstamp) librbd/WatchCtx.lo: librbd/$(am__dirstamp) \ librbd/$(DEPDIR)/$(am__dirstamp) + librbd.la: $(librbd_la_OBJECTS) $(librbd_la_DEPENDENCIES) $(EXTRA_librbd_la_DEPENDENCIES) $(AM_V_CXXLD)$(librbd_la_LINK) -rpath $(libdir) $(librbd_la_OBJECTS) $(librbd_la_LIBADD) $(LIBS) rgw/$(am__dirstamp): @@ -6551,6 +6917,7 @@ rgw/librgw_la-rgw_quota.lo: rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) rgw/librgw_la-rgw_dencoder.lo: rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + librgw.la: $(librgw_la_OBJECTS) $(librgw_la_DEPENDENCIES) $(EXTRA_librgw_la_DEPENDENCIES) $(AM_V_CXXLD)$(librgw_la_LINK) $(am_librgw_la_rpath) $(librgw_la_OBJECTS) $(librgw_la_LIBADD) $(LIBS) test/system/$(am__dirstamp): @@ -6565,18 +6932,24 @@ test/system/systest_runnable.lo: test/system/$(am__dirstamp) \ test/system/$(DEPDIR)/$(am__dirstamp) test/system/systest_settings.lo: test/system/$(am__dirstamp) \ test/system/$(DEPDIR)/$(am__dirstamp) + libsystest.la: $(libsystest_la_OBJECTS) $(libsystest_la_DEPENDENCIES) $(EXTRA_libsystest_la_DEPENDENCIES) $(AM_V_CXXLD)$(CXXLINK) $(am_libsystest_la_rpath) $(libsystest_la_OBJECTS) $(libsystest_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -6597,7 +6970,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -6630,14 +7004,19 @@ clean-noinstPROGRAMS: rm -f $$list install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -6658,7 +7037,8 @@ uninstall-sbinPROGRAMS: @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(sbindir)" && rm -f $$files @@ -6673,14 +7053,19 @@ clean-sbinPROGRAMS: rm -f $$list install-su_sbinPROGRAMS: $(su_sbin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(su_sbindir)" || $(MKDIR_P) "$(DESTDIR)$(su_sbindir)" @list='$(su_sbin_PROGRAMS)'; test -n "$(su_sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(su_sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(su_sbindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -6701,7 +7086,8 @@ uninstall-su_sbinPROGRAMS: @list='$(su_sbin_PROGRAMS)'; test -n "$(su_sbindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(su_sbindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(su_sbindir)" && rm -f $$files @@ -6722,16 +7108,19 @@ tools/$(DEPDIR)/$(am__dirstamp): @: > tools/$(DEPDIR)/$(am__dirstamp) tools/ceph_authtool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph-authtool$(EXEEXT): $(ceph_authtool_OBJECTS) $(ceph_authtool_DEPENDENCIES) $(EXTRA_ceph_authtool_DEPENDENCIES) @rm -f ceph-authtool$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_authtool_OBJECTS) $(ceph_authtool_LDADD) $(LIBS) tools/ceph-client-debug.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph-client-debug$(EXEEXT): $(ceph_client_debug_OBJECTS) $(ceph_client_debug_DEPENDENCIES) $(EXTRA_ceph_client_debug_DEPENDENCIES) @rm -f ceph-client-debug$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_client_debug_OBJECTS) $(ceph_client_debug_LDADD) $(LIBS) tools/ceph_conf.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph-conf$(EXEEXT): $(ceph_conf_OBJECTS) $(ceph_conf_DEPENDENCIES) $(EXTRA_ceph_conf_DEPENDENCIES) @rm -f ceph-conf$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_conf_OBJECTS) $(ceph_conf_LDADD) $(LIBS) @@ -6754,38 +7143,47 @@ rgw/ceph_dencoder-rgw_env.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) rgw/ceph_dencoder-rgw_json_enc.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + ceph-dencoder$(EXEEXT): $(ceph_dencoder_OBJECTS) $(ceph_dencoder_DEPENDENCIES) $(EXTRA_ceph_dencoder_DEPENDENCIES) @rm -f ceph-dencoder$(EXEEXT) $(AM_V_CXXLD)$(ceph_dencoder_LINK) $(ceph_dencoder_OBJECTS) $(ceph_dencoder_LDADD) $(LIBS) + ceph-fuse$(EXEEXT): $(ceph_fuse_OBJECTS) $(ceph_fuse_DEPENDENCIES) $(EXTRA_ceph_fuse_DEPENDENCIES) @rm -f ceph-fuse$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_fuse_OBJECTS) $(ceph_fuse_LDADD) $(LIBS) tools/ceph_kvstore_tool-ceph_kvstore_tool.$(OBJEXT): \ tools/$(am__dirstamp) tools/$(DEPDIR)/$(am__dirstamp) + ceph-kvstore-tool$(EXEEXT): $(ceph_kvstore_tool_OBJECTS) $(ceph_kvstore_tool_DEPENDENCIES) $(EXTRA_ceph_kvstore_tool_DEPENDENCIES) @rm -f ceph-kvstore-tool$(EXEEXT) $(AM_V_CXXLD)$(ceph_kvstore_tool_LINK) $(ceph_kvstore_tool_OBJECTS) $(ceph_kvstore_tool_LDADD) $(LIBS) + ceph-mds$(EXEEXT): $(ceph_mds_OBJECTS) $(ceph_mds_DEPENDENCIES) $(EXTRA_ceph_mds_DEPENDENCIES) @rm -f ceph-mds$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_mds_OBJECTS) $(ceph_mds_LDADD) $(LIBS) + ceph-mon$(EXEEXT): $(ceph_mon_OBJECTS) $(ceph_mon_DEPENDENCIES) $(EXTRA_ceph_mon_DEPENDENCIES) @rm -f ceph-mon$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_mon_OBJECTS) $(ceph_mon_LDADD) $(LIBS) tools/ceph_monstore_tool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph-monstore-tool$(EXEEXT): $(ceph_monstore_tool_OBJECTS) $(ceph_monstore_tool_DEPENDENCIES) $(EXTRA_ceph_monstore_tool_DEPENDENCIES) @rm -f ceph-monstore-tool$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_monstore_tool_OBJECTS) $(ceph_monstore_tool_LDADD) $(LIBS) + ceph-osd$(EXEEXT): $(ceph_osd_OBJECTS) $(ceph_osd_DEPENDENCIES) $(EXTRA_ceph_osd_DEPENDENCIES) @rm -f ceph-osd$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_osd_OBJECTS) $(ceph_osd_LDADD) $(LIBS) tools/ceph_osdomap_tool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph-osdomap-tool$(EXEEXT): $(ceph_osdomap_tool_OBJECTS) $(ceph_osdomap_tool_DEPENDENCIES) $(EXTRA_ceph_osdomap_tool_DEPENDENCIES) @rm -f ceph-osdomap-tool$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_osdomap_tool_OBJECTS) $(ceph_osdomap_tool_LDADD) $(LIBS) client/SyntheticClient.$(OBJEXT): client/$(am__dirstamp) \ client/$(DEPDIR)/$(am__dirstamp) + ceph-syn$(EXEEXT): $(ceph_syn_OBJECTS) $(ceph_syn_DEPENDENCIES) $(EXTRA_ceph_syn_DEPENDENCIES) @rm -f ceph-syn$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_syn_OBJECTS) $(ceph_syn_LDADD) $(LIBS) @@ -6797,33 +7195,46 @@ test/$(DEPDIR)/$(am__dirstamp): @: > test/$(DEPDIR)/$(am__dirstamp) test/bench_log.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_bench_log$(EXEEXT): $(ceph_bench_log_OBJECTS) $(ceph_bench_log_DEPENDENCIES) $(EXTRA_ceph_bench_log_DEPENDENCIES) @rm -f ceph_bench_log$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_bench_log_OBJECTS) $(ceph_bench_log_LDADD) $(LIBS) tools/dupstore.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_dupstore$(EXEEXT): $(ceph_dupstore_OBJECTS) $(ceph_dupstore_DEPENDENCIES) $(EXTRA_ceph_dupstore_DEPENDENCIES) @rm -f ceph_dupstore$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_dupstore_OBJECTS) $(ceph_dupstore_LDADD) $(LIBS) test/erasure-code/ceph_erasure_code.$(OBJEXT): \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + ceph_erasure_code$(EXEEXT): $(ceph_erasure_code_OBJECTS) $(ceph_erasure_code_DEPENDENCIES) $(EXTRA_ceph_erasure_code_DEPENDENCIES) @rm -f ceph_erasure_code$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_erasure_code_OBJECTS) $(ceph_erasure_code_LDADD) $(LIBS) test/erasure-code/ceph_erasure_code_benchmark.$(OBJEXT): \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + ceph_erasure_code_benchmark$(EXEEXT): $(ceph_erasure_code_benchmark_OBJECTS) $(ceph_erasure_code_benchmark_DEPENDENCIES) $(EXTRA_ceph_erasure_code_benchmark_DEPENDENCIES) @rm -f ceph_erasure_code_benchmark$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_erasure_code_benchmark_OBJECTS) $(ceph_erasure_code_benchmark_LDADD) $(LIBS) +test/erasure-code/ceph_erasure_code_non_regression.$(OBJEXT): \ + test/erasure-code/$(am__dirstamp) \ + test/erasure-code/$(DEPDIR)/$(am__dirstamp) + +ceph_erasure_code_non_regression$(EXEEXT): $(ceph_erasure_code_non_regression_OBJECTS) $(ceph_erasure_code_non_regression_DEPENDENCIES) $(EXTRA_ceph_erasure_code_non_regression_DEPENDENCIES) + @rm -f ceph_erasure_code_non_regression$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(ceph_erasure_code_non_regression_OBJECTS) $(ceph_erasure_code_non_regression_LDADD) $(LIBS) tools/ceph_filestore_dump.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_filestore_dump$(EXEEXT): $(ceph_filestore_dump_OBJECTS) $(ceph_filestore_dump_DEPENDENCIES) $(EXTRA_ceph_filestore_dump_DEPENDENCIES) @rm -f ceph_filestore_dump$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_filestore_dump_OBJECTS) $(ceph_filestore_dump_LDADD) $(LIBS) tools/ceph_filestore_tool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_filestore_tool$(EXEEXT): $(ceph_filestore_tool_OBJECTS) $(ceph_filestore_tool_DEPENDENCIES) $(EXTRA_ceph_filestore_tool_DEPENDENCIES) @rm -f ceph_filestore_tool$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_filestore_tool_OBJECTS) $(ceph_filestore_tool_LDADD) $(LIBS) @@ -6832,31 +7243,37 @@ test/kv_store_bench.$(OBJEXT): test/$(am__dirstamp) \ key_value_store/kv_flat_btree_async.$(OBJEXT): \ key_value_store/$(am__dirstamp) \ key_value_store/$(DEPDIR)/$(am__dirstamp) + ceph_kvstorebench$(EXEEXT): $(ceph_kvstorebench_OBJECTS) $(ceph_kvstorebench_DEPENDENCIES) $(EXTRA_ceph_kvstorebench_DEPENDENCIES) @rm -f ceph_kvstorebench$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_kvstorebench_OBJECTS) $(ceph_kvstorebench_LDADD) $(LIBS) tools/mon_store_converter.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_mon_store_converter$(EXEEXT): $(ceph_mon_store_converter_OBJECTS) $(ceph_mon_store_converter_DEPENDENCIES) $(EXTRA_ceph_mon_store_converter_DEPENDENCIES) @rm -f ceph_mon_store_converter$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_mon_store_converter_OBJECTS) $(ceph_mon_store_converter_LDADD) $(LIBS) test/multi_stress_watch.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_multi_stress_watch$(EXEEXT): $(ceph_multi_stress_watch_OBJECTS) $(ceph_multi_stress_watch_DEPENDENCIES) $(EXTRA_ceph_multi_stress_watch_DEPENDENCIES) @rm -f ceph_multi_stress_watch$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_multi_stress_watch_OBJECTS) $(ceph_multi_stress_watch_LDADD) $(LIBS) test/omap_bench.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_omapbench$(EXEEXT): $(ceph_omapbench_OBJECTS) $(ceph_omapbench_DEPENDENCIES) $(EXTRA_ceph_omapbench_DEPENDENCIES) @rm -f ceph_omapbench$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_omapbench_OBJECTS) $(ceph_omapbench_LDADD) $(LIBS) tools/psim.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_psim$(EXEEXT): $(ceph_psim_OBJECTS) $(ceph_psim_DEPENDENCIES) $(EXTRA_ceph_psim_DEPENDENCIES) @rm -f ceph_psim$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_psim_OBJECTS) $(ceph_psim_LDADD) $(LIBS) tools/radosacl.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_radosacl$(EXEEXT): $(ceph_radosacl_OBJECTS) $(ceph_radosacl_DEPENDENCIES) $(EXTRA_ceph_radosacl_DEPENDENCIES) @rm -f ceph_radosacl$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_radosacl_OBJECTS) $(ceph_radosacl_LDADD) $(LIBS) @@ -6868,21 +7285,25 @@ rgw/rgw_env.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) rgw/rgw_json_enc.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + ceph_rgw_jsonparser$(EXEEXT): $(ceph_rgw_jsonparser_OBJECTS) $(ceph_rgw_jsonparser_DEPENDENCIES) $(EXTRA_ceph_rgw_jsonparser_DEPENDENCIES) @rm -f ceph_rgw_jsonparser$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_rgw_jsonparser_OBJECTS) $(ceph_rgw_jsonparser_LDADD) $(LIBS) rgw/rgw_multiparser.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + ceph_rgw_multiparser$(EXEEXT): $(ceph_rgw_multiparser_OBJECTS) $(ceph_rgw_multiparser_DEPENDENCIES) $(EXTRA_ceph_rgw_multiparser_DEPENDENCIES) @rm -f ceph_rgw_multiparser$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_rgw_multiparser_OBJECTS) $(ceph_rgw_multiparser_LDADD) $(LIBS) tools/scratchtool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_scratchtool$(EXEEXT): $(ceph_scratchtool_OBJECTS) $(ceph_scratchtool_DEPENDENCIES) $(EXTRA_ceph_scratchtool_DEPENDENCIES) @rm -f ceph_scratchtool$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ceph_scratchtool_OBJECTS) $(ceph_scratchtool_LDADD) $(LIBS) tools/scratchtoolpp.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + ceph_scratchtoolpp$(EXEEXT): $(ceph_scratchtoolpp_OBJECTS) $(ceph_scratchtoolpp_DEPENDENCIES) $(EXTRA_ceph_scratchtoolpp_DEPENDENCIES) @rm -f ceph_scratchtoolpp$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_scratchtoolpp_OBJECTS) $(ceph_scratchtoolpp_LDADD) $(LIBS) @@ -6901,6 +7322,7 @@ test/bench/detailed_stat_collector.$(OBJEXT): \ test/bench/$(DEPDIR)/$(am__dirstamp) test/bench/bencher.$(OBJEXT): test/bench/$(am__dirstamp) \ test/bench/$(DEPDIR)/$(am__dirstamp) + ceph_smalliobench$(EXEEXT): $(ceph_smalliobench_OBJECTS) $(ceph_smalliobench_DEPENDENCIES) $(EXTRA_ceph_smalliobench_DEPENDENCIES) @rm -f ceph_smalliobench$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_smalliobench_OBJECTS) $(ceph_smalliobench_LDADD) $(LIBS) @@ -6908,6 +7330,7 @@ test/bench/small_io_bench_dumb.$(OBJEXT): test/bench/$(am__dirstamp) \ test/bench/$(DEPDIR)/$(am__dirstamp) test/bench/dumb_backend.$(OBJEXT): test/bench/$(am__dirstamp) \ test/bench/$(DEPDIR)/$(am__dirstamp) + ceph_smalliobenchdumb$(EXEEXT): $(ceph_smalliobenchdumb_OBJECTS) $(ceph_smalliobenchdumb_DEPENDENCIES) $(EXTRA_ceph_smalliobenchdumb_DEPENDENCIES) @rm -f ceph_smalliobenchdumb$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_smalliobenchdumb_OBJECTS) $(ceph_smalliobenchdumb_LDADD) $(LIBS) @@ -6916,6 +7339,7 @@ test/bench/small_io_bench_fs.$(OBJEXT): test/bench/$(am__dirstamp) \ test/bench/testfilestore_backend.$(OBJEXT): \ test/bench/$(am__dirstamp) \ test/bench/$(DEPDIR)/$(am__dirstamp) + ceph_smalliobenchfs$(EXEEXT): $(ceph_smalliobenchfs_OBJECTS) $(ceph_smalliobenchfs_DEPENDENCIES) $(EXTRA_ceph_smalliobenchfs_DEPENDENCIES) @rm -f ceph_smalliobenchfs$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_smalliobenchfs_OBJECTS) $(ceph_smalliobenchfs_LDADD) $(LIBS) @@ -6923,21 +7347,25 @@ test/bench/small_io_bench_rbd.$(OBJEXT): test/bench/$(am__dirstamp) \ test/bench/$(DEPDIR)/$(am__dirstamp) test/bench/rbd_backend.$(OBJEXT): test/bench/$(am__dirstamp) \ test/bench/$(DEPDIR)/$(am__dirstamp) + ceph_smalliobenchrbd$(EXEEXT): $(ceph_smalliobenchrbd_OBJECTS) $(ceph_smalliobenchrbd_DEPENDENCIES) $(EXTRA_ceph_smalliobenchrbd_DEPENDENCIES) @rm -f ceph_smalliobenchrbd$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_smalliobenchrbd_OBJECTS) $(ceph_smalliobenchrbd_LDADD) $(LIBS) test/streamtest.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_streamtest$(EXEEXT): $(ceph_streamtest_OBJECTS) $(ceph_streamtest_DEPENDENCIES) $(EXTRA_ceph_streamtest_DEPENDENCIES) @rm -f ceph_streamtest$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_streamtest_OBJECTS) $(ceph_streamtest_LDADD) $(LIBS) test/test_c_headers.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_c_headers$(EXEEXT): $(ceph_test_c_headers_OBJECTS) $(ceph_test_c_headers_DEPENDENCIES) $(EXTRA_ceph_test_c_headers_DEPENDENCIES) @rm -f ceph_test_c_headers$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ceph_test_c_headers_OBJECTS) $(ceph_test_c_headers_LDADD) $(LIBS) test/test_cfuse_cache_invalidate.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_cfuse_cache_invalidate$(EXEEXT): $(ceph_test_cfuse_cache_invalidate_OBJECTS) $(ceph_test_cfuse_cache_invalidate_DEPENDENCIES) $(EXTRA_ceph_test_cfuse_cache_invalidate_DEPENDENCIES) @rm -f ceph_test_cfuse_cache_invalidate$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_cfuse_cache_invalidate_OBJECTS) $(ceph_test_cfuse_cache_invalidate_LDADD) $(LIBS) @@ -6950,6 +7378,7 @@ test/cls_hello/$(DEPDIR)/$(am__dirstamp): test/cls_hello/ceph_test_cls_hello-test_cls_hello.$(OBJEXT): \ test/cls_hello/$(am__dirstamp) \ test/cls_hello/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_hello$(EXEEXT): $(ceph_test_cls_hello_OBJECTS) $(ceph_test_cls_hello_DEPENDENCIES) $(EXTRA_ceph_test_cls_hello_DEPENDENCIES) @rm -f ceph_test_cls_hello$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_hello_LINK) $(ceph_test_cls_hello_OBJECTS) $(ceph_test_cls_hello_LDADD) $(LIBS) @@ -6962,6 +7391,7 @@ test/cls_lock/$(DEPDIR)/$(am__dirstamp): test/cls_lock/ceph_test_cls_lock-test_cls_lock.$(OBJEXT): \ test/cls_lock/$(am__dirstamp) \ test/cls_lock/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_lock$(EXEEXT): $(ceph_test_cls_lock_OBJECTS) $(ceph_test_cls_lock_DEPENDENCIES) $(EXTRA_ceph_test_cls_lock_DEPENDENCIES) @rm -f ceph_test_cls_lock$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_lock_LINK) $(ceph_test_cls_lock_OBJECTS) $(ceph_test_cls_lock_LDADD) $(LIBS) @@ -6974,6 +7404,7 @@ test/cls_log/$(DEPDIR)/$(am__dirstamp): test/cls_log/ceph_test_cls_log-test_cls_log.$(OBJEXT): \ test/cls_log/$(am__dirstamp) \ test/cls_log/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_log$(EXEEXT): $(ceph_test_cls_log_OBJECTS) $(ceph_test_cls_log_DEPENDENCIES) $(EXTRA_ceph_test_cls_log_DEPENDENCIES) @rm -f ceph_test_cls_log$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_log_LINK) $(ceph_test_cls_log_OBJECTS) $(ceph_test_cls_log_LDADD) $(LIBS) @@ -6986,6 +7417,7 @@ test/cls_rbd/$(DEPDIR)/$(am__dirstamp): test/cls_rbd/ceph_test_cls_rbd-test_cls_rbd.$(OBJEXT): \ test/cls_rbd/$(am__dirstamp) \ test/cls_rbd/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_rbd$(EXEEXT): $(ceph_test_cls_rbd_OBJECTS) $(ceph_test_cls_rbd_DEPENDENCIES) $(EXTRA_ceph_test_cls_rbd_DEPENDENCIES) @rm -f ceph_test_cls_rbd$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_rbd_LINK) $(ceph_test_cls_rbd_OBJECTS) $(ceph_test_cls_rbd_LDADD) $(LIBS) @@ -6998,6 +7430,7 @@ test/cls_refcount/$(DEPDIR)/$(am__dirstamp): test/cls_refcount/ceph_test_cls_refcount-test_cls_refcount.$(OBJEXT): \ test/cls_refcount/$(am__dirstamp) \ test/cls_refcount/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_refcount$(EXEEXT): $(ceph_test_cls_refcount_OBJECTS) $(ceph_test_cls_refcount_DEPENDENCIES) $(EXTRA_ceph_test_cls_refcount_DEPENDENCIES) @rm -f ceph_test_cls_refcount$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_refcount_LINK) $(ceph_test_cls_refcount_OBJECTS) $(ceph_test_cls_refcount_LDADD) $(LIBS) @@ -7010,6 +7443,7 @@ test/cls_replica_log/$(DEPDIR)/$(am__dirstamp): test/cls_replica_log/ceph_test_cls_replica_log-test_cls_replica_log.$(OBJEXT): \ test/cls_replica_log/$(am__dirstamp) \ test/cls_replica_log/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_replica_log$(EXEEXT): $(ceph_test_cls_replica_log_OBJECTS) $(ceph_test_cls_replica_log_DEPENDENCIES) $(EXTRA_ceph_test_cls_replica_log_DEPENDENCIES) @rm -f ceph_test_cls_replica_log$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_replica_log_LINK) $(ceph_test_cls_replica_log_OBJECTS) $(ceph_test_cls_replica_log_LDADD) $(LIBS) @@ -7022,21 +7456,25 @@ test/cls_rgw/$(DEPDIR)/$(am__dirstamp): test/cls_rgw/ceph_test_cls_rgw-test_cls_rgw.$(OBJEXT): \ test/cls_rgw/$(am__dirstamp) \ test/cls_rgw/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_rgw$(EXEEXT): $(ceph_test_cls_rgw_OBJECTS) $(ceph_test_cls_rgw_DEPENDENCIES) $(EXTRA_ceph_test_cls_rgw_DEPENDENCIES) @rm -f ceph_test_cls_rgw$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_rgw_LINK) $(ceph_test_cls_rgw_OBJECTS) $(ceph_test_cls_rgw_LDADD) $(LIBS) test/ceph_test_cls_rgw_log-test_rgw_admin_log.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_rgw_log$(EXEEXT): $(ceph_test_cls_rgw_log_OBJECTS) $(ceph_test_cls_rgw_log_DEPENDENCIES) $(EXTRA_ceph_test_cls_rgw_log_DEPENDENCIES) @rm -f ceph_test_cls_rgw_log$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_rgw_log_LINK) $(ceph_test_cls_rgw_log_OBJECTS) $(ceph_test_cls_rgw_log_LDADD) $(LIBS) test/ceph_test_cls_rgw_meta-test_rgw_admin_meta.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_rgw_meta$(EXEEXT): $(ceph_test_cls_rgw_meta_OBJECTS) $(ceph_test_cls_rgw_meta_DEPENDENCIES) $(EXTRA_ceph_test_cls_rgw_meta_DEPENDENCIES) @rm -f ceph_test_cls_rgw_meta$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_rgw_meta_LINK) $(ceph_test_cls_rgw_meta_OBJECTS) $(ceph_test_cls_rgw_meta_LDADD) $(LIBS) test/ceph_test_cls_rgw_opstate-test_rgw_admin_opstate.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_rgw_opstate$(EXEEXT): $(ceph_test_cls_rgw_opstate_OBJECTS) $(ceph_test_cls_rgw_opstate_DEPENDENCIES) $(EXTRA_ceph_test_cls_rgw_opstate_DEPENDENCIES) @rm -f ceph_test_cls_rgw_opstate$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_rgw_opstate_LINK) $(ceph_test_cls_rgw_opstate_OBJECTS) $(ceph_test_cls_rgw_opstate_LDADD) $(LIBS) @@ -7049,6 +7487,7 @@ test/cls_statelog/$(DEPDIR)/$(am__dirstamp): test/cls_statelog/ceph_test_cls_statelog-test_cls_statelog.$(OBJEXT): \ test/cls_statelog/$(am__dirstamp) \ test/cls_statelog/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_statelog$(EXEEXT): $(ceph_test_cls_statelog_OBJECTS) $(ceph_test_cls_statelog_DEPENDENCIES) $(EXTRA_ceph_test_cls_statelog_DEPENDENCIES) @rm -f ceph_test_cls_statelog$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_statelog_LINK) $(ceph_test_cls_statelog_OBJECTS) $(ceph_test_cls_statelog_LDADD) $(LIBS) @@ -7061,21 +7500,25 @@ test/cls_version/$(DEPDIR)/$(am__dirstamp): test/cls_version/ceph_test_cls_version-test_cls_version.$(OBJEXT): \ test/cls_version/$(am__dirstamp) \ test/cls_version/$(DEPDIR)/$(am__dirstamp) + ceph_test_cls_version$(EXEEXT): $(ceph_test_cls_version_OBJECTS) $(ceph_test_cls_version_DEPENDENCIES) $(EXTRA_ceph_test_cls_version_DEPENDENCIES) @rm -f ceph_test_cls_version$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cls_version_LINK) $(ceph_test_cls_version_OBJECTS) $(ceph_test_cls_version_LDADD) $(LIBS) test/ceph_test_cors-test_cors.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_cors$(EXEEXT): $(ceph_test_cors_OBJECTS) $(ceph_test_cors_DEPENDENCIES) $(EXTRA_ceph_test_cors_DEPENDENCIES) @rm -f ceph_test_cors$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_cors_LINK) $(ceph_test_cors_OBJECTS) $(ceph_test_cors_LDADD) $(LIBS) test/testcrypto.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_crypto$(EXEEXT): $(ceph_test_crypto_OBJECTS) $(ceph_test_crypto_DEPENDENCIES) $(EXTRA_ceph_test_crypto_DEPENDENCIES) @rm -f ceph_test_crypto$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_crypto_OBJECTS) $(ceph_test_crypto_LDADD) $(LIBS) test/ceph_test_filejournal-test_filejournal.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + ceph_test_filejournal$(EXEEXT): $(ceph_test_filejournal_OBJECTS) $(ceph_test_filejournal_DEPENDENCIES) $(EXTRA_ceph_test_filejournal_DEPENDENCIES) @rm -f ceph_test_filejournal$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_filejournal_LINK) $(ceph_test_filejournal_OBJECTS) $(ceph_test_filejournal_LDADD) $(LIBS) @@ -7099,6 +7542,7 @@ test/common/$(DEPDIR)/$(am__dirstamp): @: > test/common/$(DEPDIR)/$(am__dirstamp) test/common/ObjectContents.$(OBJEXT): test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + ceph_test_filestore_idempotent$(EXEEXT): $(ceph_test_filestore_idempotent_OBJECTS) $(ceph_test_filestore_idempotent_DEPENDENCIES) $(EXTRA_ceph_test_filestore_idempotent_DEPENDENCIES) @rm -f ceph_test_filestore_idempotent$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_filestore_idempotent_OBJECTS) $(ceph_test_filestore_idempotent_LDADD) $(LIBS) @@ -7114,21 +7558,25 @@ test/objectstore/TestObjectStoreState.$(OBJEXT): \ test/objectstore/FileStoreDiff.$(OBJEXT): \ test/objectstore/$(am__dirstamp) \ test/objectstore/$(DEPDIR)/$(am__dirstamp) + ceph_test_filestore_idempotent_sequence$(EXEEXT): $(ceph_test_filestore_idempotent_sequence_OBJECTS) $(ceph_test_filestore_idempotent_sequence_DEPENDENCIES) $(EXTRA_ceph_test_filestore_idempotent_sequence_DEPENDENCIES) @rm -f ceph_test_filestore_idempotent_sequence$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_filestore_idempotent_sequence_OBJECTS) $(ceph_test_filestore_idempotent_sequence_LDADD) $(LIBS) test/test_get_blkdev_size.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_get_blkdev_size$(EXEEXT): $(ceph_test_get_blkdev_size_OBJECTS) $(ceph_test_get_blkdev_size_DEPENDENCIES) $(EXTRA_ceph_test_get_blkdev_size_DEPENDENCIES) @rm -f ceph_test_get_blkdev_size$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_get_blkdev_size_OBJECTS) $(ceph_test_get_blkdev_size_LDADD) $(LIBS) client/test_ioctls.$(OBJEXT): client/$(am__dirstamp) \ client/$(DEPDIR)/$(am__dirstamp) + ceph_test_ioctls$(EXEEXT): $(ceph_test_ioctls_OBJECTS) $(ceph_test_ioctls_DEPENDENCIES) $(EXTRA_ceph_test_ioctls_DEPENDENCIES) @rm -f ceph_test_ioctls$(EXEEXT) $(AM_V_CCLD)$(LINK) $(ceph_test_ioctls_OBJECTS) $(ceph_test_ioctls_LDADD) $(LIBS) test/testkeys.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_keys$(EXEEXT): $(ceph_test_keys_OBJECTS) $(ceph_test_keys_DEPENDENCIES) $(EXTRA_ceph_test_keys_DEPENDENCIES) @rm -f ceph_test_keys$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_keys_OBJECTS) $(ceph_test_keys_LDADD) $(LIBS) @@ -7141,6 +7589,7 @@ test/ObjectMap/$(DEPDIR)/$(am__dirstamp): test/ObjectMap/ceph_test_keyvaluedb_atomicity-test_keyvaluedb_atomicity.$(OBJEXT): \ test/ObjectMap/$(am__dirstamp) \ test/ObjectMap/$(DEPDIR)/$(am__dirstamp) + ceph_test_keyvaluedb_atomicity$(EXEEXT): $(ceph_test_keyvaluedb_atomicity_OBJECTS) $(ceph_test_keyvaluedb_atomicity_DEPENDENCIES) $(EXTRA_ceph_test_keyvaluedb_atomicity_DEPENDENCIES) @rm -f ceph_test_keyvaluedb_atomicity$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_keyvaluedb_atomicity_LINK) $(ceph_test_keyvaluedb_atomicity_OBJECTS) $(ceph_test_keyvaluedb_atomicity_LDADD) $(LIBS) @@ -7150,6 +7599,7 @@ test/ObjectMap/ceph_test_keyvaluedb_iterators-test_keyvaluedb_iterators.$(OBJEXT test/ObjectMap/ceph_test_keyvaluedb_iterators-KeyValueDBMemory.$(OBJEXT): \ test/ObjectMap/$(am__dirstamp) \ test/ObjectMap/$(DEPDIR)/$(am__dirstamp) + ceph_test_keyvaluedb_iterators$(EXEEXT): $(ceph_test_keyvaluedb_iterators_OBJECTS) $(ceph_test_keyvaluedb_iterators_DEPENDENCIES) $(EXTRA_ceph_test_keyvaluedb_iterators_DEPENDENCIES) @rm -f ceph_test_keyvaluedb_iterators$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_keyvaluedb_iterators_LINK) $(ceph_test_keyvaluedb_iterators_OBJECTS) $(ceph_test_keyvaluedb_iterators_LDADD) $(LIBS) @@ -7171,6 +7621,7 @@ test/libcephfs/ceph_test_libcephfs-caps.$(OBJEXT): \ test/libcephfs/ceph_test_libcephfs-multiclient.$(OBJEXT): \ test/libcephfs/$(am__dirstamp) \ test/libcephfs/$(DEPDIR)/$(am__dirstamp) + ceph_test_libcephfs$(EXEEXT): $(ceph_test_libcephfs_OBJECTS) $(ceph_test_libcephfs_DEPENDENCIES) $(EXTRA_ceph_test_libcephfs_DEPENDENCIES) @rm -f ceph_test_libcephfs$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_libcephfs_LINK) $(ceph_test_libcephfs_OBJECTS) $(ceph_test_libcephfs_LDADD) $(LIBS) @@ -7183,12 +7634,14 @@ test/librbd/$(DEPDIR)/$(am__dirstamp): test/librbd/ceph_test_librbd-test_librbd.$(OBJEXT): \ test/librbd/$(am__dirstamp) \ test/librbd/$(DEPDIR)/$(am__dirstamp) + ceph_test_librbd$(EXEEXT): $(ceph_test_librbd_OBJECTS) $(ceph_test_librbd_DEPENDENCIES) $(EXTRA_ceph_test_librbd_DEPENDENCIES) @rm -f ceph_test_librbd$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_librbd_LINK) $(ceph_test_librbd_OBJECTS) $(ceph_test_librbd_LDADD) $(LIBS) test/librbd/ceph_test_librbd_fsx-fsx.$(OBJEXT): \ test/librbd/$(am__dirstamp) \ test/librbd/$(DEPDIR)/$(am__dirstamp) + ceph_test_librbd_fsx$(EXEEXT): $(ceph_test_librbd_fsx_OBJECTS) $(ceph_test_librbd_fsx_DEPENDENCIES) $(EXTRA_ceph_test_librbd_fsx_DEPENDENCIES) @rm -f ceph_test_librbd_fsx$(EXEEXT) $(AM_V_CCLD)$(ceph_test_librbd_fsx_LINK) $(ceph_test_librbd_fsx_OBJECTS) $(ceph_test_librbd_fsx_LDADD) $(LIBS) @@ -7200,16 +7653,19 @@ test/mon/$(DEPDIR)/$(am__dirstamp): @: > test/mon/$(DEPDIR)/$(am__dirstamp) test/mon/test_mon_workloadgen.$(OBJEXT): test/mon/$(am__dirstamp) \ test/mon/$(DEPDIR)/$(am__dirstamp) + ceph_test_mon_workloadgen$(EXEEXT): $(ceph_test_mon_workloadgen_OBJECTS) $(ceph_test_mon_workloadgen_DEPENDENCIES) $(EXTRA_ceph_test_mon_workloadgen_DEPENDENCIES) @rm -f ceph_test_mon_workloadgen$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_mon_workloadgen_OBJECTS) $(ceph_test_mon_workloadgen_LDADD) $(LIBS) test/testmsgr.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_msgr$(EXEEXT): $(ceph_test_msgr_OBJECTS) $(ceph_test_msgr_DEPENDENCIES) $(EXTRA_ceph_test_msgr_DEPENDENCIES) @rm -f ceph_test_msgr$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_msgr_OBJECTS) $(ceph_test_msgr_LDADD) $(LIBS) test/test_mutate.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_mutate$(EXEEXT): $(ceph_test_mutate_OBJECTS) $(ceph_test_mutate_DEPENDENCIES) $(EXTRA_ceph_test_mutate_DEPENDENCIES) @rm -f ceph_test_mutate$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_mutate_OBJECTS) $(ceph_test_mutate_LDADD) $(LIBS) @@ -7219,6 +7675,7 @@ test/ObjectMap/ceph_test_object_map-test_object_map.$(OBJEXT): \ test/ObjectMap/ceph_test_object_map-KeyValueDBMemory.$(OBJEXT): \ test/ObjectMap/$(am__dirstamp) \ test/ObjectMap/$(DEPDIR)/$(am__dirstamp) + ceph_test_object_map$(EXEEXT): $(ceph_test_object_map_OBJECTS) $(ceph_test_object_map_DEPENDENCIES) $(EXTRA_ceph_test_object_map_DEPENDENCIES) @rm -f ceph_test_object_map$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_object_map_LINK) $(ceph_test_object_map_OBJECTS) $(ceph_test_object_map_LDADD) $(LIBS) @@ -7232,18 +7689,21 @@ test/osdc/object_cacher_stress.$(OBJEXT): test/osdc/$(am__dirstamp) \ test/osdc/$(DEPDIR)/$(am__dirstamp) test/osdc/FakeWriteback.$(OBJEXT): test/osdc/$(am__dirstamp) \ test/osdc/$(DEPDIR)/$(am__dirstamp) + ceph_test_objectcacher_stress$(EXEEXT): $(ceph_test_objectcacher_stress_OBJECTS) $(ceph_test_objectcacher_stress_DEPENDENCIES) $(EXTRA_ceph_test_objectcacher_stress_DEPENDENCIES) @rm -f ceph_test_objectcacher_stress$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_objectcacher_stress_OBJECTS) $(ceph_test_objectcacher_stress_LDADD) $(LIBS) test/objectstore/ceph_test_objectstore-store_test.$(OBJEXT): \ test/objectstore/$(am__dirstamp) \ test/objectstore/$(DEPDIR)/$(am__dirstamp) + ceph_test_objectstore$(EXEEXT): $(ceph_test_objectstore_OBJECTS) $(ceph_test_objectstore_DEPENDENCIES) $(EXTRA_ceph_test_objectstore_DEPENDENCIES) @rm -f ceph_test_objectstore$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_objectstore_LINK) $(ceph_test_objectstore_OBJECTS) $(ceph_test_objectstore_LDADD) $(LIBS) test/objectstore/workload_generator.$(OBJEXT): \ test/objectstore/$(am__dirstamp) \ test/objectstore/$(DEPDIR)/$(am__dirstamp) + ceph_test_objectstore_workloadgen$(EXEEXT): $(ceph_test_objectstore_workloadgen_OBJECTS) $(ceph_test_objectstore_workloadgen_DEPENDENCIES) $(EXTRA_ceph_test_objectstore_workloadgen_DEPENDENCIES) @rm -f ceph_test_objectstore_workloadgen$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_objectstore_workloadgen_OBJECTS) $(ceph_test_objectstore_workloadgen_LDADD) $(LIBS) @@ -7261,78 +7721,91 @@ test/osd/Object.$(OBJEXT): test/osd/$(am__dirstamp) \ test/osd/$(DEPDIR)/$(am__dirstamp) test/osd/RadosModel.$(OBJEXT): test/osd/$(am__dirstamp) \ test/osd/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados$(EXEEXT): $(ceph_test_rados_OBJECTS) $(ceph_test_rados_DEPENDENCIES) $(EXTRA_ceph_test_rados_DEPENDENCIES) @rm -f ceph_test_rados$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_rados_OBJECTS) $(ceph_test_rados_LDADD) $(LIBS) test/librados/ceph_test_rados_api_aio-aio.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_aio$(EXEEXT): $(ceph_test_rados_api_aio_OBJECTS) $(ceph_test_rados_api_aio_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_aio_DEPENDENCIES) @rm -f ceph_test_rados_api_aio$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_aio_LINK) $(ceph_test_rados_api_aio_OBJECTS) $(ceph_test_rados_api_aio_LDADD) $(LIBS) test/librados/ceph_test_rados_api_c_read_operations-c_read_operations.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_c_read_operations$(EXEEXT): $(ceph_test_rados_api_c_read_operations_OBJECTS) $(ceph_test_rados_api_c_read_operations_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_c_read_operations_DEPENDENCIES) @rm -f ceph_test_rados_api_c_read_operations$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_c_read_operations_LINK) $(ceph_test_rados_api_c_read_operations_OBJECTS) $(ceph_test_rados_api_c_read_operations_LDADD) $(LIBS) test/librados/ceph_test_rados_api_c_write_operations-c_write_operations.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_c_write_operations$(EXEEXT): $(ceph_test_rados_api_c_write_operations_OBJECTS) $(ceph_test_rados_api_c_write_operations_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_c_write_operations_DEPENDENCIES) @rm -f ceph_test_rados_api_c_write_operations$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_c_write_operations_LINK) $(ceph_test_rados_api_c_write_operations_OBJECTS) $(ceph_test_rados_api_c_write_operations_LDADD) $(LIBS) test/librados/ceph_test_rados_api_cls-cls.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_cls$(EXEEXT): $(ceph_test_rados_api_cls_OBJECTS) $(ceph_test_rados_api_cls_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_cls_DEPENDENCIES) @rm -f ceph_test_rados_api_cls$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_cls_LINK) $(ceph_test_rados_api_cls_OBJECTS) $(ceph_test_rados_api_cls_LDADD) $(LIBS) test/librados/ceph_test_rados_api_cmd-cmd.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_cmd$(EXEEXT): $(ceph_test_rados_api_cmd_OBJECTS) $(ceph_test_rados_api_cmd_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_cmd_DEPENDENCIES) @rm -f ceph_test_rados_api_cmd$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_cmd_LINK) $(ceph_test_rados_api_cmd_OBJECTS) $(ceph_test_rados_api_cmd_LDADD) $(LIBS) test/librados/ceph_test_rados_api_io-io.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_io$(EXEEXT): $(ceph_test_rados_api_io_OBJECTS) $(ceph_test_rados_api_io_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_io_DEPENDENCIES) @rm -f ceph_test_rados_api_io$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_io_LINK) $(ceph_test_rados_api_io_OBJECTS) $(ceph_test_rados_api_io_LDADD) $(LIBS) test/librados/ceph_test_rados_api_list-list.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_list$(EXEEXT): $(ceph_test_rados_api_list_OBJECTS) $(ceph_test_rados_api_list_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_list_DEPENDENCIES) @rm -f ceph_test_rados_api_list$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_list_LINK) $(ceph_test_rados_api_list_OBJECTS) $(ceph_test_rados_api_list_LDADD) $(LIBS) test/librados/ceph_test_rados_api_lock-lock.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_lock$(EXEEXT): $(ceph_test_rados_api_lock_OBJECTS) $(ceph_test_rados_api_lock_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_lock_DEPENDENCIES) @rm -f ceph_test_rados_api_lock$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_lock_LINK) $(ceph_test_rados_api_lock_OBJECTS) $(ceph_test_rados_api_lock_LDADD) $(LIBS) test/librados/ceph_test_rados_api_misc-misc.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_misc$(EXEEXT): $(ceph_test_rados_api_misc_OBJECTS) $(ceph_test_rados_api_misc_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_misc_DEPENDENCIES) @rm -f ceph_test_rados_api_misc$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_misc_LINK) $(ceph_test_rados_api_misc_OBJECTS) $(ceph_test_rados_api_misc_LDADD) $(LIBS) test/librados/ceph_test_rados_api_pool-pool.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_pool$(EXEEXT): $(ceph_test_rados_api_pool_OBJECTS) $(ceph_test_rados_api_pool_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_pool_DEPENDENCIES) @rm -f ceph_test_rados_api_pool$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_pool_LINK) $(ceph_test_rados_api_pool_OBJECTS) $(ceph_test_rados_api_pool_LDADD) $(LIBS) test/librados/ceph_test_rados_api_snapshots-snapshots.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_snapshots$(EXEEXT): $(ceph_test_rados_api_snapshots_OBJECTS) $(ceph_test_rados_api_snapshots_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_snapshots_DEPENDENCIES) @rm -f ceph_test_rados_api_snapshots$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_snapshots_LINK) $(ceph_test_rados_api_snapshots_OBJECTS) $(ceph_test_rados_api_snapshots_LDADD) $(LIBS) test/librados/ceph_test_rados_api_stat-stat.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_stat$(EXEEXT): $(ceph_test_rados_api_stat_OBJECTS) $(ceph_test_rados_api_stat_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_stat_DEPENDENCIES) @rm -f ceph_test_rados_api_stat$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_stat_LINK) $(ceph_test_rados_api_stat_OBJECTS) $(ceph_test_rados_api_stat_LDADD) $(LIBS) @@ -7341,12 +7814,14 @@ test/librados/ceph_test_rados_api_tier-tier.$(OBJEXT): \ test/librados/$(DEPDIR)/$(am__dirstamp) osd/ceph_test_rados_api_tier-HitSet.$(OBJEXT): osd/$(am__dirstamp) \ osd/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_tier$(EXEEXT): $(ceph_test_rados_api_tier_OBJECTS) $(ceph_test_rados_api_tier_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_tier_DEPENDENCIES) @rm -f ceph_test_rados_api_tier$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_tier_LINK) $(ceph_test_rados_api_tier_OBJECTS) $(ceph_test_rados_api_tier_LDADD) $(LIBS) test/librados/ceph_test_rados_api_watch_notify-watch_notify.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_api_watch_notify$(EXEEXT): $(ceph_test_rados_api_watch_notify_OBJECTS) $(ceph_test_rados_api_watch_notify_DEPENDENCIES) $(EXTRA_ceph_test_rados_api_watch_notify_DEPENDENCIES) @rm -f ceph_test_rados_api_watch_notify$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rados_api_watch_notify_LINK) $(ceph_test_rados_api_watch_notify_OBJECTS) $(ceph_test_rados_api_watch_notify_LDADD) $(LIBS) @@ -7362,18 +7837,21 @@ test/system/st_rados_delete_pool.$(OBJEXT): \ test/system/st_rados_list_objects.$(OBJEXT): \ test/system/$(am__dirstamp) \ test/system/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_delete_pools_parallel$(EXEEXT): $(ceph_test_rados_delete_pools_parallel_OBJECTS) $(ceph_test_rados_delete_pools_parallel_DEPENDENCIES) $(EXTRA_ceph_test_rados_delete_pools_parallel_DEPENDENCIES) @rm -f ceph_test_rados_delete_pools_parallel$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_rados_delete_pools_parallel_OBJECTS) $(ceph_test_rados_delete_pools_parallel_LDADD) $(LIBS) test/system/rados_list_parallel.$(OBJEXT): \ test/system/$(am__dirstamp) \ test/system/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_list_parallel$(EXEEXT): $(ceph_test_rados_list_parallel_OBJECTS) $(ceph_test_rados_list_parallel_DEPENDENCIES) $(EXTRA_ceph_test_rados_list_parallel_DEPENDENCIES) @rm -f ceph_test_rados_list_parallel$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_rados_list_parallel_OBJECTS) $(ceph_test_rados_list_parallel_LDADD) $(LIBS) test/system/rados_open_pools_parallel.$(OBJEXT): \ test/system/$(am__dirstamp) \ test/system/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_open_pools_parallel$(EXEEXT): $(ceph_test_rados_open_pools_parallel_OBJECTS) $(ceph_test_rados_open_pools_parallel_DEPENDENCIES) $(EXTRA_ceph_test_rados_open_pools_parallel_DEPENDENCIES) @rm -f ceph_test_rados_open_pools_parallel$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_rados_open_pools_parallel_OBJECTS) $(ceph_test_rados_open_pools_parallel_LDADD) $(LIBS) @@ -7386,11 +7864,13 @@ test/system/st_rados_watch.$(OBJEXT): test/system/$(am__dirstamp) \ test/system/$(DEPDIR)/$(am__dirstamp) test/system/st_rados_notify.$(OBJEXT): test/system/$(am__dirstamp) \ test/system/$(DEPDIR)/$(am__dirstamp) + ceph_test_rados_watch_notify$(EXEEXT): $(ceph_test_rados_watch_notify_OBJECTS) $(ceph_test_rados_watch_notify_DEPENDENCIES) $(EXTRA_ceph_test_rados_watch_notify_DEPENDENCIES) @rm -f ceph_test_rados_watch_notify$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_rados_watch_notify_OBJECTS) $(ceph_test_rados_watch_notify_LDADD) $(LIBS) test/test_rewrite_latency.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_rewrite_latency$(EXEEXT): $(ceph_test_rewrite_latency_OBJECTS) $(ceph_test_rewrite_latency_DEPENDENCIES) $(EXTRA_ceph_test_rewrite_latency_DEPENDENCIES) @rm -f ceph_test_rewrite_latency$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_rewrite_latency_OBJECTS) $(ceph_test_rewrite_latency_LDADD) $(LIBS) @@ -7402,63 +7882,76 @@ test/rgw/$(DEPDIR)/$(am__dirstamp): @: > test/rgw/$(DEPDIR)/$(am__dirstamp) test/rgw/ceph_test_rgw_manifest-test_rgw_manifest.$(OBJEXT): \ test/rgw/$(am__dirstamp) test/rgw/$(DEPDIR)/$(am__dirstamp) + ceph_test_rgw_manifest$(EXEEXT): $(ceph_test_rgw_manifest_OBJECTS) $(ceph_test_rgw_manifest_DEPENDENCIES) $(EXTRA_ceph_test_rgw_manifest_DEPENDENCIES) @rm -f ceph_test_rgw_manifest$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_rgw_manifest_LINK) $(ceph_test_rgw_manifest_OBJECTS) $(ceph_test_rgw_manifest_LDADD) $(LIBS) test/TestSignalHandlers.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_signal_handlers$(EXEEXT): $(ceph_test_signal_handlers_OBJECTS) $(ceph_test_signal_handlers_DEPENDENCIES) $(EXTRA_ceph_test_signal_handlers_DEPENDENCIES) @rm -f ceph_test_signal_handlers$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_signal_handlers_OBJECTS) $(ceph_test_signal_handlers_LDADD) $(LIBS) test/ceph_test_snap_mapper-test_snap_mapper.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + ceph_test_snap_mapper$(EXEEXT): $(ceph_test_snap_mapper_OBJECTS) $(ceph_test_snap_mapper_DEPENDENCIES) $(EXTRA_ceph_test_snap_mapper_DEPENDENCIES) @rm -f ceph_test_snap_mapper$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_snap_mapper_LINK) $(ceph_test_snap_mapper_OBJECTS) $(ceph_test_snap_mapper_LDADD) $(LIBS) test/ceph_test_stress_watch-test_stress_watch.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + ceph_test_stress_watch$(EXEEXT): $(ceph_test_stress_watch_OBJECTS) $(ceph_test_stress_watch_DEPENDENCIES) $(EXTRA_ceph_test_stress_watch_DEPENDENCIES) @rm -f ceph_test_stress_watch$(EXEEXT) $(AM_V_CXXLD)$(ceph_test_stress_watch_LINK) $(ceph_test_stress_watch_OBJECTS) $(ceph_test_stress_watch_LDADD) $(LIBS) test/TestTimers.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_timers$(EXEEXT): $(ceph_test_timers_OBJECTS) $(ceph_test_timers_DEPENDENCIES) $(EXTRA_ceph_test_timers_DEPENDENCIES) @rm -f ceph_test_timers$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_timers_OBJECTS) $(ceph_test_timers_LDADD) $(LIBS) test/test_trans.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_test_trans$(EXEEXT): $(ceph_test_trans_OBJECTS) $(ceph_test_trans_DEPENDENCIES) $(EXTRA_ceph_test_trans_DEPENDENCIES) @rm -f ceph_test_trans$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_test_trans_OBJECTS) $(ceph_test_trans_LDADD) $(LIBS) test/bench/tp_bench.$(OBJEXT): test/bench/$(am__dirstamp) \ test/bench/$(DEPDIR)/$(am__dirstamp) + ceph_tpbench$(EXEEXT): $(ceph_tpbench_OBJECTS) $(ceph_tpbench_DEPENDENCIES) $(EXTRA_ceph_tpbench_DEPENDENCIES) @rm -f ceph_tpbench$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(ceph_tpbench_OBJECTS) $(ceph_tpbench_LDADD) $(LIBS) test/ceph_xattr_bench-xattr_bench.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + ceph_xattr_bench$(EXEEXT): $(ceph_xattr_bench_OBJECTS) $(ceph_xattr_bench_DEPENDENCIES) $(EXTRA_ceph_xattr_bench_DEPENDENCIES) @rm -f ceph_xattr_bench$(EXEEXT) $(AM_V_CXXLD)$(ceph_xattr_bench_LINK) $(ceph_xattr_bench_OBJECTS) $(ceph_xattr_bench_LDADD) $(LIBS) + cephfs$(EXEEXT): $(cephfs_OBJECTS) $(cephfs_DEPENDENCIES) $(EXTRA_cephfs_DEPENDENCIES) @rm -f cephfs$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(cephfs_OBJECTS) $(cephfs_LDADD) $(LIBS) tools/crushtool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + crushtool$(EXEEXT): $(crushtool_OBJECTS) $(crushtool_DEPENDENCIES) $(EXTRA_crushtool_DEPENDENCIES) @rm -f crushtool$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(crushtool_OBJECTS) $(crushtool_LDADD) $(LIBS) test/common/get_command_descriptions.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + get_command_descriptions$(EXEEXT): $(get_command_descriptions_OBJECTS) $(get_command_descriptions_DEPENDENCIES) $(EXTRA_get_command_descriptions_DEPENDENCIES) @rm -f get_command_descriptions$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(get_command_descriptions_OBJECTS) $(get_command_descriptions_LDADD) $(LIBS) + librados-config$(EXEEXT): $(librados_config_OBJECTS) $(librados_config_DEPENDENCIES) $(EXTRA_librados_config_DEPENDENCIES) @rm -f librados-config$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(librados_config_OBJECTS) $(librados_config_LDADD) $(LIBS) tools/monmaptool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + monmaptool$(EXEEXT): $(monmaptool_OBJECTS) $(monmaptool_DEPENDENCIES) $(EXTRA_monmaptool_DEPENDENCIES) @rm -f monmaptool$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(monmaptool_OBJECTS) $(monmaptool_LDADD) $(LIBS) @@ -7472,11 +7965,13 @@ mount/mount.ceph.$(OBJEXT): mount/$(am__dirstamp) \ mount/$(DEPDIR)/$(am__dirstamp) common/secret.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) + mount.ceph$(EXEEXT): $(mount_ceph_OBJECTS) $(mount_ceph_DEPENDENCIES) $(EXTRA_mount_ceph_DEPENDENCIES) @rm -f mount.ceph$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mount_ceph_OBJECTS) $(mount_ceph_LDADD) $(LIBS) tools/osdmaptool.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) + osdmaptool$(EXEEXT): $(osdmaptool_OBJECTS) $(osdmaptool_DEPENDENCIES) $(EXTRA_osdmaptool_DEPENDENCIES) @rm -f osdmaptool$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(osdmaptool_OBJECTS) $(osdmaptool_LDADD) $(LIBS) @@ -7496,6 +7991,7 @@ tools/rados/rados_sync.$(OBJEXT): tools/rados/$(am__dirstamp) \ tools/rados/$(DEPDIR)/$(am__dirstamp) common/obj_bencher.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) + rados$(EXEEXT): $(rados_OBJECTS) $(rados_DEPENDENCIES) $(EXTRA_rados_DEPENDENCIES) @rm -f rados$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(rados_OBJECTS) $(rados_LDADD) $(LIBS) @@ -7535,6 +8031,8 @@ rgw/rgw_loadgen.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) rgw/rgw_civetweb.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) +rgw/rgw_civetweb_log.$(OBJEXT): rgw/$(am__dirstamp) \ + rgw/$(DEPDIR)/$(am__dirstamp) civetweb/src/$(am__dirstamp): @$(MKDIR_P) civetweb/src @: > civetweb/src/$(am__dirstamp) @@ -7545,14 +8043,17 @@ civetweb/src/radosgw-civetweb.$(OBJEXT): civetweb/src/$(am__dirstamp) \ civetweb/src/$(DEPDIR)/$(am__dirstamp) rgw/rgw_main.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + radosgw$(EXEEXT): $(radosgw_OBJECTS) $(radosgw_DEPENDENCIES) $(EXTRA_radosgw_DEPENDENCIES) @rm -f radosgw$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(radosgw_OBJECTS) $(radosgw_LDADD) $(LIBS) rgw/rgw_admin.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + radosgw-admin$(EXEEXT): $(radosgw_admin_OBJECTS) $(radosgw_admin_DEPENDENCIES) $(EXTRA_radosgw_admin_DEPENDENCIES) @rm -f radosgw-admin$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(radosgw_admin_OBJECTS) $(radosgw_admin_LDADD) $(LIBS) + rbd$(EXEEXT): $(rbd_OBJECTS) $(rbd_DEPENDENCIES) $(EXTRA_rbd_DEPENDENCIES) @rm -f rbd$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(rbd_OBJECTS) $(rbd_LDADD) $(LIBS) @@ -7564,6 +8065,7 @@ rbd_fuse/$(DEPDIR)/$(am__dirstamp): @: > rbd_fuse/$(DEPDIR)/$(am__dirstamp) rbd_fuse/rbd-fuse.$(OBJEXT): rbd_fuse/$(am__dirstamp) \ rbd_fuse/$(DEPDIR)/$(am__dirstamp) + rbd-fuse$(EXEEXT): $(rbd_fuse_OBJECTS) $(rbd_fuse_DEPENDENCIES) $(EXTRA_rbd_fuse_DEPENDENCIES) @rm -f rbd-fuse$(EXEEXT) $(AM_V_CCLD)$(LINK) $(rbd_fuse_OBJECTS) $(rbd_fuse_LDADD) $(LIBS) @@ -7571,6 +8073,7 @@ tools/rest_bench-rest_bench.$(OBJEXT): tools/$(am__dirstamp) \ tools/$(DEPDIR)/$(am__dirstamp) common/rest_bench-obj_bencher.$(OBJEXT): common/$(am__dirstamp) \ common/$(DEPDIR)/$(am__dirstamp) + rest-bench$(EXEEXT): $(rest_bench_OBJECTS) $(rest_bench_DEPENDENCIES) $(EXTRA_rest_bench_DEPENDENCIES) @rm -f rest-bench$(EXEEXT) $(AM_V_CXXLD)$(rest_bench_LINK) $(rest_bench_OBJECTS) $(rest_bench_LDADD) $(LIBS) @@ -7586,6 +8089,7 @@ osdc/test_build_libcephfs-Striper.$(OBJEXT): osdc/$(am__dirstamp) \ osdc/$(DEPDIR)/$(am__dirstamp) osdc/test_build_libcephfs-Journaler.$(OBJEXT): osdc/$(am__dirstamp) \ osdc/$(DEPDIR)/$(am__dirstamp) + test_build_libcephfs$(EXEEXT): $(test_build_libcephfs_OBJECTS) $(test_build_libcephfs_DEPENDENCIES) $(EXTRA_test_build_libcephfs_DEPENDENCIES) @rm -f test_build_libcephfs$(EXEEXT) $(AM_V_CXXLD)$(test_build_libcephfs_LINK) $(test_build_libcephfs_OBJECTS) $(test_build_libcephfs_LDADD) $(LIBS) @@ -7753,6 +8257,7 @@ mds/test_build_libcommon-inode_backtrace.$(OBJEXT): \ mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) mds/test_build_libcommon-mdstypes.$(OBJEXT): mds/$(am__dirstamp) \ mds/$(DEPDIR)/$(am__dirstamp) + test_build_libcommon$(EXEEXT): $(test_build_libcommon_OBJECTS) $(test_build_libcommon_DEPENDENCIES) $(EXTRA_test_build_libcommon_DEPENDENCIES) @rm -f test_build_libcommon$(EXEEXT) $(AM_V_CXXLD)$(test_build_libcommon_LINK) $(test_build_libcommon_OBJECTS) $(test_build_libcommon_LDADD) $(LIBS) @@ -7766,6 +8271,7 @@ librados/test_build_librados-IoCtxImpl.$(OBJEXT): \ librados/$(am__dirstamp) librados/$(DEPDIR)/$(am__dirstamp) librados/test_build_librados-snap_set_diff.$(OBJEXT): \ librados/$(am__dirstamp) librados/$(DEPDIR)/$(am__dirstamp) + test_build_librados$(EXEEXT): $(test_build_librados_OBJECTS) $(test_build_librados_DEPENDENCIES) $(EXTRA_test_build_librados_DEPENDENCIES) @rm -f test_build_librados$(EXEEXT) $(AM_V_CXXLD)$(test_build_librados_LINK) $(test_build_librados_OBJECTS) $(test_build_librados_LDADD) $(LIBS) @@ -7839,81 +8345,96 @@ rgw/test_build_librgw-rgw_quota.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) rgw/test_build_librgw-rgw_dencoder.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + test_build_librgw$(EXEEXT): $(test_build_librgw_OBJECTS) $(test_build_librgw_DEPENDENCIES) $(EXTRA_test_build_librgw_DEPENDENCIES) @rm -f test_build_librgw$(EXEEXT) $(AM_V_CXXLD)$(test_build_librgw_LINK) $(test_build_librgw_OBJECTS) $(test_build_librgw_LDADD) $(LIBS) test/unittest_addrs-test_addrs.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_addrs$(EXEEXT): $(unittest_addrs_OBJECTS) $(unittest_addrs_DEPENDENCIES) $(EXTRA_unittest_addrs_DEPENDENCIES) @rm -f unittest_addrs$(EXEEXT) $(AM_V_CXXLD)$(unittest_addrs_LINK) $(unittest_addrs_OBJECTS) $(unittest_addrs_LDADD) $(LIBS) test/unittest_admin_socket-admin_socket.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_admin_socket$(EXEEXT): $(unittest_admin_socket_OBJECTS) $(unittest_admin_socket_DEPENDENCIES) $(EXTRA_unittest_admin_socket_DEPENDENCIES) @rm -f unittest_admin_socket$(EXEEXT) $(AM_V_CXXLD)$(unittest_admin_socket_LINK) $(unittest_admin_socket_OBJECTS) $(unittest_admin_socket_LDADD) $(LIBS) test/unittest_arch-test_arch.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_arch$(EXEEXT): $(unittest_arch_OBJECTS) $(unittest_arch_DEPENDENCIES) $(EXTRA_unittest_arch_DEPENDENCIES) @rm -f unittest_arch$(EXEEXT) $(AM_V_CXXLD)$(unittest_arch_LINK) $(unittest_arch_OBJECTS) $(unittest_arch_LDADD) $(LIBS) test/unittest_base64-base64.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_base64$(EXEEXT): $(unittest_base64_OBJECTS) $(unittest_base64_DEPENDENCIES) $(EXTRA_unittest_base64_DEPENDENCIES) @rm -f unittest_base64$(EXEEXT) $(AM_V_CXXLD)$(unittest_base64_LINK) $(unittest_base64_OBJECTS) $(unittest_base64_LDADD) $(LIBS) test/common/unittest_bloom_filter-test_bloom_filter.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_bloom_filter$(EXEEXT): $(unittest_bloom_filter_OBJECTS) $(unittest_bloom_filter_DEPENDENCIES) $(EXTRA_unittest_bloom_filter_DEPENDENCIES) @rm -f unittest_bloom_filter$(EXEEXT) $(AM_V_CXXLD)$(unittest_bloom_filter_LINK) $(unittest_bloom_filter_OBJECTS) $(unittest_bloom_filter_LDADD) $(LIBS) test/unittest_bufferlist-bufferlist.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_bufferlist$(EXEEXT): $(unittest_bufferlist_OBJECTS) $(unittest_bufferlist_DEPENDENCIES) $(EXTRA_unittest_bufferlist_DEPENDENCIES) @rm -f unittest_bufferlist$(EXEEXT) $(AM_V_CXXLD)$(unittest_bufferlist_LINK) $(unittest_bufferlist_OBJECTS) $(unittest_bufferlist_LDADD) $(LIBS) test/unittest_ceph_argparse-ceph_argparse.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_ceph_argparse$(EXEEXT): $(unittest_ceph_argparse_OBJECTS) $(unittest_ceph_argparse_DEPENDENCIES) $(EXTRA_unittest_ceph_argparse_DEPENDENCIES) @rm -f unittest_ceph_argparse$(EXEEXT) $(AM_V_CXXLD)$(unittest_ceph_argparse_LINK) $(unittest_ceph_argparse_OBJECTS) $(unittest_ceph_argparse_LDADD) $(LIBS) test/unittest_ceph_compatset-ceph_compatset.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_ceph_compatset$(EXEEXT): $(unittest_ceph_compatset_OBJECTS) $(unittest_ceph_compatset_DEPENDENCIES) $(EXTRA_unittest_ceph_compatset_DEPENDENCIES) @rm -f unittest_ceph_compatset$(EXEEXT) $(AM_V_CXXLD)$(unittest_ceph_compatset_LINK) $(unittest_ceph_compatset_OBJECTS) $(unittest_ceph_compatset_LDADD) $(LIBS) test/unittest_ceph_crypto-ceph_crypto.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_ceph_crypto$(EXEEXT): $(unittest_ceph_crypto_OBJECTS) $(unittest_ceph_crypto_DEPENDENCIES) $(EXTRA_unittest_ceph_crypto_DEPENDENCIES) @rm -f unittest_ceph_crypto$(EXEEXT) $(AM_V_CXXLD)$(unittest_ceph_crypto_LINK) $(unittest_ceph_crypto_OBJECTS) $(unittest_ceph_crypto_LDADD) $(LIBS) test/objectstore/unittest_chain_xattr-chain_xattr.$(OBJEXT): \ test/objectstore/$(am__dirstamp) \ test/objectstore/$(DEPDIR)/$(am__dirstamp) + unittest_chain_xattr$(EXEEXT): $(unittest_chain_xattr_OBJECTS) $(unittest_chain_xattr_DEPENDENCIES) $(EXTRA_unittest_chain_xattr_DEPENDENCIES) @rm -f unittest_chain_xattr$(EXEEXT) $(AM_V_CXXLD)$(unittest_chain_xattr_LINK) $(unittest_chain_xattr_OBJECTS) $(unittest_chain_xattr_LDADD) $(LIBS) test/common/unittest_config-test_config.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_config$(EXEEXT): $(unittest_config_OBJECTS) $(unittest_config_DEPENDENCIES) $(EXTRA_unittest_config_DEPENDENCIES) @rm -f unittest_config$(EXEEXT) $(AM_V_CXXLD)$(unittest_config_LINK) $(unittest_config_OBJECTS) $(unittest_config_LDADD) $(LIBS) test/unittest_confutils-confutils.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_confutils$(EXEEXT): $(unittest_confutils_OBJECTS) $(unittest_confutils_DEPENDENCIES) $(EXTRA_unittest_confutils_DEPENDENCIES) @rm -f unittest_confutils$(EXEEXT) $(AM_V_CXXLD)$(unittest_confutils_LINK) $(unittest_confutils_OBJECTS) $(unittest_confutils_LDADD) $(LIBS) test/common/unittest_context-test_context.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_context$(EXEEXT): $(unittest_context_OBJECTS) $(unittest_context_DEPENDENCIES) $(EXTRA_unittest_context_DEPENDENCIES) @rm -f unittest_context$(EXEEXT) $(AM_V_CXXLD)$(unittest_context_LINK) $(unittest_context_OBJECTS) $(unittest_context_LDADD) $(LIBS) test/common/unittest_crc32c-test_crc32c.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_crc32c$(EXEEXT): $(unittest_crc32c_OBJECTS) $(unittest_crc32c_DEPENDENCIES) $(EXTRA_unittest_crc32c_DEPENDENCIES) @rm -f unittest_crc32c$(EXEEXT) $(AM_V_CXXLD)$(unittest_crc32c_LINK) $(unittest_crc32c_OBJECTS) $(unittest_crc32c_LDADD) $(LIBS) @@ -7926,43 +8447,51 @@ test/crush/$(DEPDIR)/$(am__dirstamp): test/crush/unittest_crush_indep-indep.$(OBJEXT): \ test/crush/$(am__dirstamp) \ test/crush/$(DEPDIR)/$(am__dirstamp) + unittest_crush_indep$(EXEEXT): $(unittest_crush_indep_OBJECTS) $(unittest_crush_indep_DEPENDENCIES) $(EXTRA_unittest_crush_indep_DEPENDENCIES) @rm -f unittest_crush_indep$(EXEEXT) $(AM_V_CXXLD)$(unittest_crush_indep_LINK) $(unittest_crush_indep_OBJECTS) $(unittest_crush_indep_LDADD) $(LIBS) test/crush/unittest_crush_wrapper-TestCrushWrapper.$(OBJEXT): \ test/crush/$(am__dirstamp) \ test/crush/$(DEPDIR)/$(am__dirstamp) + unittest_crush_wrapper$(EXEEXT): $(unittest_crush_wrapper_OBJECTS) $(unittest_crush_wrapper_DEPENDENCIES) $(EXTRA_unittest_crush_wrapper_DEPENDENCIES) @rm -f unittest_crush_wrapper$(EXEEXT) $(AM_V_CXXLD)$(unittest_crush_wrapper_LINK) $(unittest_crush_wrapper_OBJECTS) $(unittest_crush_wrapper_LDADD) $(LIBS) test/unittest_crypto-crypto.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_crypto$(EXEEXT): $(unittest_crypto_OBJECTS) $(unittest_crypto_DEPENDENCIES) $(EXTRA_unittest_crypto_DEPENDENCIES) @rm -f unittest_crypto$(EXEEXT) $(AM_V_CXXLD)$(unittest_crypto_LINK) $(unittest_crypto_OBJECTS) $(unittest_crypto_LDADD) $(LIBS) test/unittest_crypto_init-crypto_init.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_crypto_init$(EXEEXT): $(unittest_crypto_init_OBJECTS) $(unittest_crypto_init_DEPENDENCIES) $(EXTRA_unittest_crypto_init_DEPENDENCIES) @rm -f unittest_crypto_init$(EXEEXT) $(AM_V_CXXLD)$(unittest_crypto_init_LINK) $(unittest_crypto_init_OBJECTS) $(unittest_crypto_init_LDADD) $(LIBS) test/unittest_daemon_config-daemon_config.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_daemon_config$(EXEEXT): $(unittest_daemon_config_OBJECTS) $(unittest_daemon_config_DEPENDENCIES) $(EXTRA_unittest_daemon_config_DEPENDENCIES) @rm -f unittest_daemon_config$(EXEEXT) $(AM_V_CXXLD)$(unittest_daemon_config_LINK) $(unittest_daemon_config_OBJECTS) $(unittest_daemon_config_LDADD) $(LIBS) test/osd/unittest_ecbackend-TestECBackend.$(OBJEXT): \ test/osd/$(am__dirstamp) test/osd/$(DEPDIR)/$(am__dirstamp) + unittest_ecbackend$(EXEEXT): $(unittest_ecbackend_OBJECTS) $(unittest_ecbackend_DEPENDENCIES) $(EXTRA_unittest_ecbackend_DEPENDENCIES) @rm -f unittest_ecbackend$(EXEEXT) $(AM_V_CXXLD)$(unittest_ecbackend_LINK) $(unittest_ecbackend_OBJECTS) $(unittest_ecbackend_LDADD) $(LIBS) test/unittest_encoding-encoding.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_encoding$(EXEEXT): $(unittest_encoding_OBJECTS) $(unittest_encoding_DEPENDENCIES) $(EXTRA_unittest_encoding_DEPENDENCIES) @rm -f unittest_encoding$(EXEEXT) $(AM_V_CXXLD)$(unittest_encoding_LINK) $(unittest_encoding_OBJECTS) $(unittest_encoding_LDADD) $(LIBS) test/erasure-code/unittest_erasure_code_example-TestErasureCodeExample.$(OBJEXT): \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + unittest_erasure_code_example$(EXEEXT): $(unittest_erasure_code_example_OBJECTS) $(unittest_erasure_code_example_DEPENDENCIES) $(EXTRA_unittest_erasure_code_example_DEPENDENCIES) @rm -f unittest_erasure_code_example$(EXEEXT) $(AM_V_CXXLD)$(unittest_erasure_code_example_LINK) $(unittest_erasure_code_example_OBJECTS) $(unittest_erasure_code_example_LDADD) $(LIBS) @@ -8023,23 +8552,27 @@ erasure-code/jerasure/unittest_erasure_code_jerasure-ErasureCodePluginJerasure.$ erasure-code/jerasure/unittest_erasure_code_jerasure-ErasureCodeJerasure.$(OBJEXT): \ erasure-code/jerasure/$(am__dirstamp) \ erasure-code/jerasure/$(DEPDIR)/$(am__dirstamp) + unittest_erasure_code_jerasure$(EXEEXT): $(unittest_erasure_code_jerasure_OBJECTS) $(unittest_erasure_code_jerasure_DEPENDENCIES) $(EXTRA_unittest_erasure_code_jerasure_DEPENDENCIES) @rm -f unittest_erasure_code_jerasure$(EXEEXT) $(AM_V_CXXLD)$(unittest_erasure_code_jerasure_LINK) $(unittest_erasure_code_jerasure_OBJECTS) $(unittest_erasure_code_jerasure_LDADD) $(LIBS) test/erasure-code/unittest_erasure_code_plugin-TestErasureCodePlugin.$(OBJEXT): \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + unittest_erasure_code_plugin$(EXEEXT): $(unittest_erasure_code_plugin_OBJECTS) $(unittest_erasure_code_plugin_DEPENDENCIES) $(EXTRA_unittest_erasure_code_plugin_DEPENDENCIES) @rm -f unittest_erasure_code_plugin$(EXEEXT) $(AM_V_CXXLD)$(unittest_erasure_code_plugin_LINK) $(unittest_erasure_code_plugin_OBJECTS) $(unittest_erasure_code_plugin_LDADD) $(LIBS) test/erasure-code/unittest_erasure_code_plugin_jerasure-TestErasureCodePluginJerasure.$(OBJEXT): \ test/erasure-code/$(am__dirstamp) \ test/erasure-code/$(DEPDIR)/$(am__dirstamp) + unittest_erasure_code_plugin_jerasure$(EXEEXT): $(unittest_erasure_code_plugin_jerasure_OBJECTS) $(unittest_erasure_code_plugin_jerasure_DEPENDENCIES) $(EXTRA_unittest_erasure_code_plugin_jerasure_DEPENDENCIES) @rm -f unittest_erasure_code_plugin_jerasure$(EXEEXT) $(AM_V_CXXLD)$(unittest_erasure_code_plugin_jerasure_LINK) $(unittest_erasure_code_plugin_jerasure_OBJECTS) $(unittest_erasure_code_plugin_jerasure_LDADD) $(LIBS) test/unittest_escape-escape.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_escape$(EXEEXT): $(unittest_escape_OBJECTS) $(unittest_escape_DEPENDENCIES) $(EXTRA_unittest_escape_DEPENDENCIES) @rm -f unittest_escape$(EXEEXT) $(AM_V_CXXLD)$(unittest_escape_LINK) $(unittest_escape_OBJECTS) $(unittest_escape_LDADD) $(LIBS) @@ -8051,6 +8584,7 @@ test/os/$(DEPDIR)/$(am__dirstamp): @: > test/os/$(DEPDIR)/$(am__dirstamp) test/os/unittest_flatindex-TestFlatIndex.$(OBJEXT): \ test/os/$(am__dirstamp) test/os/$(DEPDIR)/$(am__dirstamp) + unittest_flatindex$(EXEEXT): $(unittest_flatindex_OBJECTS) $(unittest_flatindex_DEPENDENCIES) $(EXTRA_unittest_flatindex_DEPENDENCIES) @rm -f unittest_flatindex$(EXEEXT) $(AM_V_CXXLD)$(unittest_flatindex_LINK) $(unittest_flatindex_OBJECTS) $(unittest_flatindex_LDADD) $(LIBS) @@ -8058,191 +8592,236 @@ test/unittest_formatter-formatter.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) rgw/unittest_formatter-rgw_formats.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(DEPDIR)/$(am__dirstamp) + unittest_formatter$(EXEEXT): $(unittest_formatter_OBJECTS) $(unittest_formatter_DEPENDENCIES) $(EXTRA_unittest_formatter_DEPENDENCIES) @rm -f unittest_formatter$(EXEEXT) $(AM_V_CXXLD)$(unittest_formatter_LINK) $(unittest_formatter_OBJECTS) $(unittest_formatter_LDADD) $(LIBS) test/unittest_gather-gather.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_gather$(EXEEXT): $(unittest_gather_OBJECTS) $(unittest_gather_DEPENDENCIES) $(EXTRA_unittest_gather_DEPENDENCIES) @rm -f unittest_gather$(EXEEXT) $(AM_V_CXXLD)$(unittest_gather_LINK) $(unittest_gather_OBJECTS) $(unittest_gather_LDADD) $(LIBS) test/unittest_heartbeatmap-heartbeat_map.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_heartbeatmap$(EXEEXT): $(unittest_heartbeatmap_OBJECTS) $(unittest_heartbeatmap_DEPENDENCIES) $(EXTRA_unittest_heartbeatmap_DEPENDENCIES) @rm -f unittest_heartbeatmap$(EXEEXT) $(AM_V_CXXLD)$(unittest_heartbeatmap_LINK) $(unittest_heartbeatmap_OBJECTS) $(unittest_heartbeatmap_LDADD) $(LIBS) test/common/unittest_histogram-histogram.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_histogram$(EXEEXT): $(unittest_histogram_OBJECTS) $(unittest_histogram_DEPENDENCIES) $(EXTRA_unittest_histogram_DEPENDENCIES) @rm -f unittest_histogram$(EXEEXT) $(AM_V_CXXLD)$(unittest_histogram_LINK) $(unittest_histogram_OBJECTS) $(unittest_histogram_LDADD) $(LIBS) test/osd/unittest_hitset-hitset.$(OBJEXT): test/osd/$(am__dirstamp) \ test/osd/$(DEPDIR)/$(am__dirstamp) + unittest_hitset$(EXEEXT): $(unittest_hitset_OBJECTS) $(unittest_hitset_DEPENDENCIES) $(EXTRA_unittest_hitset_DEPENDENCIES) @rm -f unittest_hitset$(EXEEXT) $(AM_V_CXXLD)$(unittest_hitset_LINK) $(unittest_hitset_OBJECTS) $(unittest_hitset_LDADD) $(LIBS) +test/common/unittest_io_priority-test_io_priority.$(OBJEXT): \ + test/common/$(am__dirstamp) \ + test/common/$(DEPDIR)/$(am__dirstamp) + +unittest_io_priority$(EXEEXT): $(unittest_io_priority_OBJECTS) $(unittest_io_priority_DEPENDENCIES) $(EXTRA_unittest_io_priority_DEPENDENCIES) + @rm -f unittest_io_priority$(EXEEXT) + $(AM_V_CXXLD)$(unittest_io_priority_LINK) $(unittest_io_priority_OBJECTS) $(unittest_io_priority_LDADD) $(LIBS) test/unittest_ipaddr-test_ipaddr.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_ipaddr$(EXEEXT): $(unittest_ipaddr_OBJECTS) $(unittest_ipaddr_DEPENDENCIES) $(EXTRA_unittest_ipaddr_DEPENDENCIES) @rm -f unittest_ipaddr$(EXEEXT) $(AM_V_CXXLD)$(unittest_ipaddr_LINK) $(unittest_ipaddr_OBJECTS) $(unittest_ipaddr_LDADD) $(LIBS) test/os/unittest_lfnindex-TestLFNIndex.$(OBJEXT): \ test/os/$(am__dirstamp) test/os/$(DEPDIR)/$(am__dirstamp) + unittest_lfnindex$(EXEEXT): $(unittest_lfnindex_OBJECTS) $(unittest_lfnindex_DEPENDENCIES) $(EXTRA_unittest_lfnindex_DEPENDENCIES) @rm -f unittest_lfnindex$(EXEEXT) $(AM_V_CXXLD)$(unittest_lfnindex_LINK) $(unittest_lfnindex_OBJECTS) $(unittest_lfnindex_LDADD) $(LIBS) test/unittest_libcephfs_config-libcephfs_config.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_libcephfs_config$(EXEEXT): $(unittest_libcephfs_config_OBJECTS) $(unittest_libcephfs_config_DEPENDENCIES) $(EXTRA_unittest_libcephfs_config_DEPENDENCIES) @rm -f unittest_libcephfs_config$(EXEEXT) $(AM_V_CXXLD)$(unittest_libcephfs_config_LINK) $(unittest_libcephfs_config_OBJECTS) $(unittest_libcephfs_config_LDADD) $(LIBS) test/librados/unittest_librados-librados.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + unittest_librados$(EXEEXT): $(unittest_librados_OBJECTS) $(unittest_librados_DEPENDENCIES) $(EXTRA_unittest_librados_DEPENDENCIES) @rm -f unittest_librados$(EXEEXT) $(AM_V_CXXLD)$(unittest_librados_LINK) $(unittest_librados_OBJECTS) $(unittest_librados_LDADD) $(LIBS) test/librados/unittest_librados_config-librados_config.$(OBJEXT): \ test/librados/$(am__dirstamp) \ test/librados/$(DEPDIR)/$(am__dirstamp) + unittest_librados_config$(EXEEXT): $(unittest_librados_config_OBJECTS) $(unittest_librados_config_DEPENDENCIES) $(EXTRA_unittest_librados_config_DEPENDENCIES) @rm -f unittest_librados_config$(EXEEXT) $(AM_V_CXXLD)$(unittest_librados_config_LINK) $(unittest_librados_config_OBJECTS) $(unittest_librados_config_LDADD) $(LIBS) log/unittest_log-test.$(OBJEXT): log/$(am__dirstamp) \ log/$(DEPDIR)/$(am__dirstamp) + unittest_log$(EXEEXT): $(unittest_log_OBJECTS) $(unittest_log_DEPENDENCIES) $(EXTRA_unittest_log_DEPENDENCIES) @rm -f unittest_log$(EXEEXT) $(AM_V_CXXLD)$(unittest_log_LINK) $(unittest_log_OBJECTS) $(unittest_log_LDADD) $(LIBS) test/unittest_mime-mime.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_mime$(EXEEXT): $(unittest_mime_OBJECTS) $(unittest_mime_DEPENDENCIES) $(EXTRA_unittest_mime_DEPENDENCIES) @rm -f unittest_mime$(EXEEXT) $(AM_V_CXXLD)$(unittest_mime_LINK) $(unittest_mime_OBJECTS) $(unittest_mime_LDADD) $(LIBS) test/mon/unittest_mon_moncap-moncap.$(OBJEXT): \ test/mon/$(am__dirstamp) test/mon/$(DEPDIR)/$(am__dirstamp) + unittest_mon_moncap$(EXEEXT): $(unittest_mon_moncap_OBJECTS) $(unittest_mon_moncap_DEPENDENCIES) $(EXTRA_unittest_mon_moncap_DEPENDENCIES) @rm -f unittest_mon_moncap$(EXEEXT) $(AM_V_CXXLD)$(unittest_mon_moncap_LINK) $(unittest_mon_moncap_OBJECTS) $(unittest_mon_moncap_LDADD) $(LIBS) test/mon/unittest_mon_pgmap-PGMap.$(OBJEXT): test/mon/$(am__dirstamp) \ test/mon/$(DEPDIR)/$(am__dirstamp) + unittest_mon_pgmap$(EXEEXT): $(unittest_mon_pgmap_OBJECTS) $(unittest_mon_pgmap_DEPENDENCIES) $(EXTRA_unittest_mon_pgmap_DEPENDENCIES) @rm -f unittest_mon_pgmap$(EXEEXT) $(AM_V_CXXLD)$(unittest_mon_pgmap_LINK) $(unittest_mon_pgmap_OBJECTS) $(unittest_mon_pgmap_LDADD) $(LIBS) test/on_exit.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_on_exit$(EXEEXT): $(unittest_on_exit_OBJECTS) $(unittest_on_exit_DEPENDENCIES) $(EXTRA_unittest_on_exit_DEPENDENCIES) @rm -f unittest_on_exit$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(unittest_on_exit_OBJECTS) $(unittest_on_exit_LDADD) $(LIBS) test/osd/unittest_osd_osdcap-osdcap.$(OBJEXT): \ test/osd/$(am__dirstamp) test/osd/$(DEPDIR)/$(am__dirstamp) + unittest_osd_osdcap$(EXEEXT): $(unittest_osd_osdcap_OBJECTS) $(unittest_osd_osdcap_DEPENDENCIES) $(EXTRA_unittest_osd_osdcap_DEPENDENCIES) @rm -f unittest_osd_osdcap$(EXEEXT) $(AM_V_CXXLD)$(unittest_osd_osdcap_LINK) $(unittest_osd_osdcap_OBJECTS) $(unittest_osd_osdcap_LDADD) $(LIBS) test/osd/unittest_osd_types-types.$(OBJEXT): test/osd/$(am__dirstamp) \ test/osd/$(DEPDIR)/$(am__dirstamp) + unittest_osd_types$(EXEEXT): $(unittest_osd_types_OBJECTS) $(unittest_osd_types_DEPENDENCIES) $(EXTRA_unittest_osd_types_DEPENDENCIES) @rm -f unittest_osd_types$(EXEEXT) $(AM_V_CXXLD)$(unittest_osd_types_LINK) $(unittest_osd_types_OBJECTS) $(unittest_osd_types_LDADD) $(LIBS) test/osd/unittest_osdmap-TestOSDMap.$(OBJEXT): \ test/osd/$(am__dirstamp) test/osd/$(DEPDIR)/$(am__dirstamp) + unittest_osdmap$(EXEEXT): $(unittest_osdmap_OBJECTS) $(unittest_osdmap_DEPENDENCIES) $(EXTRA_unittest_osdmap_DEPENDENCIES) @rm -f unittest_osdmap$(EXEEXT) $(AM_V_CXXLD)$(unittest_osdmap_LINK) $(unittest_osdmap_OBJECTS) $(unittest_osdmap_LDADD) $(LIBS) test/unittest_perf_counters-perf_counters.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_perf_counters$(EXEEXT): $(unittest_perf_counters_OBJECTS) $(unittest_perf_counters_DEPENDENCIES) $(EXTRA_unittest_perf_counters_DEPENDENCIES) @rm -f unittest_perf_counters$(EXEEXT) $(AM_V_CXXLD)$(unittest_perf_counters_LINK) $(unittest_perf_counters_OBJECTS) $(unittest_perf_counters_LDADD) $(LIBS) test/osd/unittest_pglog-TestPGLog.$(OBJEXT): test/osd/$(am__dirstamp) \ test/osd/$(DEPDIR)/$(am__dirstamp) + unittest_pglog$(EXEEXT): $(unittest_pglog_OBJECTS) $(unittest_pglog_DEPENDENCIES) $(EXTRA_unittest_pglog_DEPENDENCIES) @rm -f unittest_pglog$(EXEEXT) $(AM_V_CXXLD)$(unittest_pglog_LINK) $(unittest_pglog_OBJECTS) $(unittest_pglog_LDADD) $(LIBS) test/unittest_prebufferedstreambuf-test_prebufferedstreambuf.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_prebufferedstreambuf$(EXEEXT): $(unittest_prebufferedstreambuf_OBJECTS) $(unittest_prebufferedstreambuf_DEPENDENCIES) $(EXTRA_unittest_prebufferedstreambuf_DEPENDENCIES) @rm -f unittest_prebufferedstreambuf$(EXEEXT) $(AM_V_CXXLD)$(unittest_prebufferedstreambuf_LINK) $(unittest_prebufferedstreambuf_OBJECTS) $(unittest_prebufferedstreambuf_LDADD) $(LIBS) test/unittest_run_cmd-run_cmd.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_run_cmd$(EXEEXT): $(unittest_run_cmd_OBJECTS) $(unittest_run_cmd_DEPENDENCIES) $(EXTRA_unittest_run_cmd_DEPENDENCIES) @rm -f unittest_run_cmd$(EXEEXT) $(AM_V_CXXLD)$(unittest_run_cmd_LINK) $(unittest_run_cmd_OBJECTS) $(unittest_run_cmd_LDADD) $(LIBS) test/common/unittest_sharedptr_registry-test_sharedptr_registry.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_sharedptr_registry$(EXEEXT): $(unittest_sharedptr_registry_OBJECTS) $(unittest_sharedptr_registry_DEPENDENCIES) $(EXTRA_unittest_sharedptr_registry_DEPENDENCIES) @rm -f unittest_sharedptr_registry$(EXEEXT) $(AM_V_CXXLD)$(unittest_sharedptr_registry_LINK) $(unittest_sharedptr_registry_OBJECTS) $(unittest_sharedptr_registry_LDADD) $(LIBS) test/unittest_signals-signals.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_signals$(EXEEXT): $(unittest_signals_OBJECTS) $(unittest_signals_DEPENDENCIES) $(EXTRA_unittest_signals_DEPENDENCIES) @rm -f unittest_signals$(EXEEXT) $(AM_V_CXXLD)$(unittest_signals_LINK) $(unittest_signals_OBJECTS) $(unittest_signals_LDADD) $(LIBS) test/unittest_simple_spin-simple_spin.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_simple_spin$(EXEEXT): $(unittest_simple_spin_OBJECTS) $(unittest_simple_spin_DEPENDENCIES) $(EXTRA_unittest_simple_spin_DEPENDENCIES) @rm -f unittest_simple_spin$(EXEEXT) $(AM_V_CXXLD)$(unittest_simple_spin_LINK) $(unittest_simple_spin_OBJECTS) $(unittest_simple_spin_LDADD) $(LIBS) test/common/unittest_sloppy_crc_map-test_sloppy_crc_map.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_sloppy_crc_map$(EXEEXT): $(unittest_sloppy_crc_map_OBJECTS) $(unittest_sloppy_crc_map_DEPENDENCIES) $(EXTRA_unittest_sloppy_crc_map_DEPENDENCIES) @rm -f unittest_sloppy_crc_map$(EXEEXT) $(AM_V_CXXLD)$(unittest_sloppy_crc_map_LINK) $(unittest_sloppy_crc_map_OBJECTS) $(unittest_sloppy_crc_map_LDADD) $(LIBS) test/unittest_str_list-test_str_list.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_str_list$(EXEEXT): $(unittest_str_list_OBJECTS) $(unittest_str_list_DEPENDENCIES) $(EXTRA_unittest_str_list_DEPENDENCIES) @rm -f unittest_str_list$(EXEEXT) $(AM_V_CXXLD)$(unittest_str_list_LINK) $(unittest_str_list_OBJECTS) $(unittest_str_list_LDADD) $(LIBS) test/common/unittest_str_map-test_str_map.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_str_map$(EXEEXT): $(unittest_str_map_OBJECTS) $(unittest_str_map_DEPENDENCIES) $(EXTRA_unittest_str_map_DEPENDENCIES) @rm -f unittest_str_map$(EXEEXT) $(AM_V_CXXLD)$(unittest_str_map_LINK) $(unittest_str_map_OBJECTS) $(unittest_str_map_LDADD) $(LIBS) test/unittest_striper-test_striper.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_striper$(EXEEXT): $(unittest_striper_OBJECTS) $(unittest_striper_DEPENDENCIES) $(EXTRA_unittest_striper_DEPENDENCIES) @rm -f unittest_striper$(EXEEXT) $(AM_V_CXXLD)$(unittest_striper_LINK) $(unittest_striper_OBJECTS) $(unittest_striper_LDADD) $(LIBS) test/unittest_strtol-strtol.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_strtol$(EXEEXT): $(unittest_strtol_OBJECTS) $(unittest_strtol_DEPENDENCIES) $(EXTRA_unittest_strtol_DEPENDENCIES) @rm -f unittest_strtol$(EXEEXT) $(AM_V_CXXLD)$(unittest_strtol_LINK) $(unittest_strtol_OBJECTS) $(unittest_strtol_LDADD) $(LIBS) test/unittest_texttable-test_texttable.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_texttable$(EXEEXT): $(unittest_texttable_OBJECTS) $(unittest_texttable_DEPENDENCIES) $(EXTRA_unittest_texttable_DEPENDENCIES) @rm -f unittest_texttable$(EXEEXT) $(AM_V_CXXLD)$(unittest_texttable_LINK) $(unittest_texttable_OBJECTS) $(unittest_texttable_LDADD) $(LIBS) test/common/unittest_throttle-Throttle.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_throttle$(EXEEXT): $(unittest_throttle_OBJECTS) $(unittest_throttle_DEPENDENCIES) $(EXTRA_unittest_throttle_DEPENDENCIES) @rm -f unittest_throttle$(EXEEXT) $(AM_V_CXXLD)$(unittest_throttle_LINK) $(unittest_throttle_OBJECTS) $(unittest_throttle_LDADD) $(LIBS) test/unittest_utf8-utf8.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + unittest_utf8$(EXEEXT): $(unittest_utf8_OBJECTS) $(unittest_utf8_DEPENDENCIES) $(EXTRA_unittest_utf8_DEPENDENCIES) @rm -f unittest_utf8$(EXEEXT) $(AM_V_CXXLD)$(unittest_utf8_LINK) $(unittest_utf8_OBJECTS) $(unittest_utf8_LDADD) $(LIBS) test/common/unittest_util-test_util.$(OBJEXT): \ test/common/$(am__dirstamp) \ test/common/$(DEPDIR)/$(am__dirstamp) + unittest_util$(EXEEXT): $(unittest_util_OBJECTS) $(unittest_util_DEPENDENCIES) $(EXTRA_unittest_util_DEPENDENCIES) @rm -f unittest_util$(EXEEXT) $(AM_V_CXXLD)$(unittest_util_LINK) $(unittest_util_OBJECTS) $(unittest_util_LDADD) $(LIBS) test/unittest_workqueue-test_workqueue.$(OBJEXT): \ test/$(am__dirstamp) test/$(DEPDIR)/$(am__dirstamp) + unittest_workqueue$(EXEEXT): $(unittest_workqueue_OBJECTS) $(unittest_workqueue_DEPENDENCIES) $(EXTRA_unittest_workqueue_DEPENDENCIES) @rm -f unittest_workqueue$(EXEEXT) $(AM_V_CXXLD)$(unittest_workqueue_LINK) $(unittest_workqueue_OBJECTS) $(unittest_workqueue_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -8273,8 +8852,11 @@ uninstall-binSCRIPTS: dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) install-ceph_sbinSCRIPTS: $(ceph_sbin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(ceph_sbindir)" || $(MKDIR_P) "$(DESTDIR)$(ceph_sbindir)" @list='$(ceph_sbin_SCRIPTS)'; test -n "$(ceph_sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(ceph_sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(ceph_sbindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -8305,8 +8887,11 @@ uninstall-ceph_sbinSCRIPTS: dir='$(DESTDIR)$(ceph_sbindir)'; $(am__uninstall_files_from_dir) install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -8337,8 +8922,11 @@ uninstall-dist_binSCRIPTS: dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) install-sbinSCRIPTS: $(sbin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -8369,8 +8957,11 @@ uninstall-sbinSCRIPTS: dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir) install-shell_commonSCRIPTS: $(shell_common_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(shell_commondir)" || $(MKDIR_P) "$(DESTDIR)$(shell_commondir)" @list='$(shell_common_SCRIPTS)'; test -n "$(shell_commondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(shell_commondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(shell_commondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -8401,8 +8992,11 @@ uninstall-shell_commonSCRIPTS: dir='$(DESTDIR)$(shell_commondir)'; $(am__uninstall_files_from_dir) install-su_sbinSCRIPTS: $(su_sbin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(su_sbindir)" || $(MKDIR_P) "$(DESTDIR)$(su_sbindir)" @list='$(su_sbin_SCRIPTS)'; test -n "$(su_sbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(su_sbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(su_sbindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -8434,1122 +9028,116 @@ uninstall-su_sbinSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f arch/intel.$(OBJEXT) - -rm -f arch/intel.lo - -rm -f arch/neon.$(OBJEXT) - -rm -f arch/neon.lo - -rm -f arch/probe.$(OBJEXT) - -rm -f arch/probe.lo - -rm -f auth/AuthAuthorizeHandler.$(OBJEXT) - -rm -f auth/AuthAuthorizeHandler.lo - -rm -f auth/AuthClientHandler.$(OBJEXT) - -rm -f auth/AuthClientHandler.lo - -rm -f auth/AuthMethodList.$(OBJEXT) - -rm -f auth/AuthMethodList.lo - -rm -f auth/AuthServiceHandler.$(OBJEXT) - -rm -f auth/AuthServiceHandler.lo - -rm -f auth/AuthSessionHandler.$(OBJEXT) - -rm -f auth/AuthSessionHandler.lo - -rm -f auth/Crypto.$(OBJEXT) - -rm -f auth/Crypto.lo - -rm -f auth/KeyRing.$(OBJEXT) - -rm -f auth/KeyRing.lo - -rm -f auth/RotatingKeyRing.$(OBJEXT) - -rm -f auth/RotatingKeyRing.lo - -rm -f auth/cephx/CephxAuthorizeHandler.$(OBJEXT) - -rm -f auth/cephx/CephxAuthorizeHandler.lo - -rm -f auth/cephx/CephxClientHandler.$(OBJEXT) - -rm -f auth/cephx/CephxClientHandler.lo - -rm -f auth/cephx/CephxKeyServer.$(OBJEXT) - -rm -f auth/cephx/CephxKeyServer.lo - -rm -f auth/cephx/CephxProtocol.$(OBJEXT) - -rm -f auth/cephx/CephxProtocol.lo - -rm -f auth/cephx/CephxServiceHandler.$(OBJEXT) - -rm -f auth/cephx/CephxServiceHandler.lo - -rm -f auth/cephx/CephxSessionHandler.$(OBJEXT) - -rm -f auth/cephx/CephxSessionHandler.lo - -rm -f auth/none/AuthNoneAuthorizeHandler.$(OBJEXT) - -rm -f auth/none/AuthNoneAuthorizeHandler.lo - -rm -f auth/unknown/AuthUnknownAuthorizeHandler.$(OBJEXT) - -rm -f auth/unknown/AuthUnknownAuthorizeHandler.lo - -rm -f civetweb/src/radosgw-civetweb.$(OBJEXT) - -rm -f client/Client.$(OBJEXT) - -rm -f client/Client.lo - -rm -f client/ClientSnapRealm.$(OBJEXT) - -rm -f client/ClientSnapRealm.lo - -rm -f client/Dentry.$(OBJEXT) - -rm -f client/Dentry.lo - -rm -f client/Inode.$(OBJEXT) - -rm -f client/Inode.lo - -rm -f client/MetaRequest.$(OBJEXT) - -rm -f client/MetaRequest.lo - -rm -f client/MetaSession.$(OBJEXT) - -rm -f client/MetaSession.lo - -rm -f client/SyntheticClient.$(OBJEXT) - -rm -f client/Trace.$(OBJEXT) - -rm -f client/Trace.lo - -rm -f client/fuse_ll.$(OBJEXT) - -rm -f client/fuse_ll.lo - -rm -f client/test_ioctls.$(OBJEXT) - -rm -f cls/hello/cls_hello.$(OBJEXT) - -rm -f cls/hello/cls_hello.lo - -rm -f cls/lock/cls_lock.$(OBJEXT) - -rm -f cls/lock/cls_lock.lo - -rm -f cls/lock/cls_lock_client.$(OBJEXT) - -rm -f cls/lock/cls_lock_client.lo - -rm -f cls/lock/cls_lock_ops.$(OBJEXT) - -rm -f cls/lock/cls_lock_ops.lo - -rm -f cls/lock/cls_lock_types.$(OBJEXT) - -rm -f cls/lock/cls_lock_types.lo - -rm -f cls/log/cls_log.$(OBJEXT) - -rm -f cls/log/cls_log.lo - -rm -f cls/log/cls_log_client.$(OBJEXT) - -rm -f cls/rbd/cls_rbd.$(OBJEXT) - -rm -f cls/rbd/cls_rbd.lo - -rm -f cls/rbd/cls_rbd_client.$(OBJEXT) - -rm -f cls/rbd/cls_rbd_client.lo - -rm -f cls/refcount/cls_refcount.$(OBJEXT) - -rm -f cls/refcount/cls_refcount.lo - -rm -f cls/refcount/cls_refcount_client.$(OBJEXT) - -rm -f cls/refcount/cls_refcount_client.lo - -rm -f cls/refcount/cls_refcount_ops.$(OBJEXT) - -rm -f cls/refcount/cls_refcount_ops.lo - -rm -f cls/replica_log/cls_replica_log.$(OBJEXT) - -rm -f cls/replica_log/cls_replica_log.lo - -rm -f cls/replica_log/cls_replica_log_client.$(OBJEXT) - -rm -f cls/replica_log/cls_replica_log_ops.$(OBJEXT) - -rm -f cls/replica_log/cls_replica_log_types.$(OBJEXT) - -rm -f cls/rgw/cls_rgw.$(OBJEXT) - -rm -f cls/rgw/cls_rgw.lo - -rm -f cls/rgw/cls_rgw_client.$(OBJEXT) - -rm -f cls/rgw/cls_rgw_client.lo - -rm -f cls/rgw/cls_rgw_ops.$(OBJEXT) - -rm -f cls/rgw/cls_rgw_ops.lo - -rm -f cls/rgw/cls_rgw_types.$(OBJEXT) - -rm -f cls/rgw/cls_rgw_types.lo - -rm -f cls/statelog/cls_statelog.$(OBJEXT) - -rm -f cls/statelog/cls_statelog.lo - -rm -f cls/statelog/cls_statelog_client.$(OBJEXT) - -rm -f cls/user/cls_user.$(OBJEXT) - -rm -f cls/user/cls_user.lo - -rm -f cls/user/cls_user_client.$(OBJEXT) - -rm -f cls/user/cls_user_ops.$(OBJEXT) - -rm -f cls/user/cls_user_types.$(OBJEXT) - -rm -f cls/version/cls_version.$(OBJEXT) - -rm -f cls/version/cls_version.lo - -rm -f cls/version/cls_version_client.$(OBJEXT) - -rm -f cls/version/cls_version_types.$(OBJEXT) - -rm -f common/BackTrace.$(OBJEXT) - -rm -f common/BackTrace.lo - -rm -f common/Clock.$(OBJEXT) - -rm -f common/Clock.lo - -rm -f common/ConfUtils.$(OBJEXT) - -rm -f common/ConfUtils.lo - -rm -f common/DecayCounter.$(OBJEXT) - -rm -f common/DecayCounter.lo - -rm -f common/Finisher.$(OBJEXT) - -rm -f common/Finisher.lo - -rm -f common/Formatter.$(OBJEXT) - -rm -f common/Formatter.lo - -rm -f common/HeartbeatMap.$(OBJEXT) - -rm -f common/HeartbeatMap.lo - -rm -f common/LogClient.$(OBJEXT) - -rm -f common/LogClient.lo - -rm -f common/LogEntry.$(OBJEXT) - -rm -f common/LogEntry.lo - -rm -f common/MemoryModel.$(OBJEXT) - -rm -f common/MemoryModel.lo - -rm -f common/Mutex.$(OBJEXT) - -rm -f common/Mutex.lo - -rm -f common/OutputDataSocket.$(OBJEXT) - -rm -f common/OutputDataSocket.lo - -rm -f common/PrebufferedStreambuf.$(OBJEXT) - -rm -f common/PrebufferedStreambuf.lo - -rm -f common/RefCountedObj.$(OBJEXT) - -rm -f common/RefCountedObj.lo - -rm -f common/SloppyCRCMap.$(OBJEXT) - -rm -f common/SloppyCRCMap.lo - -rm -f common/TextTable.$(OBJEXT) - -rm -f common/TextTable.lo - -rm -f common/Thread.$(OBJEXT) - -rm -f common/Thread.lo - -rm -f common/Throttle.$(OBJEXT) - -rm -f common/Throttle.lo - -rm -f common/Timer.$(OBJEXT) - -rm -f common/Timer.lo - -rm -f common/WorkQueue.$(OBJEXT) - -rm -f common/WorkQueue.lo - -rm -f common/addr_parsing.$(OBJEXT) - -rm -f common/addr_parsing.lo - -rm -f common/admin_socket.$(OBJEXT) - -rm -f common/admin_socket.lo - -rm -f common/admin_socket_client.$(OBJEXT) - -rm -f common/admin_socket_client.lo - -rm -f common/armor.$(OBJEXT) - -rm -f common/armor.lo - -rm -f common/assert.$(OBJEXT) - -rm -f common/assert.lo - -rm -f common/blkdev.$(OBJEXT) - -rm -f common/blkdev.lo - -rm -f common/bloom_filter.$(OBJEXT) - -rm -f common/bloom_filter.lo - -rm -f common/buffer.$(OBJEXT) - -rm -f common/buffer.lo - -rm -f common/ceph_argparse.$(OBJEXT) - -rm -f common/ceph_argparse.lo - -rm -f common/ceph_context.$(OBJEXT) - -rm -f common/ceph_context.lo - -rm -f common/ceph_crypto.$(OBJEXT) - -rm -f common/ceph_crypto.lo - -rm -f common/ceph_crypto_cms.$(OBJEXT) - -rm -f common/ceph_crypto_cms.lo - -rm -f common/ceph_frag.$(OBJEXT) - -rm -f common/ceph_frag.lo - -rm -f common/ceph_fs.$(OBJEXT) - -rm -f common/ceph_fs.lo - -rm -f common/ceph_hash.$(OBJEXT) - -rm -f common/ceph_hash.lo - -rm -f common/ceph_json.$(OBJEXT) - -rm -f common/ceph_json.lo - -rm -f common/ceph_strings.$(OBJEXT) - -rm -f common/ceph_strings.lo - -rm -f common/cmdparse.$(OBJEXT) - -rm -f common/cmdparse.lo - -rm -f common/code_environment.$(OBJEXT) - -rm -f common/code_environment.lo - -rm -f common/common_init.$(OBJEXT) - -rm -f common/common_init.lo - -rm -f common/config.$(OBJEXT) - -rm -f common/config.lo - -rm -f common/dout.$(OBJEXT) - -rm -f common/dout.lo - -rm -f common/entity_name.$(OBJEXT) - -rm -f common/entity_name.lo - -rm -f common/environment.$(OBJEXT) - -rm -f common/environment.lo - -rm -f common/errno.$(OBJEXT) - -rm -f common/errno.lo - -rm -f common/escape.$(OBJEXT) - -rm -f common/escape.lo - -rm -f common/fd.$(OBJEXT) - -rm -f common/fd.lo - -rm -f common/hex.$(OBJEXT) - -rm -f common/hex.lo - -rm -f common/histogram.$(OBJEXT) - -rm -f common/histogram.lo - -rm -f common/hobject.$(OBJEXT) - -rm -f common/hobject.lo - -rm -f common/io_priority.$(OBJEXT) - -rm -f common/io_priority.lo - -rm -f common/ipaddr.$(OBJEXT) - -rm -f common/ipaddr.lo - -rm -f common/libcommon_crc_la-crc32c.$(OBJEXT) - -rm -f common/libcommon_crc_la-crc32c.lo - -rm -f common/libcommon_crc_la-crc32c_intel_baseline.$(OBJEXT) - -rm -f common/libcommon_crc_la-crc32c_intel_baseline.lo - -rm -f common/libcommon_crc_la-crc32c_intel_fast.$(OBJEXT) - -rm -f common/libcommon_crc_la-crc32c_intel_fast.lo - -rm -f common/libcommon_crc_la-crc32c_intel_fast_asm.$(OBJEXT) - -rm -f common/libcommon_crc_la-crc32c_intel_fast_asm.lo - -rm -f common/libcommon_crc_la-crc32c_intel_fast_zero_asm.$(OBJEXT) - -rm -f common/libcommon_crc_la-crc32c_intel_fast_zero_asm.lo - -rm -f common/libcommon_crc_la-sctp_crc32.$(OBJEXT) - -rm -f common/libcommon_crc_la-sctp_crc32.lo - -rm -f common/libos_la-TrackedOp.$(OBJEXT) - -rm -f common/libos_la-TrackedOp.lo - -rm -f common/libosd_la-TrackedOp.$(OBJEXT) - -rm -f common/libosd_la-TrackedOp.lo - -rm -f common/linux_version.$(OBJEXT) - -rm -f common/linux_version.lo - -rm -f common/lockdep.$(OBJEXT) - -rm -f common/lockdep.lo - -rm -f common/mime.$(OBJEXT) - -rm -f common/mime.lo - -rm -f common/obj_bencher.$(OBJEXT) - -rm -f common/page.$(OBJEXT) - -rm -f common/page.lo - -rm -f common/perf_counters.$(OBJEXT) - -rm -f common/perf_counters.lo - -rm -f common/pick_address.$(OBJEXT) - -rm -f common/pick_address.lo - -rm -f common/pipe.$(OBJEXT) - -rm -f common/pipe.lo - -rm -f common/rest_bench-obj_bencher.$(OBJEXT) - -rm -f common/run_cmd.$(OBJEXT) - -rm -f common/run_cmd.lo - -rm -f common/safe_io.$(OBJEXT) - -rm -f common/safe_io.lo - -rm -f common/secret.$(OBJEXT) - -rm -f common/signal.$(OBJEXT) - -rm -f common/signal.lo - -rm -f common/simple_spin.$(OBJEXT) - -rm -f common/simple_spin.lo - -rm -f common/snap_types.$(OBJEXT) - -rm -f common/snap_types.lo - -rm -f common/str_list.$(OBJEXT) - -rm -f common/str_list.lo - -rm -f common/str_map.$(OBJEXT) - -rm -f common/str_map.lo - -rm -f common/strtol.$(OBJEXT) - -rm -f common/strtol.lo - -rm -f common/test_build_libcommon-BackTrace.$(OBJEXT) - -rm -f common/test_build_libcommon-Clock.$(OBJEXT) - -rm -f common/test_build_libcommon-ConfUtils.$(OBJEXT) - -rm -f common/test_build_libcommon-DecayCounter.$(OBJEXT) - -rm -f common/test_build_libcommon-Finisher.$(OBJEXT) - -rm -f common/test_build_libcommon-Formatter.$(OBJEXT) - -rm -f common/test_build_libcommon-HeartbeatMap.$(OBJEXT) - -rm -f common/test_build_libcommon-LogClient.$(OBJEXT) - -rm -f common/test_build_libcommon-LogEntry.$(OBJEXT) - -rm -f common/test_build_libcommon-MemoryModel.$(OBJEXT) - -rm -f common/test_build_libcommon-Mutex.$(OBJEXT) - -rm -f common/test_build_libcommon-OutputDataSocket.$(OBJEXT) - -rm -f common/test_build_libcommon-PrebufferedStreambuf.$(OBJEXT) - -rm -f common/test_build_libcommon-RefCountedObj.$(OBJEXT) - -rm -f common/test_build_libcommon-SloppyCRCMap.$(OBJEXT) - -rm -f common/test_build_libcommon-TextTable.$(OBJEXT) - -rm -f common/test_build_libcommon-Thread.$(OBJEXT) - -rm -f common/test_build_libcommon-Throttle.$(OBJEXT) - -rm -f common/test_build_libcommon-Timer.$(OBJEXT) - -rm -f common/test_build_libcommon-WorkQueue.$(OBJEXT) - -rm -f common/test_build_libcommon-addr_parsing.$(OBJEXT) - -rm -f common/test_build_libcommon-admin_socket.$(OBJEXT) - -rm -f common/test_build_libcommon-admin_socket_client.$(OBJEXT) - -rm -f common/test_build_libcommon-armor.$(OBJEXT) - -rm -f common/test_build_libcommon-assert.$(OBJEXT) - -rm -f common/test_build_libcommon-blkdev.$(OBJEXT) - -rm -f common/test_build_libcommon-bloom_filter.$(OBJEXT) - -rm -f common/test_build_libcommon-buffer.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_argparse.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_context.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_crypto.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_crypto_cms.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_frag.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_fs.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_hash.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_json.$(OBJEXT) - -rm -f common/test_build_libcommon-ceph_strings.$(OBJEXT) - -rm -f common/test_build_libcommon-cmdparse.$(OBJEXT) - -rm -f common/test_build_libcommon-code_environment.$(OBJEXT) - -rm -f common/test_build_libcommon-common_init.$(OBJEXT) - -rm -f common/test_build_libcommon-config.$(OBJEXT) - -rm -f common/test_build_libcommon-dout.$(OBJEXT) - -rm -f common/test_build_libcommon-entity_name.$(OBJEXT) - -rm -f common/test_build_libcommon-environment.$(OBJEXT) - -rm -f common/test_build_libcommon-errno.$(OBJEXT) - -rm -f common/test_build_libcommon-escape.$(OBJEXT) - -rm -f common/test_build_libcommon-fd.$(OBJEXT) - -rm -f common/test_build_libcommon-hex.$(OBJEXT) - -rm -f common/test_build_libcommon-histogram.$(OBJEXT) - -rm -f common/test_build_libcommon-hobject.$(OBJEXT) - -rm -f common/test_build_libcommon-io_priority.$(OBJEXT) - -rm -f common/test_build_libcommon-ipaddr.$(OBJEXT) - -rm -f common/test_build_libcommon-linux_version.$(OBJEXT) - -rm -f common/test_build_libcommon-lockdep.$(OBJEXT) - -rm -f common/test_build_libcommon-mime.$(OBJEXT) - -rm -f common/test_build_libcommon-page.$(OBJEXT) - -rm -f common/test_build_libcommon-perf_counters.$(OBJEXT) - -rm -f common/test_build_libcommon-pick_address.$(OBJEXT) - -rm -f common/test_build_libcommon-pipe.$(OBJEXT) - -rm -f common/test_build_libcommon-run_cmd.$(OBJEXT) - -rm -f common/test_build_libcommon-safe_io.$(OBJEXT) - -rm -f common/test_build_libcommon-signal.$(OBJEXT) - -rm -f common/test_build_libcommon-simple_spin.$(OBJEXT) - -rm -f common/test_build_libcommon-snap_types.$(OBJEXT) - -rm -f common/test_build_libcommon-str_list.$(OBJEXT) - -rm -f common/test_build_libcommon-str_map.$(OBJEXT) - -rm -f common/test_build_libcommon-strtol.$(OBJEXT) - -rm -f common/test_build_libcommon-utf8.$(OBJEXT) - -rm -f common/test_build_libcommon-util.$(OBJEXT) - -rm -f common/test_build_libcommon-version.$(OBJEXT) - -rm -f common/test_build_libcommon-xattr.$(OBJEXT) - -rm -f common/utf8.$(OBJEXT) - -rm -f common/utf8.lo - -rm -f common/util.$(OBJEXT) - -rm -f common/util.lo - -rm -f common/version.$(OBJEXT) - -rm -f common/version.lo - -rm -f common/xattr.$(OBJEXT) - -rm -f common/xattr.lo - -rm -f crush/CrushCompiler.$(OBJEXT) - -rm -f crush/CrushCompiler.lo - -rm -f crush/CrushTester.$(OBJEXT) - -rm -f crush/CrushTester.lo - -rm -f crush/CrushWrapper.$(OBJEXT) - -rm -f crush/CrushWrapper.lo - -rm -f crush/builder.$(OBJEXT) - -rm -f crush/builder.lo - -rm -f crush/crush.$(OBJEXT) - -rm -f crush/crush.lo - -rm -f crush/hash.$(OBJEXT) - -rm -f crush/hash.lo - -rm -f crush/mapper.$(OBJEXT) - -rm -f crush/mapper.lo - -rm -f erasure-code/ErasureCodePlugin.$(OBJEXT) - -rm -f erasure-code/ErasureCodePlugin.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_general.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_general.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_method.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_method.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_rand.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_rand.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w128.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w128.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w16.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w16.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w32.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w32.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w4.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w4.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w64.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w64.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w8.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_w8.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_wgen.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_generic_la-gf_wgen.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_general.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_general.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_method.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_method.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_rand.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_rand.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w128.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w128.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w16.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w16.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w32.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w32.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w4.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w4.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w64.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w64.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w8.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_w8.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_wgen.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse3_la-gf_wgen.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_general.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_general.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_method.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_method.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_rand.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_rand.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w128.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w128.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w16.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w16.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w32.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w32.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w4.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w4.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w64.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w64.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w8.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_w8.lo - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_wgen.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/libec_jerasure_sse4_la-gf_wgen.lo - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_general.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_method.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_rand.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_w128.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_w16.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_w32.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_w4.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_w64.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_w8.$(OBJEXT) - -rm -f erasure-code/jerasure/gf-complete/src/unittest_erasure_code_jerasure-gf_wgen.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-cauchy.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-cauchy.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-galois.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-galois.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-jerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-jerasure.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-liberation.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-liberation.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-reed_sol.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_generic_la-reed_sol.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-cauchy.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-cauchy.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-galois.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-galois.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-jerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-jerasure.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-liberation.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-liberation.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-reed_sol.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse3_la-reed_sol.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-cauchy.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-cauchy.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-galois.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-galois.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-jerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-jerasure.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-liberation.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-liberation.lo - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-reed_sol.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/libec_jerasure_sse4_la-reed_sol.lo - -rm -f erasure-code/jerasure/jerasure/src/unittest_erasure_code_jerasure-cauchy.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/unittest_erasure_code_jerasure-galois.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/unittest_erasure_code_jerasure-jerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/unittest_erasure_code_jerasure-liberation.$(OBJEXT) - -rm -f erasure-code/jerasure/jerasure/src/unittest_erasure_code_jerasure-reed_sol.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_generic_la-ErasureCodeJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_generic_la-ErasureCodeJerasure.lo - -rm -f erasure-code/jerasure/libec_jerasure_generic_la-ErasureCodePluginJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_generic_la-ErasureCodePluginJerasure.lo - -rm -f erasure-code/jerasure/libec_jerasure_la-ErasureCodePluginSelectJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_la-ErasureCodePluginSelectJerasure.lo - -rm -f erasure-code/jerasure/libec_jerasure_sse3_la-ErasureCodeJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_sse3_la-ErasureCodeJerasure.lo - -rm -f erasure-code/jerasure/libec_jerasure_sse3_la-ErasureCodePluginJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_sse3_la-ErasureCodePluginJerasure.lo - -rm -f erasure-code/jerasure/libec_jerasure_sse4_la-ErasureCodeJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_sse4_la-ErasureCodeJerasure.lo - -rm -f erasure-code/jerasure/libec_jerasure_sse4_la-ErasureCodePluginJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/libec_jerasure_sse4_la-ErasureCodePluginJerasure.lo - -rm -f erasure-code/jerasure/unittest_erasure_code_jerasure-ErasureCodeJerasure.$(OBJEXT) - -rm -f erasure-code/jerasure/unittest_erasure_code_jerasure-ErasureCodePluginJerasure.$(OBJEXT) - -rm -f global/global_context.$(OBJEXT) - -rm -f global/global_context.lo - -rm -f global/global_init.$(OBJEXT) - -rm -f global/global_init.lo - -rm -f global/pidfile.$(OBJEXT) - -rm -f global/pidfile.lo - -rm -f global/signal_handler.$(OBJEXT) - -rm -f global/signal_handler.lo - -rm -f java/native/libcephfs_jni_la-JniConstants.$(OBJEXT) - -rm -f java/native/libcephfs_jni_la-JniConstants.lo - -rm -f java/native/libcephfs_jni_la-libcephfs_jni.$(OBJEXT) - -rm -f java/native/libcephfs_jni_la-libcephfs_jni.lo - -rm -f json_spirit/json_spirit_reader.$(OBJEXT) - -rm -f json_spirit/json_spirit_reader.lo - -rm -f json_spirit/json_spirit_writer.$(OBJEXT) - -rm -f json_spirit/json_spirit_writer.lo - -rm -f key_value_store/cls_kvs.$(OBJEXT) - -rm -f key_value_store/cls_kvs.lo - -rm -f key_value_store/kv_flat_btree_async.$(OBJEXT) - -rm -f librados/librados_la-IoCtxImpl.$(OBJEXT) - -rm -f librados/librados_la-IoCtxImpl.lo - -rm -f librados/librados_la-RadosClient.$(OBJEXT) - -rm -f librados/librados_la-RadosClient.lo - -rm -f librados/librados_la-librados.$(OBJEXT) - -rm -f librados/librados_la-librados.lo - -rm -f librados/librados_la-snap_set_diff.$(OBJEXT) - -rm -f librados/librados_la-snap_set_diff.lo - -rm -f librados/test_build_librados-IoCtxImpl.$(OBJEXT) - -rm -f librados/test_build_librados-RadosClient.$(OBJEXT) - -rm -f librados/test_build_librados-librados.$(OBJEXT) - -rm -f librados/test_build_librados-snap_set_diff.$(OBJEXT) - -rm -f librbd/AioCompletion.$(OBJEXT) - -rm -f librbd/AioCompletion.lo - -rm -f librbd/AioRequest.$(OBJEXT) - -rm -f librbd/AioRequest.lo - -rm -f librbd/ImageCtx.$(OBJEXT) - -rm -f librbd/ImageCtx.lo - -rm -f librbd/LibrbdWriteback.$(OBJEXT) - -rm -f librbd/LibrbdWriteback.lo - -rm -f librbd/WatchCtx.$(OBJEXT) - -rm -f librbd/WatchCtx.lo - -rm -f librbd/internal.$(OBJEXT) - -rm -f librbd/internal.lo - -rm -f librbd/librbd.$(OBJEXT) - -rm -f librbd/librbd.lo - -rm -f log/Log.$(OBJEXT) - -rm -f log/Log.lo - -rm -f log/SubsystemMap.$(OBJEXT) - -rm -f log/SubsystemMap.lo - -rm -f log/unittest_log-test.$(OBJEXT) - -rm -f mds/Anchor.$(OBJEXT) - -rm -f mds/Anchor.lo - -rm -f mds/AnchorClient.$(OBJEXT) - -rm -f mds/AnchorClient.lo - -rm -f mds/AnchorServer.$(OBJEXT) - -rm -f mds/AnchorServer.lo - -rm -f mds/CDentry.$(OBJEXT) - -rm -f mds/CDentry.lo - -rm -f mds/CDir.$(OBJEXT) - -rm -f mds/CDir.lo - -rm -f mds/CInode.$(OBJEXT) - -rm -f mds/CInode.lo - -rm -f mds/Capability.$(OBJEXT) - -rm -f mds/Capability.lo - -rm -f mds/Dumper.$(OBJEXT) - -rm -f mds/Dumper.lo - -rm -f mds/InoTable.$(OBJEXT) - -rm -f mds/InoTable.lo - -rm -f mds/Locker.$(OBJEXT) - -rm -f mds/Locker.lo - -rm -f mds/LogEvent.$(OBJEXT) - -rm -f mds/LogEvent.lo - -rm -f mds/MDBalancer.$(OBJEXT) - -rm -f mds/MDBalancer.lo - -rm -f mds/MDCache.$(OBJEXT) - -rm -f mds/MDCache.lo - -rm -f mds/MDLog.$(OBJEXT) - -rm -f mds/MDLog.lo - -rm -f mds/MDS.$(OBJEXT) - -rm -f mds/MDS.lo - -rm -f mds/MDSMap.$(OBJEXT) - -rm -f mds/MDSMap.lo - -rm -f mds/MDSTable.$(OBJEXT) - -rm -f mds/MDSTable.lo - -rm -f mds/MDSTableClient.$(OBJEXT) - -rm -f mds/MDSTableClient.lo - -rm -f mds/MDSTableServer.$(OBJEXT) - -rm -f mds/MDSTableServer.lo - -rm -f mds/MDSUtility.$(OBJEXT) - -rm -f mds/MDSUtility.lo - -rm -f mds/Migrator.$(OBJEXT) - -rm -f mds/Migrator.lo - -rm -f mds/Mutation.$(OBJEXT) - -rm -f mds/Mutation.lo - -rm -f mds/Resetter.$(OBJEXT) - -rm -f mds/Resetter.lo - -rm -f mds/Server.$(OBJEXT) - -rm -f mds/Server.lo - -rm -f mds/SessionMap.$(OBJEXT) - -rm -f mds/SessionMap.lo - -rm -f mds/SnapRealm.$(OBJEXT) - -rm -f mds/SnapRealm.lo - -rm -f mds/SnapServer.$(OBJEXT) - -rm -f mds/SnapServer.lo - -rm -f mds/flock.$(OBJEXT) - -rm -f mds/flock.lo - -rm -f mds/inode_backtrace.$(OBJEXT) - -rm -f mds/inode_backtrace.lo - -rm -f mds/journal.$(OBJEXT) - -rm -f mds/journal.lo - -rm -f mds/locks.$(OBJEXT) - -rm -f mds/locks.lo - -rm -f mds/mdstypes.$(OBJEXT) - -rm -f mds/mdstypes.lo - -rm -f mds/snap.$(OBJEXT) - -rm -f mds/snap.lo - -rm -f mds/test_build_libcommon-MDSMap.$(OBJEXT) - -rm -f mds/test_build_libcommon-inode_backtrace.$(OBJEXT) - -rm -f mds/test_build_libcommon-mdstypes.$(OBJEXT) - -rm -f mon/AuthMonitor.$(OBJEXT) - -rm -f mon/AuthMonitor.lo - -rm -f mon/ConfigKeyService.$(OBJEXT) - -rm -f mon/ConfigKeyService.lo - -rm -f mon/DataHealthService.$(OBJEXT) - -rm -f mon/DataHealthService.lo - -rm -f mon/Elector.$(OBJEXT) - -rm -f mon/Elector.lo - -rm -f mon/HealthMonitor.$(OBJEXT) - -rm -f mon/HealthMonitor.lo - -rm -f mon/LogMonitor.$(OBJEXT) - -rm -f mon/LogMonitor.lo - -rm -f mon/MDSMonitor.$(OBJEXT) - -rm -f mon/MDSMonitor.lo - -rm -f mon/MonCap.$(OBJEXT) - -rm -f mon/MonCap.lo - -rm -f mon/MonClient.$(OBJEXT) - -rm -f mon/MonClient.lo - -rm -f mon/MonMap.$(OBJEXT) - -rm -f mon/MonMap.lo - -rm -f mon/Monitor.$(OBJEXT) - -rm -f mon/Monitor.lo - -rm -f mon/MonitorStore.$(OBJEXT) - -rm -f mon/MonitorStore.lo - -rm -f mon/MonmapMonitor.$(OBJEXT) - -rm -f mon/MonmapMonitor.lo - -rm -f mon/OSDMonitor.$(OBJEXT) - -rm -f mon/OSDMonitor.lo - -rm -f mon/PGMap.$(OBJEXT) - -rm -f mon/PGMap.lo - -rm -f mon/PGMonitor.$(OBJEXT) - -rm -f mon/PGMonitor.lo - -rm -f mon/Paxos.$(OBJEXT) - -rm -f mon/Paxos.lo - -rm -f mon/PaxosService.$(OBJEXT) - -rm -f mon/PaxosService.lo - -rm -f mon/test_build_libcommon-MonCap.$(OBJEXT) - -rm -f mon/test_build_libcommon-MonClient.$(OBJEXT) - -rm -f mon/test_build_libcommon-MonMap.$(OBJEXT) - -rm -f mount/mount.ceph.$(OBJEXT) - -rm -f msg/Accepter.$(OBJEXT) - -rm -f msg/Accepter.lo - -rm -f msg/DispatchQueue.$(OBJEXT) - -rm -f msg/DispatchQueue.lo - -rm -f msg/Message.$(OBJEXT) - -rm -f msg/Message.lo - -rm -f msg/Messenger.$(OBJEXT) - -rm -f msg/Messenger.lo - -rm -f msg/Pipe.$(OBJEXT) - -rm -f msg/Pipe.lo - -rm -f msg/SimpleMessenger.$(OBJEXT) - -rm -f msg/SimpleMessenger.lo - -rm -f msg/msg_types.$(OBJEXT) - -rm -f msg/msg_types.lo - -rm -f objclass/libosd_la-class_api.$(OBJEXT) - -rm -f objclass/libosd_la-class_api.lo - -rm -f os/libos_la-BtrfsFileStoreBackend.$(OBJEXT) - -rm -f os/libos_la-BtrfsFileStoreBackend.lo - -rm -f os/libos_la-DBObjectMap.$(OBJEXT) - -rm -f os/libos_la-DBObjectMap.lo - -rm -f os/libos_la-FileJournal.$(OBJEXT) - -rm -f os/libos_la-FileJournal.lo - -rm -f os/libos_la-FileStore.$(OBJEXT) - -rm -f os/libos_la-FileStore.lo - -rm -f os/libos_la-FlatIndex.$(OBJEXT) - -rm -f os/libos_la-FlatIndex.lo - -rm -f os/libos_la-GenericFileStoreBackend.$(OBJEXT) - -rm -f os/libos_la-GenericFileStoreBackend.lo - -rm -f os/libos_la-GenericObjectMap.$(OBJEXT) - -rm -f os/libos_la-GenericObjectMap.lo - -rm -f os/libos_la-HashIndex.$(OBJEXT) - -rm -f os/libos_la-HashIndex.lo - -rm -f os/libos_la-IndexManager.$(OBJEXT) - -rm -f os/libos_la-IndexManager.lo - -rm -f os/libos_la-JournalingObjectStore.$(OBJEXT) - -rm -f os/libos_la-JournalingObjectStore.lo - -rm -f os/libos_la-KeyValueStore.$(OBJEXT) - -rm -f os/libos_la-KeyValueStore.lo - -rm -f os/libos_la-LFNIndex.$(OBJEXT) - -rm -f os/libos_la-LFNIndex.lo - -rm -f os/libos_la-LevelDBStore.$(OBJEXT) - -rm -f os/libos_la-LevelDBStore.lo - -rm -f os/libos_la-MemStore.$(OBJEXT) - -rm -f os/libos_la-MemStore.lo - -rm -f os/libos_la-ObjectStore.$(OBJEXT) - -rm -f os/libos_la-ObjectStore.lo - -rm -f os/libos_la-WBThrottle.$(OBJEXT) - -rm -f os/libos_la-WBThrottle.lo - -rm -f os/libos_la-XfsFileStoreBackend.$(OBJEXT) - -rm -f os/libos_la-XfsFileStoreBackend.lo - -rm -f os/libos_la-ZFSFileStoreBackend.$(OBJEXT) - -rm -f os/libos_la-ZFSFileStoreBackend.lo - -rm -f os/libos_la-chain_xattr.$(OBJEXT) - -rm -f os/libos_la-chain_xattr.lo - -rm -f os/libos_types_la-Transaction.$(OBJEXT) - -rm -f os/libos_types_la-Transaction.lo - -rm -f os/libos_zfs_a-ZFS.$(OBJEXT) - -rm -f osd/ECMsgTypes.$(OBJEXT) - -rm -f osd/ECMsgTypes.lo - -rm -f osd/HitSet.$(OBJEXT) - -rm -f osd/HitSet.lo - -rm -f osd/OSDMap.$(OBJEXT) - -rm -f osd/OSDMap.lo - -rm -f osd/ceph_test_rados_api_tier-HitSet.$(OBJEXT) - -rm -f osd/libosd_la-Ager.$(OBJEXT) - -rm -f osd/libosd_la-Ager.lo - -rm -f osd/libosd_la-ClassHandler.$(OBJEXT) - -rm -f osd/libosd_la-ClassHandler.lo - -rm -f osd/libosd_la-ECBackend.$(OBJEXT) - -rm -f osd/libosd_la-ECBackend.lo - -rm -f osd/libosd_la-ECMsgTypes.$(OBJEXT) - -rm -f osd/libosd_la-ECMsgTypes.lo - -rm -f osd/libosd_la-ECTransaction.$(OBJEXT) - -rm -f osd/libosd_la-ECTransaction.lo - -rm -f osd/libosd_la-HitSet.$(OBJEXT) - -rm -f osd/libosd_la-HitSet.lo - -rm -f osd/libosd_la-OSD.$(OBJEXT) - -rm -f osd/libosd_la-OSD.lo - -rm -f osd/libosd_la-OSDCap.$(OBJEXT) - -rm -f osd/libosd_la-OSDCap.lo - -rm -f osd/libosd_la-OpRequest.$(OBJEXT) - -rm -f osd/libosd_la-OpRequest.lo - -rm -f osd/libosd_la-PG.$(OBJEXT) - -rm -f osd/libosd_la-PG.lo - -rm -f osd/libosd_la-PGBackend.$(OBJEXT) - -rm -f osd/libosd_la-PGBackend.lo - -rm -f osd/libosd_la-ReplicatedBackend.$(OBJEXT) - -rm -f osd/libosd_la-ReplicatedBackend.lo - -rm -f osd/libosd_la-ReplicatedPG.$(OBJEXT) - -rm -f osd/libosd_la-ReplicatedPG.lo - -rm -f osd/libosd_la-SnapMapper.$(OBJEXT) - -rm -f osd/libosd_la-SnapMapper.lo - -rm -f osd/libosd_la-Watch.$(OBJEXT) - -rm -f osd/libosd_la-Watch.lo - -rm -f osd/libosd_types_la-ECUtil.$(OBJEXT) - -rm -f osd/libosd_types_la-ECUtil.lo - -rm -f osd/libosd_types_la-PGLog.$(OBJEXT) - -rm -f osd/libosd_types_la-PGLog.lo - -rm -f osd/libosd_types_la-osd_types.$(OBJEXT) - -rm -f osd/libosd_types_la-osd_types.lo - -rm -f osd/osd_types.$(OBJEXT) - -rm -f osd/osd_types.lo - -rm -f osd/test_build_libcommon-ECMsgTypes.$(OBJEXT) - -rm -f osd/test_build_libcommon-HitSet.$(OBJEXT) - -rm -f osd/test_build_libcommon-OSDMap.$(OBJEXT) - -rm -f osd/test_build_libcommon-osd_types.$(OBJEXT) - -rm -f osdc/Filer.$(OBJEXT) - -rm -f osdc/Filer.lo - -rm -f osdc/Journaler.$(OBJEXT) - -rm -f osdc/Journaler.lo - -rm -f osdc/ObjectCacher.$(OBJEXT) - -rm -f osdc/ObjectCacher.lo - -rm -f osdc/Objecter.$(OBJEXT) - -rm -f osdc/Objecter.lo - -rm -f osdc/Striper.$(OBJEXT) - -rm -f osdc/Striper.lo - -rm -f osdc/test_build_libcephfs-Filer.$(OBJEXT) - -rm -f osdc/test_build_libcephfs-Journaler.$(OBJEXT) - -rm -f osdc/test_build_libcephfs-ObjectCacher.$(OBJEXT) - -rm -f osdc/test_build_libcephfs-Objecter.$(OBJEXT) - -rm -f osdc/test_build_libcephfs-Striper.$(OBJEXT) - -rm -f perfglue/cpu_profiler.$(OBJEXT) - -rm -f perfglue/cpu_profiler.lo - -rm -f perfglue/disabled_heap_profiler.$(OBJEXT) - -rm -f perfglue/disabled_heap_profiler.lo - -rm -f perfglue/disabled_stubs.$(OBJEXT) - -rm -f perfglue/disabled_stubs.lo - -rm -f perfglue/heap_profiler.$(OBJEXT) - -rm -f perfglue/heap_profiler.lo - -rm -f rbd_fuse/rbd-fuse.$(OBJEXT) - -rm -f rgw/ceph_dencoder-rgw_acl.$(OBJEXT) - -rm -f rgw/ceph_dencoder-rgw_common.$(OBJEXT) - -rm -f rgw/ceph_dencoder-rgw_dencoder.$(OBJEXT) - -rm -f rgw/ceph_dencoder-rgw_env.$(OBJEXT) - -rm -f rgw/ceph_dencoder-rgw_json_enc.$(OBJEXT) - -rm -f rgw/librgw_la-librgw.$(OBJEXT) - -rm -f rgw/librgw_la-librgw.lo - -rm -f rgw/librgw_la-rgw_acl.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_acl.lo - -rm -f rgw/librgw_la-rgw_acl_s3.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_acl_s3.lo - -rm -f rgw/librgw_la-rgw_acl_swift.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_acl_swift.lo - -rm -f rgw/librgw_la-rgw_auth_s3.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_auth_s3.lo - -rm -f rgw/librgw_la-rgw_bucket.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_bucket.lo - -rm -f rgw/librgw_la-rgw_cache.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_cache.lo - -rm -f rgw/librgw_la-rgw_client_io.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_client_io.lo - -rm -f rgw/librgw_la-rgw_common.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_common.lo - -rm -f rgw/librgw_la-rgw_cors.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_cors.lo - -rm -f rgw/librgw_la-rgw_cors_s3.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_cors_s3.lo - -rm -f rgw/librgw_la-rgw_dencoder.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_dencoder.lo - -rm -f rgw/librgw_la-rgw_env.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_env.lo - -rm -f rgw/librgw_la-rgw_fcgi.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_fcgi.lo - -rm -f rgw/librgw_la-rgw_formats.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_formats.lo - -rm -f rgw/librgw_la-rgw_gc.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_gc.lo - -rm -f rgw/librgw_la-rgw_http_client.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_http_client.lo - -rm -f rgw/librgw_la-rgw_json_enc.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_json_enc.lo - -rm -f rgw/librgw_la-rgw_keystone.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_keystone.lo - -rm -f rgw/librgw_la-rgw_log.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_log.lo - -rm -f rgw/librgw_la-rgw_metadata.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_metadata.lo - -rm -f rgw/librgw_la-rgw_multi.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_multi.lo - -rm -f rgw/librgw_la-rgw_multi_del.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_multi_del.lo - -rm -f rgw/librgw_la-rgw_op.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_op.lo - -rm -f rgw/librgw_la-rgw_policy_s3.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_policy_s3.lo - -rm -f rgw/librgw_la-rgw_quota.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_quota.lo - -rm -f rgw/librgw_la-rgw_rados.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_rados.lo - -rm -f rgw/librgw_la-rgw_replica_log.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_replica_log.lo - -rm -f rgw/librgw_la-rgw_rest_client.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_rest_client.lo - -rm -f rgw/librgw_la-rgw_rest_conn.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_rest_conn.lo - -rm -f rgw/librgw_la-rgw_tools.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_tools.lo - -rm -f rgw/librgw_la-rgw_usage.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_usage.lo - -rm -f rgw/librgw_la-rgw_user.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_user.lo - -rm -f rgw/librgw_la-rgw_xml.$(OBJEXT) - -rm -f rgw/librgw_la-rgw_xml.lo - -rm -f rgw/rgw_admin.$(OBJEXT) - -rm -f rgw/rgw_civetweb.$(OBJEXT) - -rm -f rgw/rgw_common.$(OBJEXT) - -rm -f rgw/rgw_env.$(OBJEXT) - -rm -f rgw/rgw_http_client.$(OBJEXT) - -rm -f rgw/rgw_json_enc.$(OBJEXT) - -rm -f rgw/rgw_jsonparser.$(OBJEXT) - -rm -f rgw/rgw_loadgen.$(OBJEXT) - -rm -f rgw/rgw_main.$(OBJEXT) - -rm -f rgw/rgw_multiparser.$(OBJEXT) - -rm -f rgw/rgw_replica_log.$(OBJEXT) - -rm -f rgw/rgw_resolve.$(OBJEXT) - -rm -f rgw/rgw_rest.$(OBJEXT) - -rm -f rgw/rgw_rest_bucket.$(OBJEXT) - -rm -f rgw/rgw_rest_config.$(OBJEXT) - -rm -f rgw/rgw_rest_log.$(OBJEXT) - -rm -f rgw/rgw_rest_metadata.$(OBJEXT) - -rm -f rgw/rgw_rest_opstate.$(OBJEXT) - -rm -f rgw/rgw_rest_replica_log.$(OBJEXT) - -rm -f rgw/rgw_rest_s3.$(OBJEXT) - -rm -f rgw/rgw_rest_swift.$(OBJEXT) - -rm -f rgw/rgw_rest_usage.$(OBJEXT) - -rm -f rgw/rgw_rest_user.$(OBJEXT) - -rm -f rgw/rgw_swift.$(OBJEXT) - -rm -f rgw/rgw_swift_auth.$(OBJEXT) - -rm -f rgw/test_build_librgw-librgw.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_acl.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_acl_s3.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_acl_swift.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_auth_s3.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_bucket.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_cache.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_client_io.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_common.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_cors.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_cors_s3.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_dencoder.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_env.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_fcgi.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_formats.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_gc.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_http_client.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_json_enc.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_keystone.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_log.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_metadata.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_multi.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_multi_del.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_op.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_policy_s3.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_quota.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_rados.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_replica_log.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_rest_client.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_rest_conn.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_tools.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_usage.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_user.$(OBJEXT) - -rm -f rgw/test_build_librgw-rgw_xml.$(OBJEXT) - -rm -f rgw/unittest_formatter-rgw_formats.$(OBJEXT) - -rm -f test/ObjectMap/ceph_test_keyvaluedb_atomicity-test_keyvaluedb_atomicity.$(OBJEXT) - -rm -f test/ObjectMap/ceph_test_keyvaluedb_iterators-KeyValueDBMemory.$(OBJEXT) - -rm -f test/ObjectMap/ceph_test_keyvaluedb_iterators-test_keyvaluedb_iterators.$(OBJEXT) - -rm -f test/ObjectMap/ceph_test_object_map-KeyValueDBMemory.$(OBJEXT) - -rm -f test/ObjectMap/ceph_test_object_map-test_object_map.$(OBJEXT) - -rm -f test/TestSignalHandlers.$(OBJEXT) - -rm -f test/TestTimers.$(OBJEXT) - -rm -f test/bench/bencher.$(OBJEXT) - -rm -f test/bench/detailed_stat_collector.$(OBJEXT) - -rm -f test/bench/dumb_backend.$(OBJEXT) - -rm -f test/bench/rados_backend.$(OBJEXT) - -rm -f test/bench/rbd_backend.$(OBJEXT) - -rm -f test/bench/small_io_bench.$(OBJEXT) - -rm -f test/bench/small_io_bench_dumb.$(OBJEXT) - -rm -f test/bench/small_io_bench_fs.$(OBJEXT) - -rm -f test/bench/small_io_bench_rbd.$(OBJEXT) - -rm -f test/bench/testfilestore_backend.$(OBJEXT) - -rm -f test/bench/tp_bench.$(OBJEXT) - -rm -f test/bench_log.$(OBJEXT) - -rm -f test/ceph_test_cls_rgw_log-test_rgw_admin_log.$(OBJEXT) - -rm -f test/ceph_test_cls_rgw_meta-test_rgw_admin_meta.$(OBJEXT) - -rm -f test/ceph_test_cls_rgw_opstate-test_rgw_admin_opstate.$(OBJEXT) - -rm -f test/ceph_test_cors-test_cors.$(OBJEXT) - -rm -f test/ceph_test_filejournal-test_filejournal.$(OBJEXT) - -rm -f test/ceph_test_snap_mapper-test_snap_mapper.$(OBJEXT) - -rm -f test/ceph_test_stress_watch-test_stress_watch.$(OBJEXT) - -rm -f test/ceph_xattr_bench-xattr_bench.$(OBJEXT) - -rm -f test/cls_hello/ceph_test_cls_hello-test_cls_hello.$(OBJEXT) - -rm -f test/cls_lock/ceph_test_cls_lock-test_cls_lock.$(OBJEXT) - -rm -f test/cls_log/ceph_test_cls_log-test_cls_log.$(OBJEXT) - -rm -f test/cls_rbd/ceph_test_cls_rbd-test_cls_rbd.$(OBJEXT) - -rm -f test/cls_refcount/ceph_test_cls_refcount-test_cls_refcount.$(OBJEXT) - -rm -f test/cls_replica_log/ceph_test_cls_replica_log-test_cls_replica_log.$(OBJEXT) - -rm -f test/cls_rgw/ceph_test_cls_rgw-test_cls_rgw.$(OBJEXT) - -rm -f test/cls_statelog/ceph_test_cls_statelog-test_cls_statelog.$(OBJEXT) - -rm -f test/cls_version/ceph_test_cls_version-test_cls_version.$(OBJEXT) - -rm -f test/common/ObjectContents.$(OBJEXT) - -rm -f test/common/get_command_descriptions.$(OBJEXT) - -rm -f test/common/unittest_bloom_filter-test_bloom_filter.$(OBJEXT) - -rm -f test/common/unittest_config-test_config.$(OBJEXT) - -rm -f test/common/unittest_context-test_context.$(OBJEXT) - -rm -f test/common/unittest_crc32c-test_crc32c.$(OBJEXT) - -rm -f test/common/unittest_histogram-histogram.$(OBJEXT) - -rm -f test/common/unittest_sharedptr_registry-test_sharedptr_registry.$(OBJEXT) - -rm -f test/common/unittest_sloppy_crc_map-test_sloppy_crc_map.$(OBJEXT) - -rm -f test/common/unittest_str_map-test_str_map.$(OBJEXT) - -rm -f test/common/unittest_throttle-Throttle.$(OBJEXT) - -rm -f test/common/unittest_util-test_util.$(OBJEXT) - -rm -f test/crush/unittest_crush_indep-indep.$(OBJEXT) - -rm -f test/crush/unittest_crush_wrapper-TestCrushWrapper.$(OBJEXT) - -rm -f test/encoding/ceph_dencoder-ceph_dencoder.$(OBJEXT) - -rm -f test/erasure-code/ceph_erasure_code.$(OBJEXT) - -rm -f test/erasure-code/ceph_erasure_code_benchmark.$(OBJEXT) - -rm -f test/erasure-code/libec_example_la-ErasureCodePluginExample.$(OBJEXT) - -rm -f test/erasure-code/libec_example_la-ErasureCodePluginExample.lo - -rm -f test/erasure-code/libec_fail_to_initialize_la-ErasureCodePluginFailToInitialize.$(OBJEXT) - -rm -f test/erasure-code/libec_fail_to_initialize_la-ErasureCodePluginFailToInitialize.lo - -rm -f test/erasure-code/libec_fail_to_register_la-ErasureCodePluginFailToRegister.$(OBJEXT) - -rm -f test/erasure-code/libec_fail_to_register_la-ErasureCodePluginFailToRegister.lo - -rm -f test/erasure-code/libec_hangs_la-ErasureCodePluginHangs.$(OBJEXT) - -rm -f test/erasure-code/libec_hangs_la-ErasureCodePluginHangs.lo - -rm -f test/erasure-code/libec_missing_entry_point_la-ErasureCodePluginMissingEntryPoint.$(OBJEXT) - -rm -f test/erasure-code/libec_missing_entry_point_la-ErasureCodePluginMissingEntryPoint.lo - -rm -f test/erasure-code/libec_test_jerasure_generic_la-TestJerasurePluginGeneric.$(OBJEXT) - -rm -f test/erasure-code/libec_test_jerasure_generic_la-TestJerasurePluginGeneric.lo - -rm -f test/erasure-code/libec_test_jerasure_sse3_la-TestJerasurePluginSSE3.$(OBJEXT) - -rm -f test/erasure-code/libec_test_jerasure_sse3_la-TestJerasurePluginSSE3.lo - -rm -f test/erasure-code/libec_test_jerasure_sse4_la-TestJerasurePluginSSE4.$(OBJEXT) - -rm -f test/erasure-code/libec_test_jerasure_sse4_la-TestJerasurePluginSSE4.lo - -rm -f test/erasure-code/unittest_erasure_code_example-TestErasureCodeExample.$(OBJEXT) - -rm -f test/erasure-code/unittest_erasure_code_jerasure-TestErasureCodeJerasure.$(OBJEXT) - -rm -f test/erasure-code/unittest_erasure_code_plugin-TestErasureCodePlugin.$(OBJEXT) - -rm -f test/erasure-code/unittest_erasure_code_plugin_jerasure-TestErasureCodePluginJerasure.$(OBJEXT) - -rm -f test/kv_store_bench.$(OBJEXT) - -rm -f test/libcephfs/ceph_test_libcephfs-caps.$(OBJEXT) - -rm -f test/libcephfs/ceph_test_libcephfs-multiclient.$(OBJEXT) - -rm -f test/libcephfs/ceph_test_libcephfs-readdir_r_cb.$(OBJEXT) - -rm -f test/libcephfs/ceph_test_libcephfs-test.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_aio-aio.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_c_read_operations-c_read_operations.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_c_write_operations-c_write_operations.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_cls-cls.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_cmd-cmd.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_io-io.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_list-list.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_lock-lock.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_misc-misc.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_pool-pool.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_snapshots-snapshots.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_stat-stat.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_tier-tier.$(OBJEXT) - -rm -f test/librados/ceph_test_rados_api_watch_notify-watch_notify.$(OBJEXT) - -rm -f test/librados/libradostest_la-TestCase.$(OBJEXT) - -rm -f test/librados/libradostest_la-TestCase.lo - -rm -f test/librados/libradostest_la-test.$(OBJEXT) - -rm -f test/librados/libradostest_la-test.lo - -rm -f test/librados/unittest_librados-librados.$(OBJEXT) - -rm -f test/librados/unittest_librados_config-librados_config.$(OBJEXT) - -rm -f test/librbd/ceph_test_librbd-test_librbd.$(OBJEXT) - -rm -f test/librbd/ceph_test_librbd_fsx-fsx.$(OBJEXT) - -rm -f test/mon/test_mon_workloadgen.$(OBJEXT) - -rm -f test/mon/unittest_mon_moncap-moncap.$(OBJEXT) - -rm -f test/mon/unittest_mon_pgmap-PGMap.$(OBJEXT) - -rm -f test/multi_stress_watch.$(OBJEXT) - -rm -f test/objectstore/DeterministicOpSequence.$(OBJEXT) - -rm -f test/objectstore/FileStoreDiff.$(OBJEXT) - -rm -f test/objectstore/FileStoreTracker.$(OBJEXT) - -rm -f test/objectstore/TestObjectStoreState.$(OBJEXT) - -rm -f test/objectstore/ceph_test_objectstore-store_test.$(OBJEXT) - -rm -f test/objectstore/test_idempotent.$(OBJEXT) - -rm -f test/objectstore/test_idempotent_sequence.$(OBJEXT) - -rm -f test/objectstore/unittest_chain_xattr-chain_xattr.$(OBJEXT) - -rm -f test/objectstore/workload_generator.$(OBJEXT) - -rm -f test/omap_bench.$(OBJEXT) - -rm -f test/on_exit.$(OBJEXT) - -rm -f test/os/unittest_flatindex-TestFlatIndex.$(OBJEXT) - -rm -f test/os/unittest_lfnindex-TestLFNIndex.$(OBJEXT) - -rm -f test/osd/Object.$(OBJEXT) - -rm -f test/osd/RadosModel.$(OBJEXT) - -rm -f test/osd/TestOpStat.$(OBJEXT) - -rm -f test/osd/TestRados.$(OBJEXT) - -rm -f test/osd/unittest_ecbackend-TestECBackend.$(OBJEXT) - -rm -f test/osd/unittest_hitset-hitset.$(OBJEXT) - -rm -f test/osd/unittest_osd_osdcap-osdcap.$(OBJEXT) - -rm -f test/osd/unittest_osd_types-types.$(OBJEXT) - -rm -f test/osd/unittest_osdmap-TestOSDMap.$(OBJEXT) - -rm -f test/osd/unittest_pglog-TestPGLog.$(OBJEXT) - -rm -f test/osdc/FakeWriteback.$(OBJEXT) - -rm -f test/osdc/object_cacher_stress.$(OBJEXT) - -rm -f test/rgw/ceph_test_rgw_manifest-test_rgw_manifest.$(OBJEXT) - -rm -f test/streamtest.$(OBJEXT) - -rm -f test/system/cross_process_sem.$(OBJEXT) - -rm -f test/system/cross_process_sem.lo - -rm -f test/system/rados_delete_pools_parallel.$(OBJEXT) - -rm -f test/system/rados_list_parallel.$(OBJEXT) - -rm -f test/system/rados_open_pools_parallel.$(OBJEXT) - -rm -f test/system/rados_watch_notify.$(OBJEXT) - -rm -f test/system/st_rados_create_pool.$(OBJEXT) - -rm -f test/system/st_rados_delete_objs.$(OBJEXT) - -rm -f test/system/st_rados_delete_pool.$(OBJEXT) - -rm -f test/system/st_rados_list_objects.$(OBJEXT) - -rm -f test/system/st_rados_notify.$(OBJEXT) - -rm -f test/system/st_rados_watch.$(OBJEXT) - -rm -f test/system/systest_runnable.$(OBJEXT) - -rm -f test/system/systest_runnable.lo - -rm -f test/system/systest_settings.$(OBJEXT) - -rm -f test/system/systest_settings.lo - -rm -f test/test_build_libcephfs-buildtest_skeleton.$(OBJEXT) - -rm -f test/test_build_libcommon-buildtest_skeleton.$(OBJEXT) - -rm -f test/test_build_librados-buildtest_skeleton.$(OBJEXT) - -rm -f test/test_build_librgw-buildtest_skeleton.$(OBJEXT) - -rm -f test/test_c_headers.$(OBJEXT) - -rm -f test/test_cfuse_cache_invalidate.$(OBJEXT) - -rm -f test/test_get_blkdev_size.$(OBJEXT) - -rm -f test/test_mutate.$(OBJEXT) - -rm -f test/test_rewrite_latency.$(OBJEXT) - -rm -f test/test_trans.$(OBJEXT) - -rm -f test/testcrypto.$(OBJEXT) - -rm -f test/testkeys.$(OBJEXT) - -rm -f test/testmsgr.$(OBJEXT) - -rm -f test/unittest_addrs-test_addrs.$(OBJEXT) - -rm -f test/unittest_admin_socket-admin_socket.$(OBJEXT) - -rm -f test/unittest_arch-test_arch.$(OBJEXT) - -rm -f test/unittest_base64-base64.$(OBJEXT) - -rm -f test/unittest_bufferlist-bufferlist.$(OBJEXT) - -rm -f test/unittest_ceph_argparse-ceph_argparse.$(OBJEXT) - -rm -f test/unittest_ceph_compatset-ceph_compatset.$(OBJEXT) - -rm -f test/unittest_ceph_crypto-ceph_crypto.$(OBJEXT) - -rm -f test/unittest_confutils-confutils.$(OBJEXT) - -rm -f test/unittest_crypto-crypto.$(OBJEXT) - -rm -f test/unittest_crypto_init-crypto_init.$(OBJEXT) - -rm -f test/unittest_daemon_config-daemon_config.$(OBJEXT) - -rm -f test/unittest_encoding-encoding.$(OBJEXT) - -rm -f test/unittest_escape-escape.$(OBJEXT) - -rm -f test/unittest_formatter-formatter.$(OBJEXT) - -rm -f test/unittest_gather-gather.$(OBJEXT) - -rm -f test/unittest_heartbeatmap-heartbeat_map.$(OBJEXT) - -rm -f test/unittest_ipaddr-test_ipaddr.$(OBJEXT) - -rm -f test/unittest_libcephfs_config-libcephfs_config.$(OBJEXT) - -rm -f test/unittest_mime-mime.$(OBJEXT) - -rm -f test/unittest_perf_counters-perf_counters.$(OBJEXT) - -rm -f test/unittest_prebufferedstreambuf-test_prebufferedstreambuf.$(OBJEXT) - -rm -f test/unittest_run_cmd-run_cmd.$(OBJEXT) - -rm -f test/unittest_signals-signals.$(OBJEXT) - -rm -f test/unittest_simple_spin-simple_spin.$(OBJEXT) - -rm -f test/unittest_str_list-test_str_list.$(OBJEXT) - -rm -f test/unittest_striper-test_striper.$(OBJEXT) - -rm -f test/unittest_strtol-strtol.$(OBJEXT) - -rm -f test/unittest_texttable-test_texttable.$(OBJEXT) - -rm -f test/unittest_utf8-utf8.$(OBJEXT) - -rm -f test/unittest_workqueue-test_workqueue.$(OBJEXT) - -rm -f tools/ceph-client-debug.$(OBJEXT) - -rm -f tools/ceph_authtool.$(OBJEXT) - -rm -f tools/ceph_conf.$(OBJEXT) - -rm -f tools/ceph_filestore_dump.$(OBJEXT) - -rm -f tools/ceph_filestore_tool.$(OBJEXT) - -rm -f tools/ceph_kvstore_tool-ceph_kvstore_tool.$(OBJEXT) - -rm -f tools/ceph_monstore_tool.$(OBJEXT) - -rm -f tools/ceph_osdomap_tool.$(OBJEXT) - -rm -f tools/crushtool.$(OBJEXT) - -rm -f tools/dupstore.$(OBJEXT) - -rm -f tools/mon_store_converter.$(OBJEXT) - -rm -f tools/monmaptool.$(OBJEXT) - -rm -f tools/osdmaptool.$(OBJEXT) - -rm -f tools/psim.$(OBJEXT) - -rm -f tools/rados/rados.$(OBJEXT) - -rm -f tools/rados/rados_export.$(OBJEXT) - -rm -f tools/rados/rados_import.$(OBJEXT) - -rm -f tools/rados/rados_sync.$(OBJEXT) - -rm -f tools/radosacl.$(OBJEXT) - -rm -f tools/rest_bench-rest_bench.$(OBJEXT) - -rm -f tools/scratchtool.$(OBJEXT) - -rm -f tools/scratchtoolpp.$(OBJEXT) + -rm -f arch/*.$(OBJEXT) + -rm -f arch/*.lo + -rm -f auth/*.$(OBJEXT) + -rm -f auth/*.lo + -rm -f auth/cephx/*.$(OBJEXT) + -rm -f auth/cephx/*.lo + -rm -f auth/none/*.$(OBJEXT) + -rm -f auth/none/*.lo + -rm -f auth/unknown/*.$(OBJEXT) + -rm -f auth/unknown/*.lo + -rm -f civetweb/src/*.$(OBJEXT) + -rm -f client/*.$(OBJEXT) + -rm -f client/*.lo + -rm -f cls/hello/*.$(OBJEXT) + -rm -f cls/hello/*.lo + -rm -f cls/lock/*.$(OBJEXT) + -rm -f cls/lock/*.lo + -rm -f cls/log/*.$(OBJEXT) + -rm -f cls/log/*.lo + -rm -f cls/rbd/*.$(OBJEXT) + -rm -f cls/rbd/*.lo + -rm -f cls/refcount/*.$(OBJEXT) + -rm -f cls/refcount/*.lo + -rm -f cls/replica_log/*.$(OBJEXT) + -rm -f cls/replica_log/*.lo + -rm -f cls/rgw/*.$(OBJEXT) + -rm -f cls/rgw/*.lo + -rm -f cls/statelog/*.$(OBJEXT) + -rm -f cls/statelog/*.lo + -rm -f cls/user/*.$(OBJEXT) + -rm -f cls/user/*.lo + -rm -f cls/version/*.$(OBJEXT) + -rm -f cls/version/*.lo + -rm -f common/*.$(OBJEXT) + -rm -f common/*.lo + -rm -f crush/*.$(OBJEXT) + -rm -f crush/*.lo + -rm -f erasure-code/*.$(OBJEXT) + -rm -f erasure-code/*.lo + -rm -f erasure-code/jerasure/*.$(OBJEXT) + -rm -f erasure-code/jerasure/*.lo + -rm -f erasure-code/jerasure/gf-complete/src/*.$(OBJEXT) + -rm -f erasure-code/jerasure/gf-complete/src/*.lo + -rm -f erasure-code/jerasure/jerasure/src/*.$(OBJEXT) + -rm -f erasure-code/jerasure/jerasure/src/*.lo + -rm -f global/*.$(OBJEXT) + -rm -f global/*.lo + -rm -f java/native/*.$(OBJEXT) + -rm -f java/native/*.lo + -rm -f json_spirit/*.$(OBJEXT) + -rm -f json_spirit/*.lo + -rm -f key_value_store/*.$(OBJEXT) + -rm -f key_value_store/*.lo + -rm -f librados/*.$(OBJEXT) + -rm -f librados/*.lo + -rm -f librbd/*.$(OBJEXT) + -rm -f librbd/*.lo + -rm -f log/*.$(OBJEXT) + -rm -f log/*.lo + -rm -f mds/*.$(OBJEXT) + -rm -f mds/*.lo + -rm -f mon/*.$(OBJEXT) + -rm -f mon/*.lo + -rm -f mount/*.$(OBJEXT) + -rm -f msg/*.$(OBJEXT) + -rm -f msg/*.lo + -rm -f objclass/*.$(OBJEXT) + -rm -f objclass/*.lo + -rm -f os/*.$(OBJEXT) + -rm -f os/*.lo + -rm -f osd/*.$(OBJEXT) + -rm -f osd/*.lo + -rm -f osdc/*.$(OBJEXT) + -rm -f osdc/*.lo + -rm -f perfglue/*.$(OBJEXT) + -rm -f perfglue/*.lo + -rm -f rbd_fuse/*.$(OBJEXT) + -rm -f rgw/*.$(OBJEXT) + -rm -f rgw/*.lo + -rm -f test/*.$(OBJEXT) + -rm -f test/ObjectMap/*.$(OBJEXT) + -rm -f test/bench/*.$(OBJEXT) + -rm -f test/cls_hello/*.$(OBJEXT) + -rm -f test/cls_lock/*.$(OBJEXT) + -rm -f test/cls_log/*.$(OBJEXT) + -rm -f test/cls_rbd/*.$(OBJEXT) + -rm -f test/cls_refcount/*.$(OBJEXT) + -rm -f test/cls_replica_log/*.$(OBJEXT) + -rm -f test/cls_rgw/*.$(OBJEXT) + -rm -f test/cls_statelog/*.$(OBJEXT) + -rm -f test/cls_version/*.$(OBJEXT) + -rm -f test/common/*.$(OBJEXT) + -rm -f test/crush/*.$(OBJEXT) + -rm -f test/encoding/*.$(OBJEXT) + -rm -f test/erasure-code/*.$(OBJEXT) + -rm -f test/erasure-code/*.lo + -rm -f test/libcephfs/*.$(OBJEXT) + -rm -f test/librados/*.$(OBJEXT) + -rm -f test/librados/*.lo + -rm -f test/librbd/*.$(OBJEXT) + -rm -f test/mon/*.$(OBJEXT) + -rm -f test/objectstore/*.$(OBJEXT) + -rm -f test/os/*.$(OBJEXT) + -rm -f test/osd/*.$(OBJEXT) + -rm -f test/osdc/*.$(OBJEXT) + -rm -f test/rgw/*.$(OBJEXT) + -rm -f test/system/*.$(OBJEXT) + -rm -f test/system/*.lo + -rm -f tools/*.$(OBJEXT) + -rm -f tools/rados/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -10056,6 +9644,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@rgw/$(DEPDIR)/librgw_la-rgw_xml.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@rgw/$(DEPDIR)/rgw_admin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@rgw/$(DEPDIR)/rgw_civetweb.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@rgw/$(DEPDIR)/rgw_civetweb_log.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@rgw/$(DEPDIR)/rgw_common.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@rgw/$(DEPDIR)/rgw_env.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@rgw/$(DEPDIR)/rgw_http_client.Po@am__quote@ @@ -10206,6 +9795,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@test/common/$(DEPDIR)/unittest_context-test_context.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/common/$(DEPDIR)/unittest_crc32c-test_crc32c.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/common/$(DEPDIR)/unittest_histogram-histogram.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@test/common/$(DEPDIR)/unittest_io_priority-test_io_priority.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/common/$(DEPDIR)/unittest_sharedptr_registry-test_sharedptr_registry.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/common/$(DEPDIR)/unittest_sloppy_crc_map-test_sloppy_crc_map.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/common/$(DEPDIR)/unittest_str_map-test_str_map.Po@am__quote@ @@ -10216,6 +9806,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@test/encoding/$(DEPDIR)/ceph_dencoder-ceph_dencoder.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/erasure-code/$(DEPDIR)/ceph_erasure_code.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/erasure-code/$(DEPDIR)/ceph_erasure_code_benchmark.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@test/erasure-code/$(DEPDIR)/ceph_erasure_code_non_regression.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/erasure-code/$(DEPDIR)/libec_example_la-ErasureCodePluginExample.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/erasure-code/$(DEPDIR)/libec_fail_to_initialize_la-ErasureCodePluginFailToInitialize.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@test/erasure-code/$(DEPDIR)/libec_fail_to_register_la-ErasureCodePluginFailToRegister.Plo@am__quote@ @@ -14755,6 +14346,20 @@ test/osd/unittest_hitset-hitset.obj: test/osd/hitset.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittest_hitset_CXXFLAGS) $(CXXFLAGS) -c -o test/osd/unittest_hitset-hitset.obj `if test -f 'test/osd/hitset.cc'; then $(CYGPATH_W) 'test/osd/hitset.cc'; else $(CYGPATH_W) '$(srcdir)/test/osd/hitset.cc'; fi` +test/common/unittest_io_priority-test_io_priority.o: test/common/test_io_priority.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittest_io_priority_CXXFLAGS) $(CXXFLAGS) -MT test/common/unittest_io_priority-test_io_priority.o -MD -MP -MF test/common/$(DEPDIR)/unittest_io_priority-test_io_priority.Tpo -c -o test/common/unittest_io_priority-test_io_priority.o `test -f 'test/common/test_io_priority.cc' || echo '$(srcdir)/'`test/common/test_io_priority.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) test/common/$(DEPDIR)/unittest_io_priority-test_io_priority.Tpo test/common/$(DEPDIR)/unittest_io_priority-test_io_priority.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test/common/test_io_priority.cc' object='test/common/unittest_io_priority-test_io_priority.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittest_io_priority_CXXFLAGS) $(CXXFLAGS) -c -o test/common/unittest_io_priority-test_io_priority.o `test -f 'test/common/test_io_priority.cc' || echo '$(srcdir)/'`test/common/test_io_priority.cc + +test/common/unittest_io_priority-test_io_priority.obj: test/common/test_io_priority.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittest_io_priority_CXXFLAGS) $(CXXFLAGS) -MT test/common/unittest_io_priority-test_io_priority.obj -MD -MP -MF test/common/$(DEPDIR)/unittest_io_priority-test_io_priority.Tpo -c -o test/common/unittest_io_priority-test_io_priority.obj `if test -f 'test/common/test_io_priority.cc'; then $(CYGPATH_W) 'test/common/test_io_priority.cc'; else $(CYGPATH_W) '$(srcdir)/test/common/test_io_priority.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) test/common/$(DEPDIR)/unittest_io_priority-test_io_priority.Tpo test/common/$(DEPDIR)/unittest_io_priority-test_io_priority.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='test/common/test_io_priority.cc' object='test/common/unittest_io_priority-test_io_priority.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittest_io_priority_CXXFLAGS) $(CXXFLAGS) -c -o test/common/unittest_io_priority-test_io_priority.obj `if test -f 'test/common/test_io_priority.cc'; then $(CYGPATH_W) 'test/common/test_io_priority.cc'; else $(CYGPATH_W) '$(srcdir)/test/common/test_io_priority.cc'; fi` + test/unittest_ipaddr-test_ipaddr.o: test/test_ipaddr.cc @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unittest_ipaddr_CXXFLAGS) $(CXXFLAGS) -MT test/unittest_ipaddr-test_ipaddr.o -MD -MP -MF test/$(DEPDIR)/unittest_ipaddr-test_ipaddr.Tpo -c -o test/unittest_ipaddr-test_ipaddr.o `test -f 'test/test_ipaddr.cc' || echo '$(srcdir)/'`test/test_ipaddr.cc @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) test/$(DEPDIR)/unittest_ipaddr-test_ipaddr.Tpo test/$(DEPDIR)/unittest_ipaddr-test_ipaddr.Po @@ -15233,8 +14838,11 @@ clean-libtool: -rm -rf test/system/.libs test/system/_libs install-pythonPYTHON: $(python_PYTHON) @$(NORMAL_INSTALL) - test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)" @list='$(python_PYTHON)'; dlist=; list2=; test -n "$(pythondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pythondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ @@ -15256,20 +14864,33 @@ install-pythonPYTHON: $(python_PYTHON) uninstall-pythonPYTHON: @$(NORMAL_UNINSTALL) @list='$(python_PYTHON)'; test -n "$(pythondir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ + py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$py_files" || exit 0; \ dir='$(DESTDIR)$(pythondir)'; \ - filesc=`echo "$$files" | sed 's|$$|c|'`; \ - fileso=`echo "$$files" | sed 's|$$|o|'`; \ + pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ + pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ + py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ + echo "$$py_files_pep3147";\ + pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ + pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ st=0; \ - for files in "$$files" "$$filesc" "$$fileso"; do \ + for files in \ + "$$py_files" \ + "$$pyc_files" \ + "$$pyo_files" \ + "$$pyc_files_pep3147" \ + "$$pyo_files_pep3147" \ + ; do \ $(am__uninstall_files_from_dir) || st=$$?; \ done; \ exit $$st install-bash_completionDATA: $(bash_completion_DATA) @$(NORMAL_INSTALL) - test -z "$(bash_completiondir)" || $(MKDIR_P) "$(DESTDIR)$(bash_completiondir)" @list='$(bash_completion_DATA)'; test -n "$(bash_completiondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bash_completiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bash_completiondir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -15286,8 +14907,11 @@ uninstall-bash_completionDATA: dir='$(DESTDIR)$(bash_completiondir)'; $(am__uninstall_files_from_dir) install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -15304,8 +14928,11 @@ uninstall-docDATA: dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-libcephfs_includeDATA: $(libcephfs_include_DATA) @$(NORMAL_INSTALL) - test -z "$(libcephfs_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libcephfs_includedir)" @list='$(libcephfs_include_DATA)'; test -n "$(libcephfs_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libcephfs_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libcephfs_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -15322,8 +14949,11 @@ uninstall-libcephfs_includeDATA: dir='$(DESTDIR)$(libcephfs_includedir)'; $(am__uninstall_files_from_dir) install-librbd_includeDATA: $(librbd_include_DATA) @$(NORMAL_INSTALL) - test -z "$(librbd_includedir)" || $(MKDIR_P) "$(DESTDIR)$(librbd_includedir)" @list='$(librbd_include_DATA)'; test -n "$(librbd_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(librbd_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(librbd_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -15340,8 +14970,11 @@ uninstall-librbd_includeDATA: dir='$(DESTDIR)$(librbd_includedir)'; $(am__uninstall_files_from_dir) install-rados_includeDATA: $(rados_include_DATA) @$(NORMAL_INSTALL) - test -z "$(rados_includedir)" || $(MKDIR_P) "$(DESTDIR)$(rados_includedir)" @list='$(rados_include_DATA)'; test -n "$(rados_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(rados_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(rados_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -15358,22 +14991,25 @@ uninstall-rados_includeDATA: dir='$(DESTDIR)$(rados_includedir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -15388,57 +15024,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) acconfig.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -15454,12 +15045,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) acconfig.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) acconfig.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -15471,15 +15057,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) acconfig.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) acconfig.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) acconfig.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -15488,102 +15070,705 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) $(check_SCRIPTS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +unittest_erasure_code_plugin.log: unittest_erasure_code_plugin$(EXEEXT) + @p='unittest_erasure_code_plugin$(EXEEXT)'; \ + b='unittest_erasure_code_plugin'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_erasure_code_jerasure.log: unittest_erasure_code_jerasure$(EXEEXT) + @p='unittest_erasure_code_jerasure$(EXEEXT)'; \ + b='unittest_erasure_code_jerasure'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_erasure_code_plugin_jerasure.log: unittest_erasure_code_plugin_jerasure$(EXEEXT) + @p='unittest_erasure_code_plugin_jerasure$(EXEEXT)'; \ + b='unittest_erasure_code_plugin_jerasure'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_erasure_code_example.log: unittest_erasure_code_example$(EXEEXT) + @p='unittest_erasure_code_example$(EXEEXT)'; \ + b='unittest_erasure_code_example'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_encoding.log: unittest_encoding$(EXEEXT) + @p='unittest_encoding$(EXEEXT)'; \ + b='unittest_encoding'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_addrs.log: unittest_addrs$(EXEEXT) + @p='unittest_addrs$(EXEEXT)'; \ + b='unittest_addrs'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_bloom_filter.log: unittest_bloom_filter$(EXEEXT) + @p='unittest_bloom_filter$(EXEEXT)'; \ + b='unittest_bloom_filter'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_histogram.log: unittest_histogram$(EXEEXT) + @p='unittest_histogram$(EXEEXT)'; \ + b='unittest_histogram'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_str_map.log: unittest_str_map$(EXEEXT) + @p='unittest_str_map$(EXEEXT)'; \ + b='unittest_str_map'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_sharedptr_registry.log: unittest_sharedptr_registry$(EXEEXT) + @p='unittest_sharedptr_registry$(EXEEXT)'; \ + b='unittest_sharedptr_registry'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_sloppy_crc_map.log: unittest_sloppy_crc_map$(EXEEXT) + @p='unittest_sloppy_crc_map$(EXEEXT)'; \ + b='unittest_sloppy_crc_map'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_util.log: unittest_util$(EXEEXT) + @p='unittest_util$(EXEEXT)'; \ + b='unittest_util'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_crush_indep.log: unittest_crush_indep$(EXEEXT) + @p='unittest_crush_indep$(EXEEXT)'; \ + b='unittest_crush_indep'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_osdmap.log: unittest_osdmap$(EXEEXT) + @p='unittest_osdmap$(EXEEXT)'; \ + b='unittest_osdmap'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_workqueue.log: unittest_workqueue$(EXEEXT) + @p='unittest_workqueue$(EXEEXT)'; \ + b='unittest_workqueue'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_striper.log: unittest_striper$(EXEEXT) + @p='unittest_striper$(EXEEXT)'; \ + b='unittest_striper'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_prebufferedstreambuf.log: unittest_prebufferedstreambuf$(EXEEXT) + @p='unittest_prebufferedstreambuf$(EXEEXT)'; \ + b='unittest_prebufferedstreambuf'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_str_list.log: unittest_str_list$(EXEEXT) + @p='unittest_str_list$(EXEEXT)'; \ + b='unittest_str_list'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_log.log: unittest_log$(EXEEXT) + @p='unittest_log$(EXEEXT)'; \ + b='unittest_log'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_throttle.log: unittest_throttle$(EXEEXT) + @p='unittest_throttle$(EXEEXT)'; \ + b='unittest_throttle'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_crush_wrapper.log: unittest_crush_wrapper$(EXEEXT) + @p='unittest_crush_wrapper$(EXEEXT)'; \ + b='unittest_crush_wrapper'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_base64.log: unittest_base64$(EXEEXT) + @p='unittest_base64$(EXEEXT)'; \ + b='unittest_base64'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_ceph_argparse.log: unittest_ceph_argparse$(EXEEXT) + @p='unittest_ceph_argparse$(EXEEXT)'; \ + b='unittest_ceph_argparse'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_ceph_compatset.log: unittest_ceph_compatset$(EXEEXT) + @p='unittest_ceph_compatset$(EXEEXT)'; \ + b='unittest_ceph_compatset'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_osd_types.log: unittest_osd_types$(EXEEXT) + @p='unittest_osd_types$(EXEEXT)'; \ + b='unittest_osd_types'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_pglog.log: unittest_pglog$(EXEEXT) + @p='unittest_pglog$(EXEEXT)'; \ + b='unittest_pglog'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_ecbackend.log: unittest_ecbackend$(EXEEXT) + @p='unittest_ecbackend$(EXEEXT)'; \ + b='unittest_ecbackend'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_hitset.log: unittest_hitset$(EXEEXT) + @p='unittest_hitset$(EXEEXT)'; \ + b='unittest_hitset'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_io_priority.log: unittest_io_priority$(EXEEXT) + @p='unittest_io_priority$(EXEEXT)'; \ + b='unittest_io_priority'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_gather.log: unittest_gather$(EXEEXT) + @p='unittest_gather$(EXEEXT)'; \ + b='unittest_gather'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_run_cmd.log: unittest_run_cmd$(EXEEXT) + @p='unittest_run_cmd$(EXEEXT)'; \ + b='unittest_run_cmd'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_signals.log: unittest_signals$(EXEEXT) + @p='unittest_signals$(EXEEXT)'; \ + b='unittest_signals'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_simple_spin.log: unittest_simple_spin$(EXEEXT) + @p='unittest_simple_spin$(EXEEXT)'; \ + b='unittest_simple_spin'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_librados.log: unittest_librados$(EXEEXT) + @p='unittest_librados$(EXEEXT)'; \ + b='unittest_librados'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_bufferlist.log: unittest_bufferlist$(EXEEXT) + @p='unittest_bufferlist$(EXEEXT)'; \ + b='unittest_bufferlist'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_crc32c.log: unittest_crc32c$(EXEEXT) + @p='unittest_crc32c$(EXEEXT)'; \ + b='unittest_crc32c'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_arch.log: unittest_arch$(EXEEXT) + @p='unittest_arch$(EXEEXT)'; \ + b='unittest_arch'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_crypto.log: unittest_crypto$(EXEEXT) + @p='unittest_crypto$(EXEEXT)'; \ + b='unittest_crypto'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_crypto_init.log: unittest_crypto_init$(EXEEXT) + @p='unittest_crypto_init$(EXEEXT)'; \ + b='unittest_crypto_init'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_perf_counters.log: unittest_perf_counters$(EXEEXT) + @p='unittest_perf_counters$(EXEEXT)'; \ + b='unittest_perf_counters'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_admin_socket.log: unittest_admin_socket$(EXEEXT) + @p='unittest_admin_socket$(EXEEXT)'; \ + b='unittest_admin_socket'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_ceph_crypto.log: unittest_ceph_crypto$(EXEEXT) + @p='unittest_ceph_crypto$(EXEEXT)'; \ + b='unittest_ceph_crypto'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_utf8.log: unittest_utf8$(EXEEXT) + @p='unittest_utf8$(EXEEXT)'; \ + b='unittest_utf8'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_mime.log: unittest_mime$(EXEEXT) + @p='unittest_mime$(EXEEXT)'; \ + b='unittest_mime'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_escape.log: unittest_escape$(EXEEXT) + @p='unittest_escape$(EXEEXT)'; \ + b='unittest_escape'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_chain_xattr.log: unittest_chain_xattr$(EXEEXT) + @p='unittest_chain_xattr$(EXEEXT)'; \ + b='unittest_chain_xattr'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_flatindex.log: unittest_flatindex$(EXEEXT) + @p='unittest_flatindex$(EXEEXT)'; \ + b='unittest_flatindex'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_strtol.log: unittest_strtol$(EXEEXT) + @p='unittest_strtol$(EXEEXT)'; \ + b='unittest_strtol'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_confutils.log: unittest_confutils$(EXEEXT) + @p='unittest_confutils$(EXEEXT)'; \ + b='unittest_confutils'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_config.log: unittest_config$(EXEEXT) + @p='unittest_config$(EXEEXT)'; \ + b='unittest_config'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_context.log: unittest_context$(EXEEXT) + @p='unittest_context$(EXEEXT)'; \ + b='unittest_context'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_heartbeatmap.log: unittest_heartbeatmap$(EXEEXT) + @p='unittest_heartbeatmap$(EXEEXT)'; \ + b='unittest_heartbeatmap'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_formatter.log: unittest_formatter$(EXEEXT) + @p='unittest_formatter$(EXEEXT)'; \ + b='unittest_formatter'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_libcephfs_config.log: unittest_libcephfs_config$(EXEEXT) + @p='unittest_libcephfs_config$(EXEEXT)'; \ + b='unittest_libcephfs_config'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_lfnindex.log: unittest_lfnindex$(EXEEXT) + @p='unittest_lfnindex$(EXEEXT)'; \ + b='unittest_lfnindex'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_librados_config.log: unittest_librados_config$(EXEEXT) + @p='unittest_librados_config$(EXEEXT)'; \ + b='unittest_librados_config'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_daemon_config.log: unittest_daemon_config$(EXEEXT) + @p='unittest_daemon_config$(EXEEXT)'; \ + b='unittest_daemon_config'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_osd_osdcap.log: unittest_osd_osdcap$(EXEEXT) + @p='unittest_osd_osdcap$(EXEEXT)'; \ + b='unittest_osd_osdcap'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_mon_moncap.log: unittest_mon_moncap$(EXEEXT) + @p='unittest_mon_moncap$(EXEEXT)'; \ + b='unittest_mon_moncap'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_mon_pgmap.log: unittest_mon_pgmap$(EXEEXT) + @p='unittest_mon_pgmap$(EXEEXT)'; \ + b='unittest_mon_pgmap'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_ipaddr.log: unittest_ipaddr$(EXEEXT) + @p='unittest_ipaddr$(EXEEXT)'; \ + b='unittest_ipaddr'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_texttable.log: unittest_texttable$(EXEEXT) + @p='unittest_texttable$(EXEEXT)'; \ + b='unittest_texttable'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_on_exit.log: unittest_on_exit$(EXEEXT) + @p='unittest_on_exit$(EXEEXT)'; \ + b='unittest_on_exit'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/erasure-code/test-erasure-code.sh.log: test/erasure-code/test-erasure-code.sh + @p='test/erasure-code/test-erasure-code.sh'; \ + b='test/erasure-code/test-erasure-code.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +unittest_bufferlist.sh.log: unittest_bufferlist.sh + @p='unittest_bufferlist.sh'; \ + b='unittest_bufferlist.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/encoding/check-generated.sh.log: test/encoding/check-generated.sh + @p='test/encoding/check-generated.sh'; \ + b='test/encoding/check-generated.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/mon/osd-pool-create.sh.log: test/mon/osd-pool-create.sh + @p='test/mon/osd-pool-create.sh'; \ + b='test/mon/osd-pool-create.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/mon/misc.sh.log: test/mon/misc.sh + @p='test/mon/misc.sh'; \ + b='test/mon/misc.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/mon/osd-crush.sh.log: test/mon/osd-crush.sh + @p='test/mon/osd-crush.sh'; \ + b='test/mon/osd-crush.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/mon/osd-erasure-code-profile.sh.log: test/mon/osd-erasure-code-profile.sh + @p='test/mon/osd-erasure-code-profile.sh'; \ + b='test/mon/osd-erasure-code-profile.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/mon/mkfs.sh.log: test/mon/mkfs.sh + @p='test/mon/mkfs.sh'; \ + b='test/mon/mkfs.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/ceph-disk.sh.log: test/ceph-disk.sh + @p='test/ceph-disk.sh'; \ + b='test/ceph-disk.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/mon/mon-handle-forward.sh.log: test/mon/mon-handle-forward.sh + @p='test/mon/mon-handle-forward.sh'; \ + b='test/mon/mon-handle-forward.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/vstart_wrapped_tests.sh.log: test/vstart_wrapped_tests.sh + @p='test/vstart_wrapped_tests.sh'; \ + b='test/vstart_wrapped_tests.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/pybind/test_ceph_argparse.py.log: test/pybind/test_ceph_argparse.py + @p='test/pybind/test_ceph_argparse.py'; \ + b='test/pybind/test_ceph_argparse.py'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -15617,13 +15802,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -15681,6 +15863,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -15923,28 +16108,26 @@ uninstall-am: uninstall-bash_completionDATA uninstall-binPROGRAMS \ uninstall-shell_commonSCRIPTS uninstall-su_sbinPROGRAMS \ uninstall-su_sbinSCRIPTS -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - check-am ctags-recursive install install-am install-strip \ - tags-recursive +.MAKE: $(am__recursive_targets) all check check-am install install-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-TESTS check-am check-local clean \ - clean-binPROGRAMS clean-checkPROGRAMS \ - clean-erasure_codelibLTLIBRARIES clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-local \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-TESTS check-am check-local clean clean-binPROGRAMS \ + clean-checkPROGRAMS clean-erasure_codelibLTLIBRARIES \ + clean-generic clean-libLTLIBRARIES clean-libtool clean-local \ clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ clean-noinstPROGRAMS clean-radoslibLTLIBRARIES \ - clean-sbinPROGRAMS clean-su_sbinPROGRAMS ctags ctags-recursive \ - dist-hook distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-bash_completionDATA install-binPROGRAMS \ - install-binSCRIPTS install-ceph_sbinSCRIPTS install-data \ - install-data-am install-data-local install-dist_binSCRIPTS \ - install-docDATA install-dvi install-dvi-am \ - install-erasure_codelibLTLIBRARIES install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES \ + clean-sbinPROGRAMS clean-su_sbinPROGRAMS cscopelist-am ctags \ + ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-bash_completionDATA \ + install-binPROGRAMS install-binSCRIPTS \ + install-ceph_sbinSCRIPTS install-data install-data-am \ + install-data-local install-dist_binSCRIPTS install-docDATA \ + install-dvi install-dvi-am install-erasure_codelibLTLIBRARIES \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ install-libcephfs_includeDATA install-librbd_includeDATA \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-pythonPYTHON install-rados_includeDATA \ @@ -15954,7 +16137,7 @@ uninstall-am: uninstall-bash_completionDATA uninstall-binPROGRAMS \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + recheck tags tags-am uninstall uninstall-am \ uninstall-bash_completionDATA uninstall-binPROGRAMS \ uninstall-binSCRIPTS uninstall-ceph_sbinSCRIPTS \ uninstall-dist_binSCRIPTS uninstall-docDATA \ @@ -15994,6 +16177,7 @@ $(shell_scripts): %: %.in docdir ?= ${datadir}/doc/ceph check-local: + $(top_srcdir)/qa/workunits/erasure-code/encode-decode-non-regression.sh $(srcdir)/test/encoding/readable.sh ../ceph-object-corpus # base targets diff --git a/ceph/src/acconfig.h.in b/ceph/src/acconfig.h.in index bed7a051..2b9802eb 100644 --- a/ceph/src/acconfig.h.in +++ b/ceph/src/acconfig.h.in @@ -330,9 +330,6 @@ /* Defined if you do not have atomic_ops */ #undef NO_ATOMIC_OPS -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff --git a/ceph/src/ceph-crush-location b/ceph/src/ceph-crush-location index 1f33f38f..d683a7d6 100755 --- a/ceph/src/ceph-crush-location +++ b/ceph/src/ceph-crush-location @@ -20,10 +20,10 @@ if [ `dirname $0` = "." ] && [ $PWD != "/usr/bin" ]; then LIBDIR=. ETCDIR=. else - BINDIR=/usr/bin - SBINDIR=/usr/sbin - LIBDIR=/usr/lib/ceph - ETCDIR=/etc/ceph + BINDIR=/usr/local/bin + SBINDIR=/usr/local/sbin + LIBDIR=/usr/local/lib/ceph + ETCDIR=/usr/local/etc/ceph fi usage_exit() { diff --git a/ceph/src/ceph-disk b/ceph/src/ceph-disk index 5d6071db..6bd02201 100755 --- a/ceph/src/ceph-disk +++ b/ceph/src/ceph-disk @@ -89,7 +89,7 @@ MOUNT_OPTIONS = dict( # issues with ext4 before the xatts-in-leveldb work, and it seemed # that user_xattr helped ext4='noatime,user_xattr', - xfs='noatime', + xfs='noatime,inode64', ) MKFS_ARGS = dict( @@ -791,11 +791,13 @@ def get_or_create_dmcrypt_key( # make a new key try: if not os.path.exists(key_dir): - os.makedirs(key_dir) + os.makedirs(key_dir, stat.S_IRUSR|stat.S_IWUSR|stat.S_IXUSR) with file('/dev/urandom', 'rb') as i: key = i.read(256) - with file(path, 'wb') as key_file: - key_file.write(key) + fd = os.open(path, os.O_WRONLY|os.O_CREAT, + stat.S_IRUSR|stat.S_IWUSR) + assert os.write(fd, key) == len(key) + os.close(fd) return path except: raise Error('unable to read or create dm-crypt key', path) @@ -968,6 +970,35 @@ def get_free_partition_index(dev): return num +def update_partition(action, dev, description): + # try to make sure the kernel refreshes the table. note + # that if this gets ebusy, we are probably racing with + # udev because it already updated it.. ignore failure here. + + # On RHEL and CentOS distros, calling partprobe forces a reboot of the + # server. Since we are not resizing partitons so we rely on calling + # partx + if platform_distro().startswith(('centos', 'red', 'scientific')): + LOG.info('calling partx on %s device %s', description, dev) + LOG.info('re-reading known partitions will display errors') + command( + [ + 'partx', + action, + dev, + ], + ) + + else: + LOG.debug('Calling partprobe on %s device %s', description, dev) + command( + [ + 'partprobe', + dev, + ], + ) + + def zap(dev): """ Destroy the partition table and content of a given disk. @@ -993,6 +1024,9 @@ def zap(dev): dev, ], ) + + update_partition('-d', dev, 'zapped') + except subprocess.CalledProcessError as e: raise Error(e) @@ -1068,32 +1102,7 @@ def prepare_journal_dev( ], ) - # try to make sure the kernel refreshes the table. note - # that if this gets ebusy, we are probably racing with - # udev because it already updated it.. ignore failure here. - - # On RHEL and CentOS distros, calling partprobe forces a reboot of the - # server. Since we are not resizing partitons so we rely on calling - # partx - if platform_distro().startswith(('centos', 'red')): - LOG.info('calling partx on prepared device %s', journal) - LOG.info('re-reading known partitions will display errors') - command( - [ - 'partx', - '-a', - journal, - ], - ) - - else: - LOG.debug('Calling partprobe on prepared device %s', journal) - command( - [ - 'partprobe', - journal, - ], - ) + update_partition('-a', journal, 'prepared') # wait for udev event queue to clear command( @@ -1118,7 +1127,6 @@ def prepare_journal_dev( except subprocess.CalledProcessError as e: raise Error(e) - def prepare_journal_file( journal): @@ -1279,12 +1287,7 @@ def prepare_dev( data, ], ) - command( - [ - 'partprobe', - data, - ], - ) + update_partition('-a', data, 'created') command( [ # wait for udev event queue to clear @@ -1500,33 +1503,7 @@ def main_prepare(args): prepare_lock.release() # noqa if stat.S_ISBLK(dmode): - # try to make sure the kernel refreshes the table. note - # that if this gets ebusy, we are probably racing with - # udev because it already updated it.. ignore failure here. - - # On RHEL and CentOS distros, calling partprobe forces a reboot of - # the server. Since we are not resizing partitons so we rely on - # calling partx - if platform_distro().startswith(('centos', 'red')): - LOG.info('calling partx on prepared device %s', args.data) - LOG.info('re-reading known partitions will display errors') - - command( - [ - 'partx', - '-a', - args.data, - ], - ) - - else: - LOG.debug('Calling partprobe on prepared device %s', args.data) - command( - [ - 'partprobe', - args.data, - ], - ) + update_partition('-a', args.data, 'prepared') except Error as e: if journal_dm_keypath: @@ -1918,7 +1895,8 @@ def activate( raise Error('No OSD uuid assigned.') LOG.debug('OSD uuid is %s', fsid) - keyring = activate_key_template.format(cluster=cluster) + keyring = activate_key_template.format(cluster=cluster, + statedir=STATEDIR) osd_id = get_osd_id(path) if osd_id is None: @@ -2657,7 +2635,7 @@ def parse_args(): help='path to block device or directory', ) activate_parser.set_defaults( - activate_key_template=STATEDIR + '/bootstrap-osd/{cluster}.keyring', + activate_key_template='{statedir}/bootstrap-osd/{cluster}.keyring', func=main_activate, ) @@ -2681,7 +2659,7 @@ def parse_args(): choices=INIT_SYSTEMS, ) activate_journal_parser.set_defaults( - activate_key_template=STATEDIR + '/bootstrap-osd/{cluster}.keyring', + activate_key_template='{statedir}/bootstrap-osd/{cluster}.keyring', func=main_activate_journal, ) @@ -2700,7 +2678,7 @@ def parse_args(): choices=INIT_SYSTEMS, ) activate_all_parser.set_defaults( - activate_key_template=STATEDIR + '/bootstrap-osd/{cluster}.keyring', + activate_key_template='{statedir}/bootstrap-osd/{cluster}.keyring', func=main_activate_all, ) diff --git a/ceph/src/ceph.in b/ceph/src/ceph.in index 82c90859..c5b97ef3 100755 --- a/ceph/src/ceph.in +++ b/ceph/src/ceph.in @@ -841,4 +841,8 @@ def main(): return 0 if __name__ == '__main__': - sys.exit(main()) + retval = main() + # shutdown explicitly; Rados() does not + if cluster_handle: + cluster_handle.shutdown() + sys.exit(retval) diff --git a/ceph/src/ceph_mon.cc b/ceph/src/ceph_mon.cc index 80b17a14..1b52f588 100644 --- a/ceph/src/ceph_mon.cc +++ b/ceph/src/ceph_mon.cc @@ -419,6 +419,26 @@ int main(int argc, const char **argv) return 0; } + { + // check fs stats. don't start if it's critically close to full. + ceph_data_stats_t stats; + int err = get_fs_stats(stats, g_conf->mon_data.c_str()); + if (err < 0) { + cerr << "error checking monitor data's fs stats: " << cpp_strerror(err) + << std::endl; + exit(-err); + } + if (stats.avail_percent <= g_conf->mon_data_avail_crit) { + cerr << "error: monitor data filesystem reached concerning levels of" + << " available storage space (available: " + << stats.avail_percent << "% " << prettybyte_t(stats.byte_avail) + << ")\nyou may adjust 'mon data avail crit' to a lower value" + << " to make this go away (default: " << g_conf->mon_data_avail_crit + << "%)\n" << std::endl; + exit(ENOSPC); + } + } + // we fork early to prevent leveldb's environment static state from // screwing us over Preforker prefork; diff --git a/ceph/src/civetweb/civetweb.h b/ceph/src/civetweb/civetweb.h index a6ca3e72..5da8a731 100644 --- a/ceph/src/civetweb/civetweb.h +++ b/ceph/src/civetweb/civetweb.h @@ -24,7 +24,7 @@ #define CIVETWEB_HEADER_INCLUDED #ifndef CIVETWEB_VERSION -#define CIVETWEB_VERSION "1.6" +#define CIVETWEB_VERSION "1.7" #endif #ifndef CIVETWEB_API @@ -77,7 +77,7 @@ struct mg_request_info { /* This structure needs to be passed to mg_start(), to let civetweb know which callbacks to invoke. For detailed description, see - https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md */ + https://github.com/bel2125/civetweb/blob/master/docs/UserManual.md */ struct mg_callbacks { /* Called when civetweb has received new HTTP request. If callback returns non-zero, @@ -94,6 +94,10 @@ struct mg_callbacks { non-zero, civetweb does not log anything. */ int (*log_message)(const struct mg_connection *, const char *message); + /* Called when civetweb is about to log access. If callback returns + non-zero, civetweb does not log anything. */ + int (*log_access)(const struct mg_connection *, const char *message); + /* Called when civetweb initializes SSL library. */ int (*init_ssl)(void *ssl_context, void *user_data); @@ -176,7 +180,7 @@ struct mg_callbacks { }; struct mg_context *ctx = mg_start(&my_func, NULL, options); - Refer to https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md + Refer to https://github.com/bel2125/civetweb/blob/master/docs/UserManual.md for the list of valid option and their possible values. Return: @@ -330,8 +334,18 @@ CIVETWEB_API int mg_websocket_write(struct mg_connection* conn, int opcode, Invoke this before mg_write or mg_printf when communicating with a websocket if your code has server-initiated communication as well as communication in direct response to a message. */ -CIVETWEB_API void mg_lock(struct mg_connection* conn); -CIVETWEB_API void mg_unlock(struct mg_connection* conn); +CIVETWEB_API void mg_lock_connection(struct mg_connection* conn); +CIVETWEB_API void mg_unlock_connection(struct mg_connection* conn); + +#if defined(MG_LEGACY_INTERFACE) +#define mg_lock mg_lock_connection +#define mg_unlock mg_unlock_connection +#endif + +/* Lock server context. This lock may be used to protect ressources + that are shared between different connection/worker threads. */ +CIVETWEB_API void mg_lock_context(struct mg_context* ctx); +CIVETWEB_API void mg_unlock_context(struct mg_context* ctx); /* Opcodes, from http://tools.ietf.org/html/rfc6455 */ diff --git a/ceph/src/civetweb/include/civetweb.h b/ceph/src/civetweb/include/civetweb.h index a6ca3e72..5da8a731 100644 --- a/ceph/src/civetweb/include/civetweb.h +++ b/ceph/src/civetweb/include/civetweb.h @@ -24,7 +24,7 @@ #define CIVETWEB_HEADER_INCLUDED #ifndef CIVETWEB_VERSION -#define CIVETWEB_VERSION "1.6" +#define CIVETWEB_VERSION "1.7" #endif #ifndef CIVETWEB_API @@ -77,7 +77,7 @@ struct mg_request_info { /* This structure needs to be passed to mg_start(), to let civetweb know which callbacks to invoke. For detailed description, see - https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md */ + https://github.com/bel2125/civetweb/blob/master/docs/UserManual.md */ struct mg_callbacks { /* Called when civetweb has received new HTTP request. If callback returns non-zero, @@ -94,6 +94,10 @@ struct mg_callbacks { non-zero, civetweb does not log anything. */ int (*log_message)(const struct mg_connection *, const char *message); + /* Called when civetweb is about to log access. If callback returns + non-zero, civetweb does not log anything. */ + int (*log_access)(const struct mg_connection *, const char *message); + /* Called when civetweb initializes SSL library. */ int (*init_ssl)(void *ssl_context, void *user_data); @@ -176,7 +180,7 @@ struct mg_callbacks { }; struct mg_context *ctx = mg_start(&my_func, NULL, options); - Refer to https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md + Refer to https://github.com/bel2125/civetweb/blob/master/docs/UserManual.md for the list of valid option and their possible values. Return: @@ -330,8 +334,18 @@ CIVETWEB_API int mg_websocket_write(struct mg_connection* conn, int opcode, Invoke this before mg_write or mg_printf when communicating with a websocket if your code has server-initiated communication as well as communication in direct response to a message. */ -CIVETWEB_API void mg_lock(struct mg_connection* conn); -CIVETWEB_API void mg_unlock(struct mg_connection* conn); +CIVETWEB_API void mg_lock_connection(struct mg_connection* conn); +CIVETWEB_API void mg_unlock_connection(struct mg_connection* conn); + +#if defined(MG_LEGACY_INTERFACE) +#define mg_lock mg_lock_connection +#define mg_unlock mg_unlock_connection +#endif + +/* Lock server context. This lock may be used to protect ressources + that are shared between different connection/worker threads. */ +CIVETWEB_API void mg_lock_context(struct mg_context* ctx); +CIVETWEB_API void mg_unlock_context(struct mg_context* ctx); /* Opcodes, from http://tools.ietf.org/html/rfc6455 */ diff --git a/ceph/src/civetweb/src/civetweb.c b/ceph/src/civetweb/src/civetweb.c index 4aa8a02b..3567df37 100644 --- a/ceph/src/civetweb/src/civetweb.c +++ b/ceph/src/civetweb/src/civetweb.c @@ -20,6 +20,8 @@ * THE SOFTWARE. */ +#define RGW 1 + #if defined(_WIN32) #if !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS /* Disable deprecation warning in VS2005 */ @@ -181,6 +183,10 @@ typedef long off_t; #define sleep(x) Sleep((x) * 1000) #define rmdir(x) _rmdir(x) +#if defined(USE_LUA) && defined(USE_WEBSOCKET) +#define USE_TIMERS +#endif + #if !defined(va_copy) #define va_copy(x, y) x = y #endif /* !va_copy MINGW #defines va_copy */ @@ -309,6 +315,40 @@ typedef int SOCKET; #endif /* End of Windows and UNIX specific includes */ +#ifdef _WIN32 +static CRITICAL_SECTION global_log_file_lock; +static DWORD pthread_self(void) +{ + return GetCurrentThreadId(); +} + +int pthread_key_create(pthread_key_t *key, void (*_must_be_zero)(void*) /* destructor function not supported for windows */) +{ + assert(_must_be_zero == NULL); + if ((key!=0) && (_must_be_zero == NULL)) { + *key = TlsAlloc(); + return (*key != TLS_OUT_OF_INDEXES) ? 0 : -1; + } + return -2; +} + +int pthread_key_delete(pthread_key_t key) +{ + return TlsFree(key) ? 0 : 1; +} + +int pthread_setspecific(pthread_key_t key, void * value) +{ + return TlsSetValue(key, value) ? 0 : 1; +} + +void *pthread_getspecific(pthread_key_t key) +{ + return TlsGetValue(key); +} +#endif /* _WIN32 */ + + #include "civetweb.h" #define PASSWORDS_FILE_NAME ".htpasswd" @@ -320,23 +360,30 @@ typedef int SOCKET; #endif #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) -#ifdef DEBUG_TRACE -#undef DEBUG_TRACE -#define DEBUG_TRACE(x) -#else +#if !defined(DEBUG_TRACE) #if defined(DEBUG) -#define DEBUG_TRACE(x) do { \ - flockfile(stdout); \ - printf("*** %lu.%p.%s.%d: ", \ - (unsigned long) time(NULL), (void *) pthread_self(), \ - __func__, __LINE__); \ - printf x; \ - putchar('\n'); \ - fflush(stdout); \ - funlockfile(stdout); \ -} while (0) + +static void DEBUG_TRACE_FUNC(const char *func, unsigned line, PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(3, 4); + +static void DEBUG_TRACE_FUNC(const char *func, unsigned line, const char *fmt, ...) { + + va_list args; + flockfile(stdout); + printf("*** %lu.%p.%s.%u: ", + (unsigned long) time(NULL), (void *) pthread_self(), + func, line); + va_start(args, fmt); + vprintf(fmt, args); + va_end(args); + putchar('\n'); + fflush(stdout); + funlockfile(stdout); +} + +#define DEBUG_TRACE(fmt, ...) DEBUG_TRACE_FUNC(__func__, __LINE__, fmt, __VA_ARGS__) + #else -#define DEBUG_TRACE(x) +#define DEBUG_TRACE(fmt, ...) #endif /* DEBUG */ #endif /* DEBUG_TRACE */ @@ -357,7 +404,7 @@ static void * mg_malloc_ex(size_t size, const char * file, unsigned line) { memory = (void *)(((char*)data)+sizeof(size_t)); } - sprintf(mallocStr, "MEM: %p %5u alloc %7u %4u --- %s:%u\n", memory, size, totalMemUsed, blockCount, file, line); + sprintf(mallocStr, "MEM: %p %5lu alloc %7lu %4lu --- %s:%u\n", memory, (unsigned long)size, totalMemUsed, blockCount, file, line); #if defined(_WIN32) OutputDebugStringA(mallocStr); #else @@ -385,7 +432,7 @@ static void mg_free_ex(void * memory, const char * file, unsigned line) { size = *(size_t*)data; totalMemUsed -= size; blockCount--; - sprintf(mallocStr, "MEM: %p %5u free %7u %4u --- %s:%u\n", memory, size, totalMemUsed, blockCount, file, line); + sprintf(mallocStr, "MEM: %p %5lu free %7lu %4lu --- %s:%u\n", memory, (unsigned long)size, totalMemUsed, blockCount, file, line); #if defined(_WIN32) OutputDebugStringA(mallocStr); #else @@ -400,23 +447,25 @@ static void * mg_realloc_ex(void * memory, size_t newsize, const char * file, un char mallocStr[256]; void * data; + void * _realloc; size_t oldsize; if (newsize) { if (memory) { data = (void *)(((char*)memory)-sizeof(size_t)); oldsize = *(size_t*)data; - data = realloc(data, newsize+sizeof(size_t)); - if (data) { + _realloc = realloc(data, newsize+sizeof(size_t)); + if (_realloc) { + data = _realloc; totalMemUsed -= oldsize; - sprintf(mallocStr, "MEM: %p %5u r-free %7u %4u --- %s:%u\n", memory, oldsize, totalMemUsed, blockCount, file, line); + sprintf(mallocStr, "MEM: %p %5lu r-free %7lu %4lu --- %s:%u\n", memory, (unsigned long)oldsize, totalMemUsed, blockCount, file, line); #if defined(_WIN32) OutputDebugStringA(mallocStr); #else DEBUG_TRACE("%s", mallocStr); #endif totalMemUsed += newsize; - sprintf(mallocStr, "MEM: %p %5u r-alloc %7u %4u --- %s:%u\n", memory, newsize, totalMemUsed, blockCount, file, line); + sprintf(mallocStr, "MEM: %p %5lu r-alloc %7lu %4lu --- %s:%u\n", memory, (unsigned long)newsize, totalMemUsed, blockCount, file, line); #if defined(_WIN32) OutputDebugStringA(mallocStr); #else @@ -430,6 +479,7 @@ static void * mg_realloc_ex(void * memory, size_t newsize, const char * file, un #else DEBUG_TRACE("MEM: realloc failed\n"); #endif + return _realloc; } } else { data = mg_malloc_ex(newsize, file, line); @@ -454,43 +504,24 @@ static __inline void * mg_realloc(void * a, size_t b) {return realloc(a, b);} static __inline void mg_free(void * a) {free(a);} #endif +/* This following lines are just meant as a reminder to use the mg-functions for memory management */ +#ifdef malloc + #undef malloc +#endif +#ifdef calloc + #undef calloc +#endif +#ifdef realloc + #undef realloc +#endif +#ifdef free + #undef free +#endif #define malloc DO_NOT_USE_THIS_FUNCTION__USE_mg_malloc #define calloc DO_NOT_USE_THIS_FUNCTION__USE_mg_calloc #define realloc DO_NOT_USE_THIS_FUNCTION__USE_mg_realloc #define free DO_NOT_USE_THIS_FUNCTION__USE_mg_free -#ifdef _WIN32 -static CRITICAL_SECTION global_log_file_lock; -static DWORD pthread_self(void) -{ - return GetCurrentThreadId(); -} - -int pthread_key_create(pthread_key_t *key, void (*_must_be_zero)(void*) /* destructor function not supported for windows */) -{ - assert(_must_be_zero == NULL); - if ((key!=0) && (_must_be_zero == NULL)) { - *key = TlsAlloc(); - return (*key != TLS_OUT_OF_INDEXES) ? 0 : -1; - } - return -2; -} - -int pthread_key_delete(pthread_key_t key) -{ - return TlsFree(key) ? 0 : 1; -} - -int pthread_setspecific(pthread_key_t key, void * value) -{ - return TlsSetValue(key, value) ? 0 : 1; -} - -void *pthread_getspecific(pthread_key_t key) -{ - return TlsGetValue(key); -} -#endif /* _WIN32 */ #define MD5_STATIC static #include "md5.h" @@ -668,6 +699,7 @@ enum { GLOBAL_PASSWORDS_FILE, INDEX_FILES, ENABLE_KEEP_ALIVE, ACCESS_CONTROL_LIST, EXTRA_MIME_TYPES, LISTENING_PORTS, DOCUMENT_ROOT, SSL_CERTIFICATE, NUM_THREADS, RUN_AS_USER, REWRITE, HIDE_FILES, REQUEST_TIMEOUT, + DECODE_URL, #if defined(USE_LUA) LUA_PRELOAD_FILE, LUA_SCRIPT_EXTENSIONS, LUA_SERVER_PAGE_EXTENSIONS, @@ -714,6 +746,7 @@ static struct mg_option config_options[] = { {"url_rewrite_patterns", 12345, NULL}, {"hide_files_patterns", 12345, NULL}, {"request_timeout_ms", CONFIG_TYPE_NUMBER, "30000"}, + {"decode_url", CONFIG_TYPE_BOOLEAN, "yes"}, #if defined(USE_LUA) {"lua_preload_file", CONFIG_TYPE_FILE, NULL}, @@ -753,60 +786,64 @@ struct mg_context { in_port_t *listening_ports; int num_listening_sockets; - volatile int num_threads; /* Number of threads */ - pthread_mutex_t mutex; /* Protects (max|num)_threads */ - pthread_cond_t cond; /* Condvar for tracking workers terminations */ + volatile int num_threads; /* Number of threads */ + pthread_mutex_t thread_mutex; /* Protects (max|num)_threads */ + pthread_cond_t thread_cond; /* Condvar for tracking workers terminations */ struct socket queue[MGSQLEN]; /* Accepted sockets */ - volatile int sq_head; /* Head of the socket queue */ - volatile int sq_tail; /* Tail of the socket queue */ - pthread_cond_t sq_full; /* Signaled when socket is produced */ - pthread_cond_t sq_empty; /* Signaled when socket is consumed */ - pthread_t masterthreadid; /* The master thread ID. */ - int workerthreadcount; /* The amount of worker threads. */ - pthread_t *workerthreadids;/* The worker thread IDs. */ + volatile int sq_head; /* Head of the socket queue */ + volatile int sq_tail; /* Tail of the socket queue */ + pthread_cond_t sq_full; /* Signaled when socket is produced */ + pthread_cond_t sq_empty; /* Signaled when socket is consumed */ + pthread_t masterthreadid; /* The master thread ID */ + int workerthreadcount; /* The amount of worker threads. */ + pthread_t *workerthreadids; /* The worker thread IDs */ - unsigned long start_time; /* Server start time, used for authentication */ - unsigned long nonce_count; /* Used nonces, used for authentication */ + unsigned long start_time; /* Server start time, used for authentication */ + pthread_mutex_t nonce_mutex; /* Protects nonce_count */ + unsigned long nonce_count; /* Used nonces, used for authentication */ - char *systemName; /* What operating system is running */ + char *systemName; /* What operating system is running */ /* linked list of uri handlers */ struct mg_request_handler_info *request_handlers; #if defined(USE_LUA) && defined(USE_WEBSOCKET) /* linked list of shared lua websockets */ - struct mg_shared_lua_websocket *shared_lua_websockets; + struct mg_shared_lua_websocket_list *shared_lua_websockets; +#endif + +#ifdef USE_TIMERS + struct timers * timers; #endif }; struct mg_connection { struct mg_request_info request_info; struct mg_context *ctx; - SSL *ssl; /* SSL descriptor */ - SSL_CTX *client_ssl_ctx; /* SSL context for client connections */ - struct socket client; /* Connected client */ - time_t birth_time; /* Time when request was received */ - int64_t num_bytes_sent; /* Total bytes sent to client */ - int64_t content_len; /* Content-Length header value */ - int64_t consumed_content; /* How many bytes of content have been read */ - char *buf; /* Buffer for received data */ - char *path_info; /* PATH_INFO part of the URL */ - int must_close; /* 1 if connection must be closed */ - int in_error_handler; /* 1 if in handler for user defined error pages */ - int buf_size; /* Buffer size */ - int request_len; /* Size of the request + headers in a buffer */ - int data_len; /* Total size of data in a buffer */ - int status_code; /* HTTP reply status code, e.g. 200 */ - int throttle; /* Throttling, bytes/sec. <= 0 means no - throttle */ - time_t last_throttle_time; /* Last time throttled data was sent */ - int64_t last_throttle_bytes;/* Bytes sent this second */ - pthread_mutex_t mutex; /* Used by mg_lock/mg_unlock to ensure atomic - transmissions for websockets */ + SSL *ssl; /* SSL descriptor */ + SSL_CTX *client_ssl_ctx; /* SSL context for client connections */ + struct socket client; /* Connected client */ + time_t birth_time; /* Time when request was received */ + int64_t num_bytes_sent; /* Total bytes sent to client */ + int64_t content_len; /* Content-Length header value */ + int64_t consumed_content; /* How many bytes of content have been read */ + char *buf; /* Buffer for received data */ + char *path_info; /* PATH_INFO part of the URL */ + int must_close; /* 1 if connection must be closed */ + int in_error_handler; /* 1 if in handler for user defined error pages */ + int buf_size; /* Buffer size */ + int request_len; /* Size of the request + headers in a buffer */ + int data_len; /* Total size of data in a buffer */ + int status_code; /* HTTP reply status code, e.g. 200 */ + int throttle; /* Throttling, bytes/sec. <= 0 means no throttle */ + time_t last_throttle_time; /* Last time throttled data was sent */ + int64_t last_throttle_bytes; /* Bytes sent this second */ + pthread_mutex_t mutex; /* Used by mg_lock_connection/mg_unlock_connection to ensure atomic transmissions for websockets */ #if defined(USE_LUA) && defined(USE_WEBSOCKET) - void * lua_websocket_state; /* Lua_State for a websocket connection */ + void * lua_websocket_state; /* Lua_State for a websocket connection */ #endif + int is_chunked; /* transfer-encoding is chunked */ }; static pthread_key_t sTlsKey; /* Thread local storage index */ @@ -1253,7 +1290,6 @@ static int match_prefix(const char *pattern, int pattern_len, const char *str) } i = j = 0; - res = -1; for (; i < pattern_len; i++, j++) { if (pattern[i] == '?' && str[j] != '\0') { continue; @@ -1298,6 +1334,11 @@ static int should_keep_alive(const struct mg_connection *conn) return 1; } +static int should_decode_url(const struct mg_connection *conn) +{ + return (mg_strcasecmp(conn->ctx->config[DECODE_URL], "yes") == 0); +} + static const char *suggest_connection_header(const struct mg_connection *conn) { return should_keep_alive(conn) ? "keep-alive" : "close"; @@ -1381,7 +1422,7 @@ static void send_http_error(struct mg_connection *conn, int status, len += mg_vsnprintf(conn, buf + len, sizeof(buf) - len, fmt, ap); va_end(ap); } - DEBUG_TRACE(("[%s]", buf)); + DEBUG_TRACE("[%s]", buf); mg_printf(conn, "HTTP/1.1 %d %s\r\n" "Content-Length: %d\r\n" @@ -1408,7 +1449,18 @@ static int pthread_mutex_destroy(pthread_mutex_t *mutex) static int pthread_mutex_lock(pthread_mutex_t *mutex) { - return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0? 0 : -1; + return WaitForSingleObject(*mutex, INFINITE) == WAIT_OBJECT_0 ? 0 : -1; +} + +static int pthread_mutex_trylock(pthread_mutex_t *mutex) +{ + switch (WaitForSingleObject(*mutex, 0)) { + case WAIT_OBJECT_0: + return 0; + case WAIT_TIMEOUT: + return -2; /* EBUSY */ + } + return -1; } static int pthread_mutex_unlock(pthread_mutex_t *mutex) @@ -1853,7 +1905,7 @@ static int mg_join_thread(pthread_t threadid) int err; err = GetLastError(); - DEBUG_TRACE(("WaitForSingleObject() failed, error %d", err)); + DEBUG_TRACE("WaitForSingleObject() failed, error %d", err); } else { if (dwevent == WAIT_OBJECT_0) { CloseHandle(threadid); @@ -1959,7 +2011,7 @@ static pid_t spawn_process(struct mg_connection *conn, const char *prog, mg_snprintf(conn, cmdline, sizeof(cmdline), "%s%s\"%s\\%s\"", interp, interp[0] == '\0' ? "" : " ", full_dir, prog); - DEBUG_TRACE(("Running [%s]", cmdline)); + DEBUG_TRACE("Running [%s]", cmdline); if (CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, CREATE_NEW_PROCESS_GROUP, envblk, NULL, &si, &pi) == 0) { mg_cry(conn, "%s: CreateProcess(%s): %ld", @@ -2002,9 +2054,9 @@ static int mg_stat(struct mg_connection *conn, const char *path, static void set_close_on_exec(int fd, struct mg_connection *conn /* may be null */) { if (fcntl(fd, F_SETFD, FD_CLOEXEC) != 0) { - if (conn) - mg_cry(conn, "%s: fcntl(F_SETFD FD_CLOEXEC) failed: %s", - __func__, strerror(ERRNO)); + if (conn) { + mg_cry(conn, "%s: fcntl(F_SETFD FD_CLOEXEC) failed: %s", __func__, strerror(ERRNO)); + } } } @@ -2031,8 +2083,7 @@ int mg_start_thread(mg_thread_func_t func, void *param) /* Start a thread storing the thread context. */ -static int mg_start_thread_with_id(mg_thread_func_t func, void *param, - pthread_t *threadidptr) +static int mg_start_thread_with_id(mg_thread_func_t func, void *param, pthread_t *threadidptr) { pthread_t thread_id; pthread_attr_t attr; @@ -2128,8 +2179,7 @@ static int set_non_blocking_mode(SOCKET sock) /* Write data to the IO channel - opened file descriptor, socket or SSL descriptor. Return number of bytes written. */ -static int64_t push(FILE *fp, SOCKET sock, SSL *ssl, const char *buf, - int64_t len) +static int64_t push(FILE *fp, SOCKET sock, SSL *ssl, const char *buf, int64_t len) { int64_t sent; int n, k; @@ -2207,7 +2257,25 @@ static int pull_all(FILE *fp, struct mg_connection *conn, char *buf, int len) return nread; } -int mg_read(struct mg_connection *conn, void *buf, size_t len) +static void fast_forward_request(struct mg_connection *conn) +{ + char buf[MG_BUF_LEN]; + int to_read, nread; + + while (conn->consumed_content < conn->content_len) { + to_read = sizeof(buf); + if ((int64_t) to_read > conn->content_len - conn->consumed_content) { + to_read = (int) (conn->content_len - conn->consumed_content); + } + + nread = mg_read(conn, buf, to_read); + if (nread <= 0) { + break; + } + } +} + +int mg_read_inner(struct mg_connection *conn, void *buf, size_t len) { int64_t n, buffered_len, nread; const char *body; @@ -2248,6 +2316,43 @@ int mg_read(struct mg_connection *conn, void *buf, size_t len) return nread; } +static int mg_getc(struct mg_connection *conn) { + char c; + conn->content_len++; + if ( mg_read_inner(conn,&c,1) <= 0 ) return EOF; + return c; +} + +int mg_read(struct mg_connection *conn, void *buf, size_t len) { + if ( conn->is_chunked ) { + if (conn->content_len <= 0 ) conn->content_len = 0; + if (conn->consumed_content < conn->content_len) return mg_read_inner(conn,buf,len); + int i = 0; + char str[64]; + while (1) { + int c = mg_getc(conn); + if (c == EOF) return EOF; + if ( ! ( c == '\n' || c == '\r' ) ) { + str[i++] = c; + break; + } + } + for (; i < (int)sizeof(str); i++) { + int c = mg_getc(conn); + if ( c == EOF ) return -1; + str[i] = (char) c; + if ( i > 0 && str[i] == '\n' && str[i-1] == '\r' ) break; + } + char *end = 0; + long chunkSize = strtol(str,&end,16); + if ( end != str+(i-1) ) return -1; + if ( chunkSize == 0 ) return 0; + conn->content_len += chunkSize; + } + return mg_read_inner(conn,buf,len); +} + + int mg_write(struct mg_connection *conn, const void *buf, size_t len) { time_t now; @@ -2381,7 +2486,7 @@ int mg_url_decode(const char *src, int src_len, char *dst, #define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W') for (i = j = 0; i < src_len && j < dst_len - 1; i++, j++) { - if (src[i] == '%' && i < src_len - 2 && + if (i < src_len - 2 && src[i] == '%' && isxdigit(* (const unsigned char *) (src + i + 1)) && isxdigit(* (const unsigned char *) (src + i + 2))) { a = tolower(* (const unsigned char *) (src + i + 1)); @@ -2656,10 +2761,11 @@ static int get_request_len(const char *buf, int buflen) { const char *s, *e; int len = 0; + int in_content = 0; - for (s = buf, e = s + buflen - 1; len <= 0 && s < e; s++) + for (s = buf, e = s + buflen - 1; len <= 0 && s < e; s++) { /* Control characters are not allowed but >=128 is. */ - if (!isprint(* (const unsigned char *) s) && *s != '\r' && + if (!in_content && !isprint(* (const unsigned char *) s) && *s != '\r' && *s != '\n' && * (const unsigned char *) s < 128) { len = -1; break; /* [i_a] abort scan as soon as one malformed character is @@ -2670,8 +2776,14 @@ static int get_request_len(const char *buf, int buflen) } else if (s[0] == '\n' && &s[1] < e && s[1] == '\r' && s[2] == '\n') { len = (int) (s - buf) + 3; + in_content = 0; } + if (!in_content && *s == ':') { + in_content = 1; + } + } + return len; } @@ -2724,6 +2836,7 @@ static time_t parse_date_string(const char *datetime) return result; } +#ifndef RGW /* Protect against directory disclosure attack by removing '..', excessive '/' and '\' characters */ static void remove_double_dots_and_double_slashes(char *s) @@ -2747,6 +2860,7 @@ static void remove_double_dots_and_double_slashes(char *s) } *p = '\0'; } +#endif static const struct { const char *extension; @@ -2976,9 +3090,11 @@ static void open_auth_file(struct mg_connection *conn, const char *path, } } else { /* Try to find .htpasswd in requested directory. */ - for (p = path, e = p + strlen(p) - 1; e > p; e--) - if (e[0] == '/') + for (p = path, e = p + strlen(p) - 1; e > p; e--) { + if (e[0] == '/') { break; + } + } mg_snprintf(conn, name, sizeof(name), "%.*s%c%s", (int) (e - p), p, '/', PASSWORDS_FILE_NAME); if (!mg_fopen(conn, name, "r", filep)) { @@ -3108,33 +3224,98 @@ static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p) } } -/* Authorize against the opened passwords file. Return 1 if authorized. */ -static int authorize(struct mg_connection *conn, struct file *filep) -{ +struct read_auth_file_struct { + struct mg_connection *conn; struct ah ah; - char line[256], f_user[256] = "", ha1[256] = "", f_domain[256] = "", buf[MG_BUF_LEN], *p; + char *domain; + char buf[256+256+40]; + char *f_user; + char *f_domain; + char *f_ha1; +}; - if (!parse_auth_header(conn, buf, sizeof(buf), &ah)) { - return 0; - } +static int read_auth_file(struct file *filep, struct read_auth_file_struct * workdata) +{ + char *p; + int is_authorized = 0; + struct file fp; + int l; /* Loop over passwords file */ p = (char *) filep->membuf; - while (mg_fgets(line, sizeof(line), filep, &p) != NULL) { - if (sscanf(line, "%255[^:]:%255[^:]:%255s", f_user, f_domain, ha1) != 3) { + while (mg_fgets(workdata->buf, sizeof(workdata->buf), filep, &p) != NULL) { + + l = strlen(workdata->buf); + while (l>0) { + if (isspace(workdata->buf[l-1]) || iscntrl(workdata->buf[l-1])) { + l--; + workdata->buf[l] = 0; + } else break; + } + if (l<1) continue; + + workdata->f_user = workdata->buf; + + if (workdata->f_user[0]==':') { + /* user names may not contain a ':' and may not be empty, + so lines starting with ':' may be used for a special purpose */ + if (workdata->f_user[1]=='#') { + /* :# is a comment */ + continue; + } else if (!strncmp(workdata->f_user+1,"include=",8)) { + if (mg_fopen(workdata->conn, workdata->f_user+9, "r", &fp)) { + is_authorized = read_auth_file(&fp, workdata); + mg_fclose(&fp); + } else { + mg_cry(workdata->conn, "%s: cannot open authorization file: %s", __func__, workdata->buf); + } + continue; + } + /* everything is invalid for the moment (might change in the future) */ + mg_cry(workdata->conn, "%s: syntax error in authorization file: %s", __func__, workdata->buf); continue; } - f_user[255]=0; - f_domain[255]=0; - ha1[255]=0; - if (!strcmp(ah.user, f_user) && - !strcmp(conn->ctx->config[AUTHENTICATION_DOMAIN], f_domain)) - return check_password(conn->request_info.request_method, ha1, ah.uri, - ah.nonce, ah.nc, ah.cnonce, ah.qop, ah.response); + workdata->f_domain = strchr(workdata->f_user, ':'); + if (workdata->f_domain == NULL) { + mg_cry(workdata->conn, "%s: syntax error in authorization file: %s", __func__, workdata->buf); + continue; + } + *(workdata->f_domain) = 0; + (workdata->f_domain)++; + + workdata->f_ha1 = strchr(workdata->f_domain, ':'); + if (workdata->f_ha1 == NULL) { + mg_cry(workdata->conn, "%s: syntax error in authorization file: %s", __func__, workdata->buf); + continue; + } + *(workdata->f_ha1) = 0; + (workdata->f_ha1)++; + + if (!strcmp(workdata->ah.user, workdata->f_user) && !strcmp(workdata->domain, workdata->f_domain)) { + return check_password(workdata->conn->request_info.request_method, workdata->f_ha1, workdata->ah.uri, + workdata->ah.nonce, workdata->ah.nc, workdata->ah.cnonce, workdata->ah.qop, workdata->ah.response); + } } - return 0; + return is_authorized; +} + +/* Authorize against the opened passwords file. Return 1 if authorized. */ +static int authorize(struct mg_connection *conn, struct file *filep) +{ + struct read_auth_file_struct workdata; + char buf[MG_BUF_LEN]; + + memset(&workdata,0,sizeof(workdata)); + workdata.conn = conn; + + if (!parse_auth_header(conn, buf, sizeof(buf), &workdata.ah)) { + return 0; + } + workdata.domain = conn->ctx->config[AUTHENTICATION_DOMAIN]; + + return read_auth_file(filep, &workdata); } /* Return 1 if request is authorised, 0 otherwise. */ @@ -3172,16 +3353,16 @@ static int check_authorization(struct mg_connection *conn, const char *path) static void send_authorization_request(struct mg_connection *conn) { - char date[64]; - time_t curtime = time(NULL); - unsigned long nonce = (unsigned long)(conn->ctx->start_time); - - (void)pthread_mutex_lock(&conn->ctx->mutex); + char date[64]; + time_t curtime = time(NULL); + unsigned long nonce = (unsigned long)(conn->ctx->start_time); + + (void)pthread_mutex_lock(&conn->ctx->nonce_mutex); nonce += conn->ctx->nonce_count; ++conn->ctx->nonce_count; - (void)pthread_mutex_unlock(&conn->ctx->mutex); - - nonce ^= (unsigned long)(conn->ctx); + (void)pthread_mutex_unlock(&conn->ctx->nonce_mutex); + + nonce ^= (unsigned long)(conn->ctx); conn->status_code = 401; conn->must_close = 1; @@ -3215,8 +3396,8 @@ static int is_authorized_for_put(struct mg_connection *conn) int mg_modify_passwords_file(const char *fname, const char *domain, const char *user, const char *pass) { - int found; - char line[512], u[512] = "", d[512] ="", ha1[33], tmp[PATH_MAX+1]; + int found, i; + char line[512], u[512] = "", d[512] ="", ha1[33], tmp[PATH_MAX+8]; FILE *fp, *fp2; found = 0; @@ -3227,6 +3408,25 @@ int mg_modify_passwords_file(const char *fname, const char *domain, pass = NULL; } + /* Other arguments must not be empty */ + if (fname == NULL || domain == NULL || user == NULL) return 0; + + /* Using the given file format, user name and domain must not contain ':' */ + if (strchr(user, ':') != NULL) return 0; + if (strchr(domain, ':') != NULL) return 0; + + /* Do not allow control characters like newline in user name and domain. + Do not allow excessively long names either. */ + for (i=0; i<255 && user[i]!=0; i++) { + if (iscntrl(user[i])) return 0; + } + if (user[i]) return 0; + for (i=0; i<255 && domain[i]!=0; i++) { + if (iscntrl(domain[i])) return 0; + } + if (domain[i]) return 0; + + /* Create a temporary file name */ (void) snprintf(tmp, sizeof(tmp) - 1, "%s.tmp", fname); tmp[sizeof(tmp) - 1] = 0; @@ -3822,6 +4022,7 @@ static int parse_http_message(char *buf, int len, struct mg_request_info *ri) /* HTTP message could be either HTTP request or HTTP response, e.g. "GET / HTTP/1.0 ...." or "HTTP/1.0 200 OK ..." */ +#ifndef RGW is_request = is_valid_http_method(ri->request_method); if ((is_request && memcmp(ri->http_version, "HTTP/", 5) != 0) || (!is_request && memcmp(ri->request_method, "HTTP/", 5) != 0)) { @@ -3832,6 +4033,17 @@ static int parse_http_message(char *buf, int len, struct mg_request_info *ri) } parse_http_headers(&buf, ri); } +#else + is_request = (memcmp(ri->http_version, "HTTP/", 5) == 0); + if (is_request) { + ri->http_version += 5; + } + if (is_request || memcmp(ri->request_method, "HTTP/", 5) == 0) { + parse_http_headers(&buf, ri); + } else { + request_length = -1; + } +#endif } return request_length; } @@ -3928,7 +4140,7 @@ static int forward_body_data(struct mg_connection *conn, FILE *fp, expect = mg_get_header(conn, "Expect"); assert(fp != NULL); - if (conn->content_len == -1) { + if (conn->content_len == -1 && !conn->is_chunked) { send_http_error(conn, 411, "Length Required", "%s", ""); } else if (expect != NULL && mg_strcasecmp(expect, "100-continue")) { send_http_error(conn, 417, "Expectation Failed", "%s", ""); @@ -4235,7 +4447,7 @@ static void handle_cgi_request(struct mg_connection *conn, const char *prog) Do not send anything back to client, until we buffer in all HTTP headers. */ data_len = 0; - buf = mg_malloc(buflen); + buf = (char *)mg_malloc(buflen); if (buf == NULL) { send_http_error(conn, 500, http_500_error, "Not enough memory for buffer (%u bytes)", @@ -4343,7 +4555,7 @@ static int put_dir(struct mg_connection *conn, const char *path) buf[len] = '\0'; /* Try to create intermediate directory */ - DEBUG_TRACE(("mkdir(%s)", buf)); + DEBUG_TRACE("mkdir(%s)", buf); if (!mg_stat(conn, buf, &file) && mg_mkdir(buf, 0755) != 0) { res = -1; break; @@ -4362,7 +4574,7 @@ static void mkcol(struct mg_connection *conn, const char *path) { int rc, body_len; struct de de; - char date[64]; + char date[64]; time_t curtime = time(NULL); memset(&de.file, 0, sizeof(de.file)); @@ -4413,7 +4625,7 @@ static void put_file(struct mg_connection *conn, const char *path) const char *range; int64_t r1, r2; int rc; - char date[64]; + char date[64]; time_t curtime = time(NULL); conn->status_code = mg_stat(conn, path, &file) ? 200 : 201; @@ -4687,7 +4899,7 @@ static void handle_propfind(struct mg_connection *conn, const char *path, struct file *filep) { const char *depth = mg_get_header(conn, "Depth"); - char date[64]; + char date[64]; time_t curtime = time(NULL); gmt_time_string(date, sizeof(date), &curtime); @@ -4717,16 +4929,30 @@ static void handle_propfind(struct mg_connection *conn, const char *path, conn->num_bytes_sent += mg_printf(conn, "%s\n", ""); } -void mg_lock(struct mg_connection* conn) +void mg_lock_connection(struct mg_connection* conn) { (void) pthread_mutex_lock(&conn->mutex); } -void mg_unlock(struct mg_connection* conn) +void mg_unlock_connection(struct mg_connection* conn) { (void) pthread_mutex_unlock(&conn->mutex); } +void mg_lock_context(struct mg_context* ctx) +{ + (void) pthread_mutex_lock(&ctx->nonce_mutex); +} + +void mg_unlock_context(struct mg_context* ctx) +{ + (void) pthread_mutex_unlock(&ctx->nonce_mutex); +} + +#if defined(USE_TIMERS) +#include "timer.inl" +#endif /* USE_TIMERS */ + #ifdef USE_LUA #include "mod_lua.inl" #endif /* USE_LUA */ @@ -5015,9 +5241,9 @@ static void read_websocket(struct mg_connection *conn) /* Copy the mask before we shift the queue and destroy it */ if (mask_len > 0) { - *(uint32_t*)mask = *(uint32_t*)(buf + header_len - mask_len); + memcpy(mask, buf + header_len - mask_len, sizeof(mask)); } else { - *(uint32_t*)mask = 0; + memset(mask, 0, sizeof(mask)); } /* Read frame payload from the first message in the queue into @@ -5075,7 +5301,7 @@ static void read_websocket(struct mg_connection *conn) !conn->ctx->callbacks.websocket_data(conn, mop, data, data_len)) || #ifdef USE_LUA (conn->lua_websocket_state && - !lua_websocket_data(conn, mop, data, data_len)) || + !lua_websocket_data(conn, conn->lua_websocket_state, mop, data, data_len)) || #endif (buf[0] & 0xf) == WEBSOCKET_OPCODE_CONNECTION_CLOSE) { /* Opcode == 8, connection close */ break; @@ -5130,10 +5356,10 @@ int mg_websocket_write(struct mg_connection* conn, int opcode, const char* data, but mongoose's mg_printf/mg_write is not (because of the loop in push(), although that is only a problem if the packet is large or outgoing buffer is full). */ - (void) mg_lock(conn); + (void) mg_lock_connection(conn); retval = mg_write(conn, header, headerLen); retval = mg_write(conn, data, dataLen); - mg_unlock(conn); + mg_unlock_connection(conn); return retval; } @@ -5142,7 +5368,7 @@ static void handle_websocket_request(struct mg_connection *conn, const char *pat { const char *version = mg_get_header(conn, "Sec-WebSocket-Version"); #ifdef USE_LUA - int lua_websock, shared_lua_websock = 0; + int lua_websock = 0; /* TODO: A websocket script may be shared between several clients, allowing them to communicate directly instead of writing to a data base and polling the data base. */ #endif @@ -5155,17 +5381,17 @@ static void handle_websocket_request(struct mg_connection *conn, const char *pat /* The C callback is called before Lua and may prevent Lua from handling the websocket. */ } else { #ifdef USE_LUA - lua_websock = conn->ctx->config[LUA_WEBSOCKET_EXTENSIONS] ? - match_prefix(conn->ctx->config[LUA_WEBSOCKET_EXTENSIONS], + if (conn->ctx->config[LUA_WEBSOCKET_EXTENSIONS]) { + lua_websock = match_prefix(conn->ctx->config[LUA_WEBSOCKET_EXTENSIONS], (int)strlen(conn->ctx->config[LUA_WEBSOCKET_EXTENSIONS]), - path) : 0; + path); + } - if (lua_websock || shared_lua_websock) { - /* TODO */ shared_lua_websock = 0; - conn->lua_websocket_state = lua_websocket_new(path, conn, !!shared_lua_websock); + if (lua_websock) { + conn->lua_websocket_state = lua_websocket_new(path, conn); if (conn->lua_websocket_state) { send_websocket_handshake(conn); - if (lua_websocket_ready(conn)) { + if (lua_websocket_ready(conn, conn->lua_websocket_state)) { read_websocket(conn); } } @@ -5295,6 +5521,7 @@ int mg_upload(struct mg_connection *conn, const char *destination_dir) assert(len >= 0 && len <= (int) sizeof(buf)); while ((n = mg_read(conn, buf + len, sizeof(buf) - len)) > 0) { len += n; + assert(len <= (int) sizeof(buf)); } if ((headers_len = get_request_len(buf, len)) <= 0) { break; @@ -5422,7 +5649,7 @@ static void redirect_to_https_port(struct mg_connection *conn, int ssl_index) void mg_set_request_handler(struct mg_context *ctx, const char *uri, mg_request_handler handler, void *cbdata) { - struct mg_request_handler_info *tmp_rh, *lastref = 0; + struct mg_request_handler_info *tmp_rh, *lastref = NULL; size_t urilen = strlen(uri); /* first see it the uri exists */ @@ -5507,10 +5734,10 @@ static int use_request_handler(struct mg_connection *conn) return tmp_rh->handler(conn, tmp_rh->cbdata); } - - /* try for pattern match */ - if (match_prefix(tmp_rh->uri, tmp_rh->uri_len, uri) > 0) { - return tmp_rh->handler(conn, tmp_rh->cbdata); + + /* try for pattern match */ + if (match_prefix(tmp_rh->uri, tmp_rh->uri_len, uri) > 0) { + return tmp_rh->handler(conn, tmp_rh->cbdata); } } @@ -5528,21 +5755,28 @@ static void handle_request(struct mg_connection *conn) char path[PATH_MAX]; int uri_len, ssl_index, is_script_resource; struct file file = STRUCT_FILE_INITIALIZER; - char date[64]; + char date[64]; time_t curtime = time(NULL); if ((conn->request_info.query_string = strchr(ri->uri, '?')) != NULL) { * ((char *) conn->request_info.query_string++) = '\0'; } uri_len = (int) strlen(ri->uri); - mg_url_decode(ri->uri, uri_len, (char *) ri->uri, uri_len + 1, 0); + + if (should_decode_url(conn)) { + mg_url_decode(ri->uri, uri_len, (char *) ri->uri, uri_len + 1, 0); + } + +#ifndef RGW remove_double_dots_and_double_slashes((char *) ri->uri); +#endif + path[0] = '\0'; convert_uri_to_file_name(conn, path, sizeof(path), &file, &is_script_resource); conn->throttle = set_throttle(conn->ctx->config[THROTTLE], get_remote_ip(conn), ri->uri); - DEBUG_TRACE(("%s", ri->uri)); + DEBUG_TRACE("%s", ri->uri); /* Perform redirect and auth checks before calling begin_request() handler. Otherwise, begin_request() would need to perform auth checks and redirects. */ @@ -5555,6 +5789,7 @@ static void handle_request(struct mg_connection *conn) } else if (conn->ctx->callbacks.begin_request != NULL && conn->ctx->callbacks.begin_request(conn)) { /* Do nothing, callback has served the request */ + fast_forward_request(conn); #if defined(USE_WEBSOCKET) } else if (is_websocket_request(conn)) { handle_websocket_request(conn, path, is_script_resource); @@ -5630,7 +5865,7 @@ static void handle_file_based_request(struct mg_connection *conn, const char *pa (int)strlen(conn->ctx->config[LUA_SERVER_PAGE_EXTENSIONS]), path) > 0) { /* Lua server page: an SSI like page containing mostly plain html code plus some tags with server generated contents. */ - handle_lsp_request(conn, path, &file, NULL); + handle_lsp_request(conn, path, file, NULL); } else if (match_prefix(conn->ctx->config[LUA_SCRIPT_EXTENSIONS], (int)strlen(conn->ctx->config[LUA_SCRIPT_EXTENSIONS]), path) > 0) { @@ -5663,9 +5898,9 @@ static void close_all_listening_sockets(struct mg_context *ctx) ctx->listening_sockets[i].sock = INVALID_SOCKET; } mg_free(ctx->listening_sockets); - ctx->listening_sockets=0; + ctx->listening_sockets = NULL; mg_free(ctx->listening_ports); - ctx->listening_ports=0; + ctx->listening_ports = NULL; } static int is_valid_port(unsigned int port) @@ -5695,7 +5930,7 @@ static int parse_port_string(const struct vec *vec, struct socket *so) so->lsa.sin.sin_addr.s_addr = htonl((a << 24) | (b << 16) | (c << 8) | d); so->lsa.sin.sin_port = htons((uint16_t) port); #if defined(USE_IPV6) - } else if (sscanf(vec->ptr, "[%49[^]]]:%d%n", buf, &port, &len) == 2 && + } else if (sscanf(vec->ptr, "[%49[^]]]:%u%n", buf, &port, &len) == 2 && inet_pton(AF_INET6, buf, &so->lsa.sin6.sin6_addr)) { /* IPv6 address, e.g. [3ffe:2a00:100:7031::1]:8080 */ so->lsa.sin6.sin6_family = AF_INET6; @@ -5776,6 +6011,7 @@ static int set_ports_option(struct mg_context *ctx) sizeof(ctx->listening_ports[0]))) == NULL) { closesocket(so.sock); so.sock = INVALID_SOCKET; + mg_free(ptr); success = 0; } else { @@ -5795,15 +6031,14 @@ static int set_ports_option(struct mg_context *ctx) return success; } -static void log_header(const struct mg_connection *conn, const char *header, - FILE *fp) +static const char* header_val(const struct mg_connection *conn, const char *header) { const char *header_value; if ((header_value = mg_get_header(conn, header)) == NULL) { - (void) fprintf(fp, "%s", " -"); + return "-"; } else { - (void) fprintf(fp, " \"%s\"", header_value); + return header_value; } } @@ -5814,10 +6049,15 @@ static void log_access(const struct mg_connection *conn) char date[64], src_addr[IP_ADDR_STR_LEN]; struct tm *tm; + const char *referer; + const char *user_agent; + + char buf[4096]; + fp = conn->ctx->config[ACCESS_LOG_FILE] == NULL ? NULL : fopen(conn->ctx->config[ACCESS_LOG_FILE], "a+"); - if (fp == NULL) + if (fp == NULL && conn->ctx->callbacks.log_message == NULL) return; tm = localtime(&conn->birth_time); @@ -5829,21 +6069,30 @@ static void log_access(const struct mg_connection *conn) } ri = &conn->request_info; - flockfile(fp); sockaddr_to_string(src_addr, sizeof(src_addr), &conn->client.rsa); - fprintf(fp, "%s - %s [%s] \"%s %s HTTP/%s\" %d %" INT64_FMT, + referer = header_val(conn, "Referer"); + user_agent = header_val(conn, "User-Agent"); + + snprintf(buf, sizeof(buf), "%s - %s [%s] \"%s %s HTTP/%s\" %d %" INT64_FMT " %s %s", src_addr, ri->remote_user == NULL ? "-" : ri->remote_user, date, ri->request_method ? ri->request_method : "-", ri->uri ? ri->uri : "-", ri->http_version, - conn->status_code, conn->num_bytes_sent); - log_header(conn, "Referer", fp); - log_header(conn, "User-Agent", fp); - fputc('\n', fp); - fflush(fp); + conn->status_code, conn->num_bytes_sent, + referer, user_agent); - funlockfile(fp); - fclose(fp); + if (conn->ctx->callbacks.log_access) { + conn->ctx->callbacks.log_access(conn, buf); + } + + if (fp) { + flockfile(fp); + fprintf(fp, "%s", buf); + fputc('\n', fp); + fflush(fp); + funlockfile(fp); + fclose(fp); + } } /* Verify given socket address against the ACL. @@ -6072,6 +6321,7 @@ static void reset_per_request_attributes(struct mg_connection *conn) conn->num_bytes_sent = conn->consumed_content = 0; conn->status_code = -1; conn->must_close = conn->request_len = conn->throttle = 0; + conn->is_chunked = 0; } static void close_socket_gracefully(struct mg_connection *conn) @@ -6116,7 +6366,8 @@ static void close_connection(struct mg_connection *conn) { #if defined(USE_LUA) && defined(USE_WEBSOCKET) if (conn->lua_websocket_state) { - lua_websocket_close(conn); + lua_websocket_close(conn, conn->lua_websocket_state); + conn->lua_websocket_state = NULL; } #endif @@ -6124,7 +6375,7 @@ static void close_connection(struct mg_connection *conn) if (conn->ctx->callbacks.connection_close != NULL) conn->ctx->callbacks.connection_close(conn); - mg_lock(conn); + mg_lock_connection(conn); conn->must_close = 1; @@ -6141,7 +6392,7 @@ static void close_connection(struct mg_connection *conn) conn->client.sock = INVALID_SOCKET; } - mg_unlock(conn); + mg_unlock_connection(conn); } void mg_close_connection(struct mg_connection *conn) @@ -6156,7 +6407,7 @@ void mg_close_connection(struct mg_connection *conn) mg_free(conn); } -struct mg_connection *mg_connect(const char *host, int port, int use_ssl, +static struct mg_connection *mg_connect(const char *host, int port, int use_ssl, char *ebuf, size_t ebuf_len) { static struct mg_context fake_ctx; @@ -6169,13 +6420,11 @@ struct mg_connection *mg_connect(const char *host, int port, int use_ssl, mg_calloc(1, sizeof(*conn) + MAX_REQUEST_SIZE)) == NULL) { snprintf(ebuf, ebuf_len, "calloc(): %s", strerror(ERRNO)); closesocket(sock); - sock = INVALID_SOCKET; #ifndef NO_SSL } else if (use_ssl && (conn->client_ssl_ctx = SSL_CTX_new(SSLv23_client_method())) == NULL) { snprintf(ebuf, ebuf_len, "SSL_CTX_new error"); closesocket(sock); - sock = INVALID_SOCKET; mg_free(conn); conn = NULL; #endif /* NO_SSL */ @@ -6213,11 +6462,12 @@ static int is_valid_uri(const char *uri) return uri[0] == '/' || (uri[0] == '*' && uri[1] == '\0'); } -static int getreq(struct mg_connection *conn, char *ebuf, size_t ebuf_len) +static int getreq(struct mg_connection *conn, char *ebuf, size_t ebuf_len, int *err) { const char *cl; ebuf[0] = '\0'; + *err = 0; reset_per_request_attributes(conn); conn->request_len = read_request(NULL, conn, conn->buf, conn->buf_size, &conn->data_len); @@ -6225,16 +6475,30 @@ static int getreq(struct mg_connection *conn, char *ebuf, size_t ebuf_len) if (conn->request_len == 0 && conn->data_len == conn->buf_size) { snprintf(ebuf, ebuf_len, "%s", "Request Too Large"); + *err = 400; + return 0; } else if (conn->request_len <= 0) { snprintf(ebuf, ebuf_len, "%s", "Client closed connection"); + return 0; } else if (parse_http_message(conn->buf, conn->buf_size, &conn->request_info) <= 0) { snprintf(ebuf, ebuf_len, "Bad request: [%.*s]", conn->data_len, conn->buf); + *err = 400; + return 0; } else { /* Message is a valid request or response */ - if ((cl = get_header(&conn->request_info, "Content-Length")) != NULL) { + if (( cl = get_header(&conn->request_info, "Transfer-encoding")) != NULL && strcmp(cl,"chunked") == 0) { + conn->is_chunked = 1; + conn->content_len = 0; + } else if ((cl = get_header(&conn->request_info, "Content-Length")) != NULL) { /* Request/response has content length set */ - conn->content_len = strtoll(cl, NULL, 10); + char *endptr; + conn->content_len = strtoll(cl, &endptr, 10); + if (endptr == cl) { + snprintf(ebuf, ebuf_len, "%s", "Bad Request"); + *err = 400; + return 0; + } } else if (!mg_strcasecmp(conn->request_info.request_method, "POST") || !mg_strcasecmp(conn->request_info.request_method, "PUT")) { /* POST or PUT request without content length set */ @@ -6248,7 +6512,7 @@ static int getreq(struct mg_connection *conn, char *ebuf, size_t ebuf_len) } conn->birth_time = time(NULL); } - return ebuf[0] == '\0'; + return 1; } struct mg_connection *mg_download(const char *host, int port, int use_ssl, @@ -6264,7 +6528,8 @@ struct mg_connection *mg_download(const char *host, int port, int use_ssl, } else if (mg_vprintf(conn, fmt, ap) <= 0) { snprintf(ebuf, ebuf_len, "%s", "Error sending request"); } else { - getreq(conn, ebuf, ebuf_len); + int err; + getreq(conn, ebuf, ebuf_len, &err); } if (ebuf[0] != '\0' && conn != NULL) { mg_close_connection(conn); @@ -6282,14 +6547,16 @@ static void process_new_connection(struct mg_connection *conn) char ebuf[100]; keep_alive_enabled = !strcmp(conn->ctx->config[ENABLE_KEEP_ALIVE], "yes"); - keep_alive = 0; /* Important: on new connection, reset the receiving buffer. Credit goes to crule42. */ conn->data_len = 0; do { - if (!getreq(conn, ebuf, sizeof(ebuf))) { - send_http_error(conn, 500, "Server Error", "%s", ebuf); + int err; + if (!getreq(conn, ebuf, sizeof(ebuf), &err)) { + if (err > 0) { + send_http_error(conn, err, "Bad Request", "%s", ebuf); + } conn->must_close = 1; } else if (!is_valid_uri(conn->request_info.uri)) { snprintf(ebuf, sizeof(ebuf), "Invalid URI: [%s]", ri->uri); @@ -6336,12 +6603,12 @@ static void process_new_connection(struct mg_connection *conn) /* Worker threads take accepted socket from the queue */ static int consume_socket(struct mg_context *ctx, struct socket *sp) { - (void) pthread_mutex_lock(&ctx->mutex); - DEBUG_TRACE(("going idle")); + (void) pthread_mutex_lock(&ctx->thread_mutex); + DEBUG_TRACE("going idle"); /* If the queue is empty, wait. We're idle at this point. */ while (ctx->sq_head == ctx->sq_tail && ctx->stop_flag == 0) { - pthread_cond_wait(&ctx->sq_full, &ctx->mutex); + pthread_cond_wait(&ctx->sq_full, &ctx->thread_mutex); } /* If we're stopping, sq_head may be equal to sq_tail. */ @@ -6349,7 +6616,7 @@ static int consume_socket(struct mg_context *ctx, struct socket *sp) /* Copy socket from the queue and increment tail */ *sp = ctx->queue[ctx->sq_tail % ARRAY_SIZE(ctx->queue)]; ctx->sq_tail++; - DEBUG_TRACE(("grabbed socket %d, going busy", sp->sock)); + DEBUG_TRACE("grabbed socket %d, going busy", sp->sock); /* Wrap pointers if needed */ while (ctx->sq_tail > (int) ARRAY_SIZE(ctx->queue)) { @@ -6359,7 +6626,7 @@ static int consume_socket(struct mg_context *ctx, struct socket *sp) } (void) pthread_cond_signal(&ctx->sq_empty); - (void) pthread_mutex_unlock(&ctx->mutex); + (void) pthread_mutex_unlock(&ctx->thread_mutex); return !ctx->stop_flag; } @@ -6417,19 +6684,19 @@ static void *worker_thread_run(void *thread_func_param) } /* Signal master that we're done with connection and exiting */ - (void) pthread_mutex_lock(&ctx->mutex); + (void) pthread_mutex_lock(&ctx->thread_mutex); ctx->num_threads--; - (void) pthread_cond_signal(&ctx->cond); + (void) pthread_cond_signal(&ctx->thread_cond); assert(ctx->num_threads >= 0); - (void) pthread_mutex_unlock(&ctx->mutex); + (void) pthread_mutex_unlock(&ctx->thread_mutex); - pthread_setspecific(sTlsKey, 0); + pthread_setspecific(sTlsKey, NULL); #if defined(_WIN32) && !defined(__SYMBIAN32__) CloseHandle(tls.pthread_cond_helper_mutex); #endif mg_free(conn); - DEBUG_TRACE(("exiting")); + DEBUG_TRACE("exiting"); return NULL; } @@ -6452,23 +6719,23 @@ static void *worker_thread(void *thread_func_param) /* Master thread adds accepted socket to a queue */ static void produce_socket(struct mg_context *ctx, const struct socket *sp) { - (void) pthread_mutex_lock(&ctx->mutex); + (void) pthread_mutex_lock(&ctx->thread_mutex); /* If the queue is full, wait */ while (ctx->stop_flag == 0 && ctx->sq_head - ctx->sq_tail >= (int) ARRAY_SIZE(ctx->queue)) { - (void) pthread_cond_wait(&ctx->sq_empty, &ctx->mutex); + (void) pthread_cond_wait(&ctx->sq_empty, &ctx->thread_mutex); } if (ctx->sq_head - ctx->sq_tail < (int) ARRAY_SIZE(ctx->queue)) { /* Copy socket to the queue and increment head */ ctx->queue[ctx->sq_head % ARRAY_SIZE(ctx->queue)] = *sp; ctx->sq_head++; - DEBUG_TRACE(("queued socket %d", sp->sock)); + DEBUG_TRACE("queued socket %d", sp->sock); } (void) pthread_cond_signal(&ctx->sq_full); - (void) pthread_mutex_unlock(&ctx->mutex); + (void) pthread_mutex_unlock(&ctx->thread_mutex); } static int set_sock_timeout(SOCKET sock, int milliseconds) @@ -6500,7 +6767,7 @@ static void accept_new_connection(const struct socket *listener, so.sock = INVALID_SOCKET; } else { /* Put so socket structure into the queue */ - DEBUG_TRACE(("Accepted socket %d", (int) so.sock)); + DEBUG_TRACE("Accepted socket %d", (int) so.sock); set_close_on_exec(so.sock, fc(ctx)); so.is_ssl = listener->is_ssl; so.ssl_redir = listener->ssl_redir; @@ -6581,7 +6848,7 @@ static void master_thread_run(void *thread_func_param) } } mg_free(pfd); - DEBUG_TRACE(("stopping workers")); + DEBUG_TRACE("stopping workers"); /* Stop signal received: somebody called mg_stop. Quit. */ close_all_listening_sockets(ctx); @@ -6590,11 +6857,11 @@ static void master_thread_run(void *thread_func_param) pthread_cond_broadcast(&ctx->sq_full); /* Wait until all threads finish */ - (void) pthread_mutex_lock(&ctx->mutex); + (void) pthread_mutex_lock(&ctx->thread_mutex); while (ctx->num_threads > 0) { - (void) pthread_cond_wait(&ctx->cond, &ctx->mutex); + (void) pthread_cond_wait(&ctx->thread_cond, &ctx->thread_mutex); } - (void) pthread_mutex_unlock(&ctx->mutex); + (void) pthread_mutex_unlock(&ctx->thread_mutex); /* Join all worker threads to avoid leaking threads. */ workerthreadcount = ctx->workerthreadcount; @@ -6605,12 +6872,12 @@ static void master_thread_run(void *thread_func_param) #if !defined(NO_SSL) uninitialize_ssl(ctx); #endif - DEBUG_TRACE(("exiting")); + DEBUG_TRACE("exiting"); #if defined(_WIN32) && !defined(__SYMBIAN32__) CloseHandle(tls.pthread_cond_helper_mutex); #endif - pthread_setspecific(sTlsKey, 0); + pthread_setspecific(sTlsKey, NULL); /* Signal mg_stop() that we're done. WARNING: This must be the very last thing this @@ -6619,7 +6886,6 @@ static void master_thread_run(void *thread_func_param) } /* Threads have different return types on Windows and Unix. */ - #ifdef _WIN32 static unsigned __stdcall master_thread(void *thread_func_param) { @@ -6642,12 +6908,19 @@ static void free_context(struct mg_context *ctx) if (ctx == NULL) return; - /* All threads exited, no sync is needed. Destroy mutex and condvars */ - (void) pthread_mutex_destroy(&ctx->mutex); - (void) pthread_cond_destroy(&ctx->cond); + /* All threads exited, no sync is needed. Destroy thread mutex and condvars */ + (void) pthread_mutex_destroy(&ctx->thread_mutex); + (void) pthread_cond_destroy(&ctx->thread_cond); (void) pthread_cond_destroy(&ctx->sq_empty); (void) pthread_cond_destroy(&ctx->sq_full); + /* Destroy other context global data structures mutex */ + (void) pthread_mutex_destroy(&ctx->nonce_mutex); + +#if defined(USE_TIMERS) + timers_exit(ctx); +#endif + /* Deallocate config parameters */ for (i = 0; i < NUM_OPTIONS; i++) { if (ctx->config[i] != NULL) @@ -6710,20 +6983,20 @@ void mg_stop(struct mg_context *ctx) #endif /* _WIN32 && !__SYMBIAN32__ */ } -void get_system_name(char **sysName) +static void get_system_name(char **sysName) { #if defined(_WIN32) #if !defined(__SYMBIAN32__) char name[128]; - DWORD dwVersion = 0; - DWORD dwMajorVersion = 0; - DWORD dwMinorVersion = 0; + DWORD dwVersion = 0; + DWORD dwMajorVersion = 0; + DWORD dwMinorVersion = 0; DWORD dwBuild = 0; - dwVersion = GetVersion(); - - dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion))); - dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion))); + dwVersion = GetVersion(); + + dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion))); + dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion))); dwBuild = ((dwVersion < 0x80000000) ? (DWORD)(HIWORD(dwVersion)) : 0); sprintf(name, "Windows %d.%d", dwMajorVersion, dwMinorVersion); @@ -6745,7 +7018,7 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks, { struct mg_context *ctx; const char *name, *value, *default_value; - int i; + int i, ok; int workerthreadcount; #if defined(_WIN32) && !defined(__SYMBIAN32__) @@ -6767,6 +7040,7 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks, if (sTlsInit==0) { if (0 != pthread_key_create(&sTlsKey, NULL)) { + /* Fatal error - abort start. However, this situation should never occur in practice. */ mg_cry(fc(ctx), "Cannot initialize thread local storage"); mg_free(ctx); return NULL; @@ -6774,11 +7048,23 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks, sTlsInit++; } + ok = 0==pthread_mutex_init(&ctx->thread_mutex, NULL); + ok &= 0==pthread_cond_init(&ctx->thread_cond, NULL); + ok &= 0==pthread_cond_init(&ctx->sq_empty, NULL); + ok &= 0==pthread_cond_init(&ctx->sq_full, NULL); + ok &= 0==pthread_mutex_init(&ctx->nonce_mutex, NULL); + if (!ok) { + /* Fatal error - abort start. However, this situation should never occur in practice. */ + mg_cry(fc(ctx), "Cannot initialize thread synchronization objects"); + mg_free(ctx); + return NULL; + } + if (callbacks) { ctx->callbacks = *callbacks; } ctx->user_data = user_data; - ctx->request_handlers = 0; + ctx->request_handlers = NULL; #if defined(USE_LUA) && defined(USE_WEBSOCKET) ctx->shared_lua_websockets = 0; @@ -6799,7 +7085,7 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks, mg_free(ctx->config[i]); } ctx->config[i] = mg_strdup(value); - DEBUG_TRACE(("[%s] -> [%s]", name, value)); + DEBUG_TRACE("[%s] -> [%s]", name, value); } /* Set default value if needed */ @@ -6833,11 +7119,6 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks, (void) signal(SIGPIPE, SIG_IGN); #endif /* !_WIN32 && !__SYMBIAN32__ */ - (void) pthread_mutex_init(&ctx->mutex, NULL); - (void) pthread_cond_init(&ctx->cond, NULL); - (void) pthread_cond_init(&ctx->sq_empty, NULL); - (void) pthread_cond_init(&ctx->sq_full, NULL); - workerthreadcount = atoi(ctx->config[NUM_THREADS]); if (workerthreadcount > MAX_WORKER_THREADS) { @@ -6848,7 +7129,7 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks, if (workerthreadcount > 0) { ctx->workerthreadcount = workerthreadcount; - ctx->workerthreadids = mg_calloc(workerthreadcount, sizeof(pthread_t)); + ctx->workerthreadids = (pthread_t *)mg_calloc(workerthreadcount, sizeof(pthread_t)); if (ctx->workerthreadids == NULL) { mg_cry(fc(ctx), "Not enough memory for worker thread ID array"); free_context(ctx); @@ -6856,19 +7137,27 @@ struct mg_context *mg_start(const struct mg_callbacks *callbacks, } } +#if defined(USE_TIMERS) + if (timers_init(ctx) != 0) { + mg_cry(fc(ctx), "Error creating timers"); + free_context(ctx); + return NULL; + } +#endif + /* Start master (listening) thread */ mg_start_thread_with_id(master_thread, ctx, &ctx->masterthreadid); /* Start worker threads */ for (i = 0; i < workerthreadcount; i++) { - (void) pthread_mutex_lock(&ctx->mutex); + (void) pthread_mutex_lock(&ctx->thread_mutex); ctx->num_threads++; - (void) pthread_mutex_unlock(&ctx->mutex); + (void) pthread_mutex_unlock(&ctx->thread_mutex); if (mg_start_thread_with_id(worker_thread, ctx, &ctx->workerthreadids[i]) != 0) { - (void) pthread_mutex_lock(&ctx->mutex); + (void) pthread_mutex_lock(&ctx->thread_mutex); ctx->num_threads--; - (void) pthread_mutex_unlock(&ctx->mutex); + (void) pthread_mutex_unlock(&ctx->thread_mutex); mg_cry(fc(ctx), "Cannot start worker thread: %ld", (long) ERRNO); } } diff --git a/ceph/src/client/Client.cc b/ceph/src/client/Client.cc index 47d1c1d4..6b19a7a3 100644 --- a/ceph/src/client/Client.cc +++ b/ceph/src/client/Client.cc @@ -3659,9 +3659,10 @@ void Client::handle_cap_flush_ack(MetaSession *session, Inode *in, Cap *cap, MCl int mds = session->mds_num; int dirty = m->get_dirty(); int cleaned = 0; + uint16_t flush_ack_tid = static_cast(m->get_client_tid()); for (int i = 0; i < CEPH_CAP_BITS; ++i) { if ((dirty & (1 << i)) && - (m->get_client_tid() == in->flushing_cap_tid[i])) + (flush_ack_tid == in->flushing_cap_tid[i])) cleaned |= 1 << i; } diff --git a/ceph/src/common/Thread.cc b/ceph/src/common/Thread.cc index 7be0013a..a962e06f 100644 --- a/ceph/src/common/Thread.cc +++ b/ceph/src/common/Thread.cc @@ -51,7 +51,8 @@ void *Thread::entry_wrapper() int p = ceph_gettid(); // may return -ENOSYS on other platforms if (p > 0) pid = p; - if (ioprio_class >= 0 && + if (pid && + ioprio_class >= 0 && ioprio_priority >= 0) { ceph_ioprio_set(IOPRIO_WHO_PROCESS, pid, diff --git a/ceph/src/common/Thread.h b/ceph/src/common/Thread.h index 95f63b46..8173ca5d 100644 --- a/ceph/src/common/Thread.h +++ b/ceph/src/common/Thread.h @@ -41,6 +41,7 @@ class Thread { public: const pthread_t &get_thread_id(); + pid_t get_pid() const { return pid; } bool is_started(); bool am_self(); int kill(int signal); diff --git a/ceph/src/common/TrackedOp.cc b/ceph/src/common/TrackedOp.cc index ddb2f91a..5a76f647 100644 --- a/ceph/src/common/TrackedOp.cc +++ b/ceph/src/common/TrackedOp.cc @@ -121,10 +121,10 @@ void OpTracker::unregister_inflight_op(TrackedOp *i) // caller checks; assert(tracking_enabled); + Mutex::Locker locker(ops_in_flight_lock); i->request->clear_data(); i->request->clear_payload(); - Mutex::Locker locker(ops_in_flight_lock); assert(i->xitem.get_list() == &ops_in_flight); utime_t now = ceph_clock_now(cct); i->xitem.remove_myself(); diff --git a/ceph/src/common/WorkQueue.cc b/ceph/src/common/WorkQueue.cc index 42f402fe..0f8bc9d4 100644 --- a/ceph/src/common/WorkQueue.cc +++ b/ceph/src/common/WorkQueue.cc @@ -271,6 +271,10 @@ void ThreadPool::set_ioprio(int cls, int priority) for (set::iterator p = _threads.begin(); p != _threads.end(); ++p) { + ldout(cct,10) << __func__ + << " class " << cls << " priority " << priority + << " pid " << (*p)->get_pid() + << dendl; int r = (*p)->set_ioprio(cls, priority); if (r < 0) lderr(cct) << " set_ioprio got " << cpp_strerror(r) << dendl; diff --git a/ceph/src/common/ceph_crypto.h b/ceph/src/common/ceph_crypto.h index c5535943..686efb48 100644 --- a/ceph/src/common/ceph_crypto.h +++ b/ceph/src/common/ceph_crypto.h @@ -78,9 +78,11 @@ namespace ceph { assert(s == SECSuccess); } void Update (const byte *input, size_t length) { - SECStatus s; - s = PK11_DigestOp(ctx, input, length); - assert(s == SECSuccess); + if (length) { + SECStatus s; + s = PK11_DigestOp(ctx, input, length); + assert(s == SECSuccess); + } } void Final (byte *digest) { SECStatus s; diff --git a/ceph/src/common/config.cc b/ceph/src/common/config.cc index 23bfe351..fc470832 100644 --- a/ceph/src/common/config.cc +++ b/ceph/src/common/config.cc @@ -947,7 +947,7 @@ int md_config_t::set_val_raw(const char *val, const config_option *opt) } static const char *CONF_METAVARIABLES[] = - { "cluster", "type", "name", "host", "num", "id", "pid" }; + { "cluster", "type", "name", "host", "num", "id", "pid", "cctid" }; static const int NUM_CONF_METAVARIABLES = (sizeof(CONF_METAVARIABLES) / sizeof(CONF_METAVARIABLES[0])); @@ -1059,6 +1059,8 @@ bool md_config_t::expand_meta(std::string &origval, out += name.get_id().c_str(); else if (var == "pid") out += stringify(getpid()); + else if (var == "cctid") + out += stringify((unsigned long long)this); else assert(0); // unreachable expanded = true; diff --git a/ceph/src/common/config_opts.h b/ceph/src/common/config_opts.h index fe00c76b..7791246a 100644 --- a/ceph/src/common/config_opts.h +++ b/ceph/src/common/config_opts.h @@ -92,6 +92,7 @@ SUBSYS(finisher, 1, 1) SUBSYS(heartbeatmap, 1, 5) SUBSYS(perfcounter, 1, 5) SUBSYS(rgw, 1, 5) // log level for the Rados gateway +SUBSYS(civetweb, 1, 10) SUBSYS(javaclient, 1, 5) SUBSYS(asok, 1, 5) SUBSYS(throttle, 1, 1) @@ -489,6 +490,9 @@ OPTION(osd_heartbeat_interval, OPT_INT, 6) // (seconds) how often we ping OPTION(osd_heartbeat_grace, OPT_INT, 20) // (seconds) how long before we decide a peer has failed OPTION(osd_heartbeat_min_peers, OPT_INT, 10) // minimum number of peers +// max number of parallel snap trims/pg +OPTION(osd_pg_max_concurrent_snap_trims, OPT_U64, 2) + // minimum number of peers tha tmust be reachable to mark ourselves // back up after being wrongly marked down. OPTION(osd_heartbeat_min_healthy_ratio, OPT_FLOAT, .33) @@ -766,6 +770,7 @@ OPTION(rgw_cache_lru_size, OPT_INT, 10000) // num of entries in rgw cache OPTION(rgw_socket_path, OPT_STR, "") // path to unix domain socket, if not specified, rgw will not run as external fcgi OPTION(rgw_host, OPT_STR, "") // host for radosgw, can be an IP, default is 0.0.0.0 OPTION(rgw_port, OPT_STR, "") // port to listen, format as "8080" "5000", if not specified, rgw will not run external fcgi +OPTION(rgw_fcgi_explicit_free, OPT_BOOL, true) // whether to call FCGX_Free explicitly on every complete request OPTION(rgw_dns_name, OPT_STR, "") OPTION(rgw_script_uri, OPT_STR, "") // alternative value for SCRIPT_URI if not set in request OPTION(rgw_request_uri, OPT_STR, "") // alternative value for REQUEST_URI if not set in request diff --git a/ceph/src/common/crc32c_intel_fast_asm.S b/ceph/src/common/crc32c_intel_fast_asm.S index 4ca5d650..2189684b 100644 --- a/ceph/src/common/crc32c_intel_fast_asm.S +++ b/ceph/src/common/crc32c_intel_fast_asm.S @@ -662,3 +662,5 @@ global %1_slver %endmacro ;;; func core, ver, snum slversion crc32_iscsi_00, 00, 02, 0014 +; inform linker that this doesn't require executable stack +section .note.GNU-stack noalloc noexec nowrite progbits diff --git a/ceph/src/common/crc32c_intel_fast_zero_asm.S b/ceph/src/common/crc32c_intel_fast_zero_asm.S index b7246f26..34b7f489 100644 --- a/ceph/src/common/crc32c_intel_fast_zero_asm.S +++ b/ceph/src/common/crc32c_intel_fast_zero_asm.S @@ -644,3 +644,5 @@ global %1_slver %endmacro ;;; func core, ver, snum slversion crc32_iscsi_zero_00, 00, 02, 0014 +; inform linker that this doesn't require executable stack +section .note.GNU-stack noalloc noexec nowrite progbits diff --git a/ceph/src/common/hobject.cc b/ceph/src/common/hobject.cc index ecc8cfde..28cb86a5 100644 --- a/ceph/src/common/hobject.cc +++ b/ceph/src/common/hobject.cc @@ -238,10 +238,10 @@ void ghobject_t::decode(bufferlist::iterator& bl) void ghobject_t::dump(Formatter *f) const { hobj.dump(f); - if (generation != NO_GEN) { + if (generation != NO_GEN) f->dump_int("generation", generation); + if (shard_id != ghobject_t::NO_SHARD) f->dump_int("shard_id", shard_id); - } } void ghobject_t::generate_test_instances(list& o) diff --git a/ceph/src/common/io_priority.cc b/ceph/src/common/io_priority.cc index b9eeae88..be4dc2a2 100644 --- a/ceph/src/common/io_priority.cc +++ b/ceph/src/common/io_priority.cc @@ -41,8 +41,8 @@ int ceph_ioprio_set(int whence, int who, int ioprio) int ceph_ioprio_string_to_class(const std::string& s) { - std::string l; - std::transform(s.begin(), s.end(), l.begin(), ::tolower); + std::string l = s; + std::transform(l.begin(), l.end(), l.begin(), ::tolower); if (l == "idle") return IOPRIO_CLASS_IDLE; diff --git a/ceph/src/common/util.cc b/ceph/src/common/util.cc index ab417bef..212384b5 100644 --- a/ceph/src/common/util.cc +++ b/ceph/src/common/util.cc @@ -18,6 +18,10 @@ #include "common/errno.h" #include "common/strtol.h" +#ifdef HAVE_SYS_VFS_H +#include +#endif + // test if an entire buf is zero in 8-byte chunks bool buf_is_zero(const char *buf, size_t len) { @@ -104,3 +108,21 @@ int64_t unit_to_bytesize(string val, ostream *pss) } return (r * (1LL << modifier)); } + +int get_fs_stats(ceph_data_stats_t &stats, const char *path) +{ + if (!path) + return -EINVAL; + + struct statfs stbuf; + int err = ::statfs(path, &stbuf); + if (err < 0) { + return -errno; + } + + stats.byte_total = stbuf.f_blocks * stbuf.f_bsize; + stats.byte_used = (stbuf.f_blocks - stbuf.f_bfree) * stbuf.f_bsize; + stats.byte_avail = stbuf.f_bavail * stbuf.f_bsize; + stats.avail_percent = (((float)stats.byte_avail/stats.byte_total)*100); + return 0; +} diff --git a/ceph/src/crush/CrushWrapper.cc b/ceph/src/crush/CrushWrapper.cc index 31da4f52..895c9ffa 100644 --- a/ceph/src/crush/CrushWrapper.cc +++ b/ceph/src/crush/CrushWrapper.cc @@ -171,8 +171,8 @@ bool CrushWrapper::_search_item_exists(int item) const if (!crush->buckets[i]) continue; crush_bucket *b = crush->buckets[i]; - for (unsigned i=0; isize; ++i) { - if (b->items[i] == item) + for (unsigned j=0; jsize; ++j) { + if (b->items[j] == item) return true; } } @@ -585,7 +585,7 @@ int CrushWrapper::create_or_move_item(CephContext *cct, int item, float weight, if (check_item_loc(cct, item, loc, &old_iweight)) { ldout(cct, 5) << "create_or_move_item " << item << " already at " << loc << dendl; } else { - if (item_exists(item)) { + if (_search_item_exists(item)) { weight = get_item_weightf(item); ldout(cct, 10) << "create_or_move_item " << item << " exists with weight " << weight << dendl; remove_item(cct, item, true); @@ -778,20 +778,18 @@ int CrushWrapper::add_simple_ruleset(string name, string root_name, return -EINVAL; } - int ruleset = 0; - for (int i = 0; i < get_max_rules(); i++) { - if (rule_exists(i) && - get_rule_mask_ruleset(i) >= ruleset) { - ruleset = get_rule_mask_ruleset(i) + 1; - } + int rno = -1; + for (rno = 0; rno < get_max_rules(); rno++) { + if (!rule_exists(rno) && !ruleset_exists(rno)) + break; } - int steps = 3; if (mode == "indep") steps = 4; int min_rep = mode == "firstn" ? 1 : 3; int max_rep = mode == "firstn" ? 10 : 20; - crush_rule *rule = crush_make_rule(steps, ruleset, rule_type, min_rep, max_rep); + //set the ruleset the same as rule_id(rno) + crush_rule *rule = crush_make_rule(steps, rno, rule_type, min_rep, max_rep); assert(rule); int step = 0; if (mode == "indep") @@ -810,7 +808,12 @@ int CrushWrapper::add_simple_ruleset(string name, string root_name, CRUSH_CHOOSE_N, 0); crush_rule_set_step(rule, step++, CRUSH_RULE_EMIT, 0, 0); - int rno = crush_add_rule(crush, rule, -1); + + int ret = crush_add_rule(crush, rule, rno); + if(ret < 0) { + *err << "failed to add rule " << rno << " because " << cpp_strerror(ret); + return ret; + } set_rule_name(rno, name); have_rmaps = false; return rno; diff --git a/ceph/src/crush/CrushWrapper.h b/ceph/src/crush/CrushWrapper.h index d5d4f4f8..1024f83e 100644 --- a/ceph/src/crush/CrushWrapper.h +++ b/ceph/src/crush/CrushWrapper.h @@ -880,9 +880,9 @@ public: bool ruleset_exists(int ruleset) const { for (size_t i = 0; i < crush->max_rules; ++i) { - if (crush->rules[i]->mask.ruleset == ruleset) { - return true; - } + if (rule_exists(i) && crush->rules[i]->mask.ruleset == ruleset) { + return true; + } } return false; diff --git a/ceph/src/crush/builder.c b/ceph/src/crush/builder.c index eff0bf63..f6c2dad0 100644 --- a/ceph/src/crush/builder.c +++ b/ceph/src/crush/builder.c @@ -63,7 +63,7 @@ int crush_add_rule(struct crush_map *map, struct crush_rule *rule, int ruleno) for (r=0; r < map->max_rules; r++) if (map->rules[r] == 0) break; - assert(r <= INT_MAX); + assert(r < CRUSH_MAX_RULES); } else r = ruleno; @@ -72,6 +72,8 @@ int crush_add_rule(struct crush_map *map, struct crush_rule *rule, int ruleno) /* expand array */ int oldsize; void *_realloc = NULL; + if (map->max_rules +1 > CRUSH_MAX_RULES) + return -ENOSPC; oldsize = map->max_rules; map->max_rules = r+1; if ((_realloc = realloc(map->rules, map->max_rules * sizeof(map->rules[0]))) == NULL) { @@ -744,7 +746,10 @@ int crush_remove_uniform_bucket_item(struct crush_bucket_uniform *bucket, int it for (j = i; j < bucket->h.size; j++) bucket->h.items[j] = bucket->h.items[j+1]; newsize = --bucket->h.size; - bucket->h.weight -= bucket->item_weight; + if (bucket->item_weight < bucket->h.weight) + bucket->h.weight -= bucket->item_weight; + else + bucket->h.weight = 0; if ((_realloc = realloc(bucket->h.items, sizeof(__s32)*newsize)) == NULL) { return -ENOMEM; @@ -777,7 +782,10 @@ int crush_remove_list_bucket_item(struct crush_bucket_list *bucket, int item) bucket->item_weights[j] = bucket->item_weights[j+1]; bucket->sum_weights[j] = bucket->sum_weights[j+1] - weight; } - bucket->h.weight -= weight; + if (weight < bucket->h.weight) + bucket->h.weight -= weight; + else + bucket->h.weight = 0; newsize = --bucket->h.size; void *_realloc = NULL; @@ -828,7 +836,10 @@ int crush_remove_tree_bucket_item(struct crush_bucket_tree *bucket, int item) bucket->node_weights[node] -= weight; printf(" node %d weight %d\n", node, bucket->node_weights[node]); } - bucket->h.weight -= weight; + if (weight < bucket->h.weight) + bucket->h.weight -= weight; + else + bucket->h.weight = 0; break; } if (i == bucket->h.size) @@ -883,7 +894,10 @@ int crush_remove_straw_bucket_item(struct crush_bucket_straw *bucket, int item) for (i = 0; i < bucket->h.size; i++) { if (bucket->h.items[i] == item) { bucket->h.size--; - bucket->h.weight -= bucket->item_weights[i]; + if (bucket->item_weights[i] < bucket->h.weight) + bucket->h.weight -= bucket->item_weights[i]; + else + bucket->h.weight = 0; for (j = i; j < bucket->h.size; j++) { bucket->h.items[j] = bucket->h.items[j+1]; bucket->item_weights[j] = bucket->item_weights[j+1]; diff --git a/ceph/src/crush/crush.h b/ceph/src/crush/crush.h index 8bac92aa..322d16c3 100644 --- a/ceph/src/crush/crush.h +++ b/ceph/src/crush/crush.h @@ -26,6 +26,8 @@ #define CRUSH_MAGIC 0x00010000ul /* for detecting algorithm revisions */ #define CRUSH_MAX_DEPTH 10 /* max crush hierarchy depth */ +#define CRUSH_MAX_RULESET (1<<8) /*max crush ruleset number*/ +#define CRUSH_MAX_RULES CRUSH_MAX_RULESET /*max crush rules, shold be the same as max rulesets*/ #define CRUSH_MAX_DEVICE_WEIGHT (100u * 0x10000u) #define CRUSH_MAX_BUCKET_WEIGHT (65535u * 0x10000u) diff --git a/ceph/src/crush/mapper.c b/ceph/src/crush/mapper.c index 22cde518..327668fd 100644 --- a/ceph/src/crush/mapper.c +++ b/ceph/src/crush/mapper.c @@ -291,6 +291,7 @@ static int is_out(const struct crush_map *map, * @type: the type of item to choose * @out: pointer to output vector * @outpos: our position in that vector + * @out_size: size of the out vector * @tries: number of attempts to make * @recurse_tries: number of attempts to have recursive chooseleaf make * @local_retries: localized retries @@ -305,6 +306,7 @@ static int crush_choose_firstn(const struct crush_map *map, const __u32 *weight, int weight_max, int x, int numrep, int type, int *out, int outpos, + int out_size, unsigned int tries, unsigned int recurse_tries, unsigned int local_retries, @@ -323,6 +325,7 @@ static int crush_choose_firstn(const struct crush_map *map, int item = 0; int itemtype; int collide, reject; + int count = out_size; dprintk("CHOOSE%s bucket %d x %d outpos %d numrep %d tries %d recurse_tries %d local_retries %d local_fallback_retries %d parent_r %d\n", recurse_to_leaf ? "_LEAF" : "", @@ -330,7 +333,7 @@ static int crush_choose_firstn(const struct crush_map *map, tries, recurse_tries, local_retries, local_fallback_retries, parent_r); - for (rep = outpos; rep < numrep; rep++) { + for (rep = outpos; rep < numrep && count > 0 ; rep++) { /* keep trying until we get a non-out, non-colliding item */ ftotal = 0; skip_rep = 0; @@ -404,7 +407,7 @@ static int crush_choose_firstn(const struct crush_map *map, map->buckets[-1-item], weight, weight_max, x, outpos+1, 0, - out2, outpos, + out2, outpos, count, recurse_tries, 0, local_retries, local_fallback_retries, @@ -464,6 +467,7 @@ reject: dprintk("CHOOSE got %d\n", item); out[outpos] = item; outpos++; + count--; if (map->choose_tries && ftotal <= map->choose_total_tries) map->choose_tries[ftotal]++; @@ -686,6 +690,7 @@ int crush_do_rule(const struct crush_map *map, __u32 step; int i, j; int numrep; + int out_size; /* * the original choose_total_tries value was off by one (it * counted "retries" and not "tries"). add one. @@ -793,6 +798,7 @@ int crush_do_rule(const struct crush_map *map, x, numrep, curstep->arg2, o+osize, j, + result_max-osize, choose_tries, recurse_tries, choose_local_retries, @@ -802,11 +808,13 @@ int crush_do_rule(const struct crush_map *map, c+osize, 0); } else { + out_size = ((numrep < (result_max-osize)) ? + numrep : (result_max-osize)); crush_choose_indep( map, map->buckets[-1-w[i]], weight, weight_max, - x, numrep, numrep, + x, out_size, numrep, curstep->arg2, o+osize, j, choose_tries, @@ -815,7 +823,7 @@ int crush_do_rule(const struct crush_map *map, recurse_to_leaf, c+osize, 0); - osize += numrep; + osize += out_size; } } diff --git a/ceph/src/gtest/Makefile.in b/ceph/src/gtest/Makefile.in index b561abf1..daec368f 100644 --- a/ceph/src/gtest/Makefile.in +++ b/ceph/src/gtest/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -22,6 +21,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -47,13 +91,21 @@ check_PROGRAMS = samples/sample1_unittest$(EXEEXT) \ samples/sample10_unittest$(EXEEXT) \ test/gtest_all_test$(EXEEXT) test/fused_gtest_test$(EXEEXT) subdir = . -DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \ - $(pkginclude_internal_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build-aux/config.h.in \ - $(top_srcdir)/configure $(top_srcdir)/scripts/gtest-config.in \ - COPYING build-aux/config.guess build-aux/config.sub \ - build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ - build-aux/missing +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(top_srcdir)/build-aux/config.h.in \ + $(top_srcdir)/scripts/gtest-config.in \ + $(top_srcdir)/build-aux/depcomp $(pkginclude_HEADERS) \ + $(pkginclude_internal_HEADERS) \ + $(top_srcdir)/build-aux/test-driver COPYING README \ + build-aux/compile build-aux/config.guess build-aux/config.sub \ + build-aux/depcomp build-aux/install-sh build-aux/missing \ + build-aux/ltmain.sh $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -99,6 +151,10 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(pkginclude_internaldir)" LIBRARIES = $(lib_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = lib_libgtest_a_AR = $(AR) $(ARFLAGS) lib_libgtest_a_LIBADD = am__dirstamp = $(am__leading_dot)dirstamp @@ -113,6 +169,10 @@ samples_libsamples_la_LIBADD = am_samples_libsamples_la_OBJECTS = samples/sample1.lo \ samples/sample2.lo samples/sample4.lo samples_libsamples_la_OBJECTS = $(am_samples_libsamples_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = am_samples_sample10_unittest_OBJECTS = \ samples/sample10_unittest.$(OBJEXT) samples_sample10_unittest_OBJECTS = \ @@ -136,28 +196,58 @@ am_test_gtest_all_test_OBJECTS = test/gtest_all_test.$(OBJEXT) test_gtest_all_test_OBJECTS = $(am_test_gtest_all_test_OBJECTS) test_gtest_all_test_DEPENDENCIES = lib/libgtest_main.la SCRIPTS = $(bin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/build-aux depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(lib_libgtest_a_SOURCES) $(lib_libgtest_main_a_SOURCES) \ $(samples_libsamples_la_SOURCES) \ $(samples_sample10_unittest_SOURCES) \ @@ -171,12 +261,210 @@ DIST_SOURCES = $(lib_libgtest_a_SOURCES) \ $(samples_sample1_unittest_SOURCES) \ $(test_fused_gtest_test_SOURCES) \ $(test_gtest_all_test_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(m4data_DATA) HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +CSCOPE = cscope +AM_RECURSIVE_TARGETS = cscope check recheck +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -186,14 +474,17 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip GZIP_ENV = --best +DIST_TARGETS = dist-bzip2 dist-gzip dist-zip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -509,7 +800,7 @@ test_fused_gtest_test_CPPFLAGS = -I"$(srcdir)/fused-src" all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj +.SUFFIXES: .cc .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @@ -546,8 +837,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): build-aux/config.h: build-aux/stamp-h1 - @if test ! -f $@; then rm -f build-aux/stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) build-aux/stamp-h1; else :; fi + @test -f $@ || rm -f build-aux/stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) build-aux/stamp-h1 build-aux/stamp-h1: $(top_srcdir)/build-aux/config.h.in $(top_builddir)/config.status @rm -f build-aux/stamp-h1 @@ -563,7 +854,6 @@ scripts/gtest-config: $(top_builddir)/config.status $(top_srcdir)/scripts/gtest- cd $(top_builddir) && $(SHELL) ./config.status $@ install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -571,6 +861,8 @@ install-libLIBRARIES: $(lib_LIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; } @$(POST_INSTALL) @@ -602,25 +894,29 @@ src/gtest-all.$(OBJEXT): src/$(am__dirstamp) \ lib/$(am__dirstamp): @$(MKDIR_P) lib @: > lib/$(am__dirstamp) + lib/libgtest.a: $(lib_libgtest_a_OBJECTS) $(lib_libgtest_a_DEPENDENCIES) $(EXTRA_lib_libgtest_a_DEPENDENCIES) lib/$(am__dirstamp) - -rm -f lib/libgtest.a - $(lib_libgtest_a_AR) lib/libgtest.a $(lib_libgtest_a_OBJECTS) $(lib_libgtest_a_LIBADD) - $(RANLIB) lib/libgtest.a + $(AM_V_at)-rm -f lib/libgtest.a + $(AM_V_AR)$(lib_libgtest_a_AR) lib/libgtest.a $(lib_libgtest_a_OBJECTS) $(lib_libgtest_a_LIBADD) + $(AM_V_at)$(RANLIB) lib/libgtest.a src/gtest_main.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) + lib/libgtest_main.a: $(lib_libgtest_main_a_OBJECTS) $(lib_libgtest_main_a_DEPENDENCIES) $(EXTRA_lib_libgtest_main_a_DEPENDENCIES) lib/$(am__dirstamp) - -rm -f lib/libgtest_main.a - $(lib_libgtest_main_a_AR) lib/libgtest_main.a $(lib_libgtest_main_a_OBJECTS) $(lib_libgtest_main_a_LIBADD) - $(RANLIB) lib/libgtest_main.a + $(AM_V_at)-rm -f lib/libgtest_main.a + $(AM_V_AR)$(lib_libgtest_main_a_AR) lib/libgtest_main.a $(lib_libgtest_main_a_OBJECTS) $(lib_libgtest_main_a_LIBADD) + $(AM_V_at)$(RANLIB) lib/libgtest_main.a clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } samples/$(am__dirstamp): @$(MKDIR_P) samples @: > samples/$(am__dirstamp) @@ -633,8 +929,9 @@ samples/sample2.lo: samples/$(am__dirstamp) \ samples/$(DEPDIR)/$(am__dirstamp) samples/sample4.lo: samples/$(am__dirstamp) \ samples/$(DEPDIR)/$(am__dirstamp) + samples/libsamples.la: $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_DEPENDENCIES) $(EXTRA_samples_libsamples_la_DEPENDENCIES) samples/$(am__dirstamp) - $(CXXLINK) $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ @@ -646,14 +943,16 @@ clean-checkPROGRAMS: rm -f $$list samples/sample10_unittest.$(OBJEXT): samples/$(am__dirstamp) \ samples/$(DEPDIR)/$(am__dirstamp) + samples/sample10_unittest$(EXEEXT): $(samples_sample10_unittest_OBJECTS) $(samples_sample10_unittest_DEPENDENCIES) $(EXTRA_samples_sample10_unittest_DEPENDENCIES) samples/$(am__dirstamp) @rm -f samples/sample10_unittest$(EXEEXT) - $(CXXLINK) $(samples_sample10_unittest_OBJECTS) $(samples_sample10_unittest_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(samples_sample10_unittest_OBJECTS) $(samples_sample10_unittest_LDADD) $(LIBS) samples/sample1_unittest.$(OBJEXT): samples/$(am__dirstamp) \ samples/$(DEPDIR)/$(am__dirstamp) + samples/sample1_unittest$(EXEEXT): $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_DEPENDENCIES) $(EXTRA_samples_sample1_unittest_DEPENDENCIES) samples/$(am__dirstamp) @rm -f samples/sample1_unittest$(EXEEXT) - $(CXXLINK) $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(samples_sample1_unittest_OBJECTS) $(samples_sample1_unittest_LDADD) $(LIBS) fused-src/gtest/$(am__dirstamp): @$(MKDIR_P) fused-src/gtest @: > fused-src/gtest/$(am__dirstamp) @@ -673,21 +972,26 @@ samples/test_fused_gtest_test-sample1_unittest.$(OBJEXT): \ test/$(am__dirstamp): @$(MKDIR_P) test @: > test/$(am__dirstamp) + test/fused_gtest_test$(EXEEXT): $(test_fused_gtest_test_OBJECTS) $(test_fused_gtest_test_DEPENDENCIES) $(EXTRA_test_fused_gtest_test_DEPENDENCIES) test/$(am__dirstamp) @rm -f test/fused_gtest_test$(EXEEXT) - $(CXXLINK) $(test_fused_gtest_test_OBJECTS) $(test_fused_gtest_test_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(test_fused_gtest_test_OBJECTS) $(test_fused_gtest_test_LDADD) $(LIBS) test/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) test/$(DEPDIR) @: > test/$(DEPDIR)/$(am__dirstamp) test/gtest_all_test.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(am__dirstamp) + test/gtest_all_test$(EXEEXT): $(test_gtest_all_test_OBJECTS) $(test_gtest_all_test_DEPENDENCIES) $(EXTRA_test_gtest_all_test_DEPENDENCIES) test/$(am__dirstamp) @rm -f test/gtest_all_test$(EXEEXT) - $(CXXLINK) $(test_gtest_all_test_OBJECTS) $(test_gtest_all_test_LDADD) $(LIBS) + $(AM_V_CXXLD)$(CXXLINK) $(test_gtest_all_test_OBJECTS) $(test_gtest_all_test_LDADD) $(LIBS) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -719,21 +1023,11 @@ uninstall-binSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f fused-src/gtest/test_fused_gtest_test-gtest-all.$(OBJEXT) - -rm -f fused-src/gtest/test_fused_gtest_test-gtest_main.$(OBJEXT) - -rm -f samples/sample1.$(OBJEXT) - -rm -f samples/sample1.lo - -rm -f samples/sample10_unittest.$(OBJEXT) - -rm -f samples/sample1_unittest.$(OBJEXT) - -rm -f samples/sample2.$(OBJEXT) - -rm -f samples/sample2.lo - -rm -f samples/sample4.$(OBJEXT) - -rm -f samples/sample4.lo - -rm -f samples/test_fused_gtest_test-sample1.$(OBJEXT) - -rm -f samples/test_fused_gtest_test-sample1_unittest.$(OBJEXT) - -rm -f src/gtest-all.$(OBJEXT) - -rm -f src/gtest_main.$(OBJEXT) - -rm -f test/gtest_all_test.$(OBJEXT) + -rm -f fused-src/gtest/*.$(OBJEXT) + -rm -f samples/*.$(OBJEXT) + -rm -f samples/*.lo + -rm -f src/*.$(OBJEXT) + -rm -f test/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -752,84 +1046,84 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/gtest_all_test.Po@am__quote@ .cc.o: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< fused-src/gtest/test_fused_gtest_test-gtest-all.o: fused-src/gtest/gtest-all.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest-all.o -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.o `test -f 'fused-src/gtest/gtest-all.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest-all.cc -@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest-all.cc' object='fused-src/gtest/test_fused_gtest_test-gtest-all.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest-all.o -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.o `test -f 'fused-src/gtest/gtest-all.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest-all.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fused-src/gtest/gtest-all.cc' object='fused-src/gtest/test_fused_gtest_test-gtest-all.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.o `test -f 'fused-src/gtest/gtest-all.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest-all.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.o `test -f 'fused-src/gtest/gtest-all.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest-all.cc fused-src/gtest/test_fused_gtest_test-gtest-all.obj: fused-src/gtest/gtest-all.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest-all.obj -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.obj `if test -f 'fused-src/gtest/gtest-all.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest-all.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest-all.cc' object='fused-src/gtest/test_fused_gtest_test-gtest-all.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest-all.obj -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.obj `if test -f 'fused-src/gtest/gtest-all.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest-all.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest-all.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fused-src/gtest/gtest-all.cc' object='fused-src/gtest/test_fused_gtest_test-gtest-all.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.obj `if test -f 'fused-src/gtest/gtest-all.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest-all.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest-all.obj `if test -f 'fused-src/gtest/gtest-all.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest-all.cc'; fi` fused-src/gtest/test_fused_gtest_test-gtest_main.o: fused-src/gtest/gtest_main.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest_main.o -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.o `test -f 'fused-src/gtest/gtest_main.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest_main.cc -@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest_main.cc' object='fused-src/gtest/test_fused_gtest_test-gtest_main.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest_main.o -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.o `test -f 'fused-src/gtest/gtest_main.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest_main.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fused-src/gtest/gtest_main.cc' object='fused-src/gtest/test_fused_gtest_test-gtest_main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.o `test -f 'fused-src/gtest/gtest_main.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest_main.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.o `test -f 'fused-src/gtest/gtest_main.cc' || echo '$(srcdir)/'`fused-src/gtest/gtest_main.cc fused-src/gtest/test_fused_gtest_test-gtest_main.obj: fused-src/gtest/gtest_main.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest_main.obj -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.obj `if test -f 'fused-src/gtest/gtest_main.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest_main.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fused-src/gtest/gtest_main.cc' object='fused-src/gtest/test_fused_gtest_test-gtest_main.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fused-src/gtest/test_fused_gtest_test-gtest_main.obj -MD -MP -MF fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.obj `if test -f 'fused-src/gtest/gtest_main.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest_main.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Tpo fused-src/gtest/$(DEPDIR)/test_fused_gtest_test-gtest_main.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fused-src/gtest/gtest_main.cc' object='fused-src/gtest/test_fused_gtest_test-gtest_main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.obj `if test -f 'fused-src/gtest/gtest_main.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest_main.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fused-src/gtest/test_fused_gtest_test-gtest_main.obj `if test -f 'fused-src/gtest/gtest_main.cc'; then $(CYGPATH_W) 'fused-src/gtest/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/fused-src/gtest/gtest_main.cc'; fi` samples/test_fused_gtest_test-sample1.o: samples/sample1.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1.o -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo -c -o samples/test_fused_gtest_test-sample1.o `test -f 'samples/sample1.cc' || echo '$(srcdir)/'`samples/sample1.cc -@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1.cc' object='samples/test_fused_gtest_test-sample1.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1.o -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo -c -o samples/test_fused_gtest_test-sample1.o `test -f 'samples/sample1.cc' || echo '$(srcdir)/'`samples/sample1.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='samples/sample1.cc' object='samples/test_fused_gtest_test-sample1.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1.o `test -f 'samples/sample1.cc' || echo '$(srcdir)/'`samples/sample1.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1.o `test -f 'samples/sample1.cc' || echo '$(srcdir)/'`samples/sample1.cc samples/test_fused_gtest_test-sample1.obj: samples/sample1.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1.obj -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo -c -o samples/test_fused_gtest_test-sample1.obj `if test -f 'samples/sample1.cc'; then $(CYGPATH_W) 'samples/sample1.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1.cc' object='samples/test_fused_gtest_test-sample1.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1.obj -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo -c -o samples/test_fused_gtest_test-sample1.obj `if test -f 'samples/sample1.cc'; then $(CYGPATH_W) 'samples/sample1.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='samples/sample1.cc' object='samples/test_fused_gtest_test-sample1.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1.obj `if test -f 'samples/sample1.cc'; then $(CYGPATH_W) 'samples/sample1.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1.obj `if test -f 'samples/sample1.cc'; then $(CYGPATH_W) 'samples/sample1.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1.cc'; fi` samples/test_fused_gtest_test-sample1_unittest.o: samples/sample1_unittest.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1_unittest.o -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo -c -o samples/test_fused_gtest_test-sample1_unittest.o `test -f 'samples/sample1_unittest.cc' || echo '$(srcdir)/'`samples/sample1_unittest.cc -@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1_unittest.cc' object='samples/test_fused_gtest_test-sample1_unittest.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1_unittest.o -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo -c -o samples/test_fused_gtest_test-sample1_unittest.o `test -f 'samples/sample1_unittest.cc' || echo '$(srcdir)/'`samples/sample1_unittest.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='samples/sample1_unittest.cc' object='samples/test_fused_gtest_test-sample1_unittest.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1_unittest.o `test -f 'samples/sample1_unittest.cc' || echo '$(srcdir)/'`samples/sample1_unittest.cc +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1_unittest.o `test -f 'samples/sample1_unittest.cc' || echo '$(srcdir)/'`samples/sample1_unittest.cc samples/test_fused_gtest_test-sample1_unittest.obj: samples/sample1_unittest.cc -@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1_unittest.obj -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo -c -o samples/test_fused_gtest_test-sample1_unittest.obj `if test -f 'samples/sample1_unittest.cc'; then $(CYGPATH_W) 'samples/sample1_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1_unittest.cc'; fi` -@am__fastdepCXX_TRUE@ $(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='samples/sample1_unittest.cc' object='samples/test_fused_gtest_test-sample1_unittest.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT samples/test_fused_gtest_test-sample1_unittest.obj -MD -MP -MF samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo -c -o samples/test_fused_gtest_test-sample1_unittest.obj `if test -f 'samples/sample1_unittest.cc'; then $(CYGPATH_W) 'samples/sample1_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1_unittest.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Tpo samples/$(DEPDIR)/test_fused_gtest_test-sample1_unittest.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='samples/sample1_unittest.cc' object='samples/test_fused_gtest_test-sample1_unittest.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1_unittest.obj `if test -f 'samples/sample1_unittest.cc'; then $(CYGPATH_W) 'samples/sample1_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1_unittest.cc'; fi` +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_fused_gtest_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o samples/test_fused_gtest_test-sample1_unittest.obj `if test -f 'samples/sample1_unittest.cc'; then $(CYGPATH_W) 'samples/sample1_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/samples/sample1_unittest.cc'; fi` mostlyclean-libtool: -rm -f *.lo @@ -843,8 +1137,11 @@ distclean-libtool: -rm -f libtool config.lt install-m4dataDATA: $(m4data_DATA) @$(NORMAL_INSTALL) - test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(m4datadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(m4datadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -861,8 +1158,11 @@ uninstall-m4dataDATA: dir='$(DESTDIR)$(m4datadir)'; $(am__uninstall_files_from_dir) install-pkgincludeHEADERS: $(pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -879,8 +1179,11 @@ uninstall-pkgincludeHEADERS: dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) install-pkginclude_internalHEADERS: $(pkginclude_internal_HEADERS) @$(NORMAL_INSTALL) - test -z "$(pkginclude_internaldir)" || $(MKDIR_P) "$(DESTDIR)$(pkginclude_internaldir)" @list='$(pkginclude_internal_HEADERS)'; test -n "$(pkginclude_internaldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkginclude_internaldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkginclude_internaldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -896,26 +1199,15 @@ uninstall-pkginclude_internalHEADERS: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkginclude_internaldir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -927,15 +1219,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -944,102 +1232,215 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +samples/sample1_unittest.log: samples/sample1_unittest$(EXEEXT) + @p='samples/sample1_unittest$(EXEEXT)'; \ + b='samples/sample1_unittest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +samples/sample10_unittest.log: samples/sample10_unittest$(EXEEXT) + @p='samples/sample10_unittest$(EXEEXT)'; \ + b='samples/sample10_unittest'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/gtest_all_test.log: test/gtest_all_test$(EXEEXT) + @p='test/gtest_all_test$(EXEEXT)'; \ + b='test/gtest_all_test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test/fused_gtest_test.log: test/fused_gtest_test$(EXEEXT) + @p='test/fused_gtest_test$(EXEEXT)'; \ + b='test/fused_gtest_test'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) $(am__remove_distdir) @@ -1082,41 +1483,40 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -1127,8 +1527,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -1140,18 +1538,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1174,7 +1573,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1234,6 +1633,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1334,27 +1736,27 @@ uninstall-am: uninstall-binSCRIPTS uninstall-libLIBRARIES \ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ - clean clean-checkPROGRAMS clean-generic clean-libLIBRARIES \ - clean-libtool clean-noinstLTLIBRARIES ctags dist dist-all \ - dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binSCRIPTS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLIBRARIES install-m4dataDATA install-man \ - install-pdf install-pdf-am install-pkgincludeHEADERS \ - install-pkginclude_internalHEADERS install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binSCRIPTS \ - uninstall-libLIBRARIES uninstall-m4dataDATA \ - uninstall-pkgincludeHEADERS \ +.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-TESTS \ + check-am clean clean-checkPROGRAMS clean-cscope clean-generic \ + clean-libLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binSCRIPTS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLIBRARIES install-m4dataDATA \ + install-man install-pdf install-pdf-am \ + install-pkgincludeHEADERS install-pkginclude_internalHEADERS \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am uninstall-binSCRIPTS uninstall-libLIBRARIES \ + uninstall-m4dataDATA uninstall-pkgincludeHEADERS \ uninstall-pkginclude_internalHEADERS diff --git a/ceph/src/gtest/aclocal.m4 b/ceph/src/gtest/aclocal.m4 index e7df9fe0..8f34cf45 100644 --- a/ceph/src/gtest/aclocal.m4 +++ b/ceph/src/gtest/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,33 +11,31 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -116,22 +111,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -150,16 +142,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -169,7 +159,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -182,12 +172,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -195,8 +186,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -236,16 +227,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -254,8 +245,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -263,7 +254,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -311,7 +302,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -321,9 +312,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -338,20 +333,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -364,7 +357,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -376,21 +369,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -408,7 +399,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -418,18 +409,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -442,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -471,31 +465,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,34 +509,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -555,15 +602,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -577,16 +621,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -602,14 +644,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -627,7 +667,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -654,15 +694,12 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -670,11 +707,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -687,54 +723,22 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -744,7 +748,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -758,14 +762,59 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- @@ -794,7 +843,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -810,10 +859,11 @@ AC_DEFUN([AM_PATH_PYTHON], dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies @@ -862,6 +912,25 @@ AC_DEFUN([AM_PATH_PYTHON], [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" dnl Set up 4 directories: @@ -878,7 +947,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -913,7 +989,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -961,14 +1044,12 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -982,22 +1063,16 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1008,32 +1083,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1043,46 +1126,118 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1096,18 +1251,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1117,76 +1270,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/ceph/src/gtest/build-aux/compile b/ceph/src/gtest/build-aux/compile new file mode 100755 index 00000000..531136b0 --- /dev/null +++ b/ceph/src/gtest/build-aux/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/ceph/src/gtest/build-aux/test-driver b/ceph/src/gtest/build-aux/test-driver new file mode 100755 index 00000000..d3060566 --- /dev/null +++ b/ceph/src/gtest/build-aux/test-driver @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/ceph/src/gtest/configure b/ceph/src/gtest/configure index 1df7631c..83a9cb63 100755 --- a/ceph/src/gtest/configure +++ b/ceph/src/gtest/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Google C++ Testing Framework 1.5.0. +# Generated by GNU Autoconf 2.69 for Google C++ Testing Framework 1.5.0. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -679,6 +699,10 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -743,6 +767,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_shared enable_static @@ -1221,8 +1246,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1386,8 +1409,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1484,9 +1511,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF Google C++ Testing Framework configure 1.5.0 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1600,7 +1627,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1860,7 +1887,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1883,7 +1910,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Google C++ Testing Framework $as_me 1.5.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2274,7 +2301,7 @@ ac_config_files="$ac_config_files scripts/gtest-config" # Initialize Automake with various options. We require at least v1.9, prevent # pedantic complaints about package files, and enable various distribution # targets. -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2313,7 +2340,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2371,9 +2398,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2384,32 +2408,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2421,6 +2453,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2443,12 +2485,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2460,10 +2502,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2482,7 +2524,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2522,7 +2564,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2573,7 +2615,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2602,12 +2644,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2626,7 +2662,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2690,6 +2726,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2740,12 +2815,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2753,6 +2838,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # Check for programs used in building Google Test. ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -2776,7 +2903,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2816,7 +2943,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2869,7 +2996,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2910,7 +3037,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2968,7 +3095,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3012,7 +3139,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3458,8 +3585,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3543,6 +3669,65 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3562,7 +3747,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3618,8 +3803,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3654,16 +3839,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3672,8 +3857,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -3681,7 +3866,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3763,7 +3948,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3807,7 +3992,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4003,8 +4188,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4039,16 +4224,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4057,8 +4242,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4066,7 +4251,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4313,7 +4498,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4389,7 +4574,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4455,7 +4640,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4522,7 +4707,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4778,7 +4963,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4822,7 +5007,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5246,7 +5431,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5286,7 +5471,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5592,7 +5777,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5632,7 +5817,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5736,7 +5921,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5780,7 +5965,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5905,7 +6090,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5945,7 +6130,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6004,7 +6189,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6044,7 +6229,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6694,7 +6879,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6734,7 +6919,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6814,7 +6999,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6854,7 +7039,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6906,7 +7091,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6946,7 +7131,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6998,7 +7183,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7038,7 +7223,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7090,7 +7275,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7130,7 +7315,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7182,7 +7367,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7222,7 +7407,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14963,7 +15148,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15164,7 +15349,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_acx_pthread_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15319,7 +15504,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15682,6 +15867,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -16008,16 +16201,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16077,28 +16270,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -16120,7 +16301,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by Google C++ Testing Framework $as_me 1.5.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16186,10 +16367,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Google C++ Testing Framework config.status 1.5.0 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16280,7 +16461,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -17291,7 +17472,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "scripts/gtest-config":F) chmod +x scripts/gtest-config ;; "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -17304,7 +17485,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -17338,21 +17519,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff --git a/ceph/src/include/ceph_features.h b/ceph/src/include/ceph_features.h index 6b2a5fb5..c3dfcabe 100644 --- a/ceph/src/include/ceph_features.h +++ b/ceph/src/include/ceph_features.h @@ -52,6 +52,7 @@ #define CEPH_FEATURE_OSD_PRIMARY_AFFINITY (1ULL<<41) /* overlap w/ tunables3 */ #define CEPH_FEATURE_MSGR_KEEPALIVE2 (1ULL<<42) #define CEPH_FEATURE_OSD_POOLRESEND (1ULL<<43) +#define CEPH_FEATURE_OSD_SET_ALLOC_HINT (1ULL<<45) /* * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature @@ -124,6 +125,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_OSD_PRIMARY_AFFINITY | \ CEPH_FEATURE_MSGR_KEEPALIVE2 | \ CEPH_FEATURE_OSD_POOLRESEND | \ + CEPH_FEATURE_OSD_SET_ALLOC_HINT | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL diff --git a/ceph/src/include/util.h b/ceph/src/include/util.h index b30132e4..4e4476ad 100644 --- a/ceph/src/include/util.h +++ b/ceph/src/include/util.h @@ -4,17 +4,41 @@ * Ceph - scalable distributed file system * * Copyright (C) 2012 Inktank Storage, Inc. + * Copyright (C) 2014 Red Hat * * This is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License version 2.1, as published by the Free Software * Foundation. See file COPYING. */ +#ifndef CEPH_UTIL_H +#define CEPH_UTIL_H // is buf~len completely zero (in 8-byte chunks) +#include "common/Formatter.h" #include "include/types.h" bool buf_is_zero(const char *buf, size_t len); int64_t unit_to_bytesize(string val, ostream *pss); + +struct ceph_data_stats +{ + uint64_t byte_total; + uint64_t byte_used; + uint64_t byte_avail; + int avail_percent; + + void dump(Formatter *f) const { + assert(f != NULL); + f->dump_int("total", byte_total); + f->dump_int("used", byte_used); + f->dump_int("avail", byte_avail); + f->dump_int("avail_percent", avail_percent); + } +}; +typedef struct ceph_data_stats ceph_data_stats_t; + +int get_fs_stats(ceph_data_stats_t &stats, const char *path); +#endif /* CEPH_UTIL_H */ diff --git a/ceph/src/init-radosgw.sysv b/ceph/src/init-radosgw.sysv index dd3dbb08..06d41f66 100644 --- a/ceph/src/init-radosgw.sysv +++ b/ceph/src/init-radosgw.sysv @@ -85,7 +85,7 @@ case "$1" in fi if [ $SYSTEMD -eq 1 ]; then - systemd-run -r bash -c "ulimit -n 32768; $RADOSGW -n $name" + systemd-run -r sudo -u "$user" bash -c "ulimit -n 32768; $RADOSGW -n $name" else #start-stop-daemon --start -u $user -x $RADOSGW -- -n $name daemon --user="$user" "ulimit -n 32768; $RADOSGW -n $name" diff --git a/ceph/src/java/Makefile.in b/ceph/src/java/Makefile.in index 013bb6cf..72b1ea40 100644 --- a/ceph/src/java/Makefile.in +++ b/ceph/src/java/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,6 +17,51 @@ # automake technique adapted from OpenMPI Java VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -40,7 +84,7 @@ target_triplet = @target@ @ENABLE_CEPHFS_JAVA_TRUE@@HAVE_JUNIT4_TRUE@am__append_1 = libcephfs-test.jar @ENABLE_CEPHFS_JAVA_TRUE@@HAVE_JUNIT4_TRUE@am__append_2 = test/com/ceph/fs/*.class libcephfs-test.jar subdir = src/java -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_classpath.m4 \ $(top_srcdir)/m4/ac_prog_jar.m4 \ @@ -62,14 +106,25 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/src/acconfig.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -99,6 +154,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(javadir)" DATA = $(java_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -359,8 +415,11 @@ clean-libtool: -rm -rf .libs _libs install-javaDATA: $(java_DATA) @$(NORMAL_INSTALL) - test -z "$(javadir)" || $(MKDIR_P) "$(DESTDIR)$(javadir)" @list='$(java_DATA)'; test -n "$(javadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(javadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(javadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -375,11 +434,11 @@ uninstall-javaDATA: @list='$(java_DATA)'; test -n "$(javadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(javadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -522,16 +581,16 @@ uninstall-am: uninstall-javaDATA .MAKE: all check install install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-javaDATA install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-javaDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-javaDATA \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-javaDATA # note: for the -source 1.5 builds, we add diff --git a/ceph/src/librbd/internal.cc b/ceph/src/librbd/internal.cc index afa46602..cc1c7e7d 100644 --- a/ceph/src/librbd/internal.cc +++ b/ceph/src/librbd/internal.cc @@ -419,7 +419,12 @@ namespace librbd { for (std::list::const_iterator it = pools.begin(); it != pools.end(); ++it) { IoCtx ioctx; - rados.ioctx_create(it->c_str(), ioctx); + r = rados.ioctx_create(it->c_str(), ioctx); + if (r < 0) { + lderr(cct) << "Error accessing child image pool " << *it << dendl; + return r; + } + set image_ids; int r = cls_client::get_children(&ioctx, RBD_CHILDREN, parent_spec, image_ids); @@ -1260,7 +1265,6 @@ reprotect_and_return_err: if (r < 0) { lderr(ictx->cct) << "error opening parent image: " << cpp_strerror(r) << dendl; - close_image(ictx->parent); ictx->parent = NULL; return r; } diff --git a/ceph/src/mds/Dumper.cc b/ceph/src/mds/Dumper.cc index f7f18c9b..a1b393ec 100644 --- a/ceph/src/mds/Dumper.cc +++ b/ceph/src/mds/Dumper.cc @@ -160,7 +160,7 @@ void Dumper::undump(const char *dump_file) inodeno_t ino = MDS_INO_LOG_OFFSET + rank; Journaler::Header h; - h.trimmed_pos = start; + h.trimmed_pos = start - (start % g_default_file_layout.fl_object_size); h.expire_pos = start; h.write_pos = start+len; h.magic = CEPH_FS_ONDISK_MAGIC; @@ -175,18 +175,14 @@ void Dumper::undump(const char *dump_file) object_locator_t oloc(mdsmap->get_metadata_pool()); SnapContext snapc; - bool done = false; - Cond cond; - cout << "writing header " << oid << std::endl; + C_SaferCond header_cond; + lock.Lock(); objecter->write_full(oid, oloc, snapc, hbl, ceph_clock_now(g_ceph_context), 0, NULL, - new C_SafeCond(&lock, &cond, &done)); - - lock.Lock(); - while (!done) - cond.Wait(lock); + &header_cond); lock.Unlock(); + header_cond.wait(); // read Filer filer(objecter); @@ -198,13 +194,12 @@ void Dumper::undump(const char *dump_file) uint64_t l = MIN(left, 1024*1024); j.read_fd(fd, l); cout << " writing " << pos << "~" << l << std::endl; - filer.write(ino, &h.layout, snapc, pos, l, j, ceph_clock_now(g_ceph_context), 0, NULL, new C_SafeCond(&lock, &cond, &done)); - + C_SaferCond body_cond; lock.Lock(); - while (!done) - cond.Wait(lock); + filer.write(ino, &h.layout, snapc, pos, l, j, ceph_clock_now(g_ceph_context), 0, NULL, &body_cond); lock.Unlock(); - + body_cond.wait(); + pos += l; left -= l; } diff --git a/ceph/src/mds/Locker.cc b/ceph/src/mds/Locker.cc index 74305b9c..19907b3b 100644 --- a/ceph/src/mds/Locker.cc +++ b/ceph/src/mds/Locker.cc @@ -2689,6 +2689,9 @@ static uint64_t calc_bounding(uint64_t t) return t + 1; } +/** + * m and ack might be NULL, so don't dereference them unless dirty != 0 + */ void Locker::_do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t follows, client_t client, MClientCaps *m, MClientCaps *ack) { dout(10) << "_do_snap_update dirty " << ccap_string(dirty) @@ -2766,14 +2769,22 @@ void Locker::_do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t foll client, NULL, ack)); } - +/** + * m might be NULL, so don't dereference it unless dirty != 0. + */ void Locker::_update_cap_fields(CInode *in, int dirty, MClientCaps *m, inode_t *pi) { + + if (dirty && m->get_ctime() > pi->ctime) { + dout(7) << " ctime " << pi->ctime << " -> " << m->get_ctime() + << " for " << *in << dendl; + pi->ctime = m->get_ctime(); + } + // file if (dirty & (CEPH_CAP_FILE_EXCL|CEPH_CAP_FILE_WR)) { utime_t atime = m->get_atime(); utime_t mtime = m->get_mtime(); - utime_t ctime = m->get_ctime(); uint64_t size = m->get_size(); version_t inline_version = m->inline_version; @@ -2783,11 +2794,6 @@ void Locker::_update_cap_fields(CInode *in, int dirty, MClientCaps *m, inode_t * << " for " << *in << dendl; pi->mtime = mtime; } - if (ctime > pi->ctime) { - dout(7) << " ctime " << pi->ctime << " -> " << ctime - << " for " << *in << dendl; - pi->ctime = ctime; - } if (in->inode.is_file() && // ONLY if regular file size > pi->size) { dout(7) << " size " << pi->size << " -> " << size diff --git a/ceph/src/mds/MDCache.cc b/ceph/src/mds/MDCache.cc index d6cfebdd..6c52fbda 100644 --- a/ceph/src/mds/MDCache.cc +++ b/ceph/src/mds/MDCache.cc @@ -369,6 +369,8 @@ void MDCache::create_mydir_hierarchy(C_Gather *gather) CDir *mydir = my->get_or_open_dirfrag(this, frag_t()); adjust_subtree_auth(mydir, mds->whoami); + LogSegment *ls = mds->mdlog->get_current_segment(); + // stray dir for (int i = 0; i < NUM_STRAY; ++i) { CInode *stray = create_system_inode(MDS_INO_STRAY(mds->whoami, i), S_IFDIR); @@ -384,8 +386,10 @@ void MDCache::create_mydir_hierarchy(C_Gather *gather) mydir->fnode.fragstat.nsubdirs++; // save them straydir->mark_complete(); - straydir->mark_dirty(straydir->pre_dirty(), mds->mdlog->get_current_segment()); + straydir->mark_dirty(straydir->pre_dirty(), ls); straydir->commit(0, gather->new_sub()); + stray->_mark_dirty_parent(ls, true); + stray->store_backtrace(gather->new_sub()); } CInode *journal = create_system_inode(MDS_INO_LOG_OFFSET + mds->whoami, S_IFREG); @@ -405,7 +409,7 @@ void MDCache::create_mydir_hierarchy(C_Gather *gather) mydir->mark_complete(); - mydir->mark_dirty(mydir->pre_dirty(), mds->mdlog->get_current_segment()); + mydir->mark_dirty(mydir->pre_dirty(), ls); mydir->commit(0, gather->new_sub()); myin->store(gather->new_sub()); diff --git a/ceph/src/mds/Server.cc b/ceph/src/mds/Server.cc index 64004b22..3a96f931 100644 --- a/ceph/src/mds/Server.cc +++ b/ceph/src/mds/Server.cc @@ -3097,8 +3097,9 @@ void Server::handle_client_file_setlock(MDRequestRef& mdr) break; default: - dout(0) << "got unknown lock type " << set_lock.type - << ", dropping request!" << dendl; + dout(10) << "got unknown lock type " << set_lock.type + << ", dropping request!" << dendl; + reply_request(mdr, -EOPNOTSUPP); return; } diff --git a/ceph/src/mon/DataHealthService.cc b/ceph/src/mon/DataHealthService.cc index 6c6ed290..a2bbb1f5 100644 --- a/ceph/src/mon/DataHealthService.cc +++ b/ceph/src/mon/DataHealthService.cc @@ -86,10 +86,10 @@ void DataHealthService::get_health( health_status_t health_status = HEALTH_OK; string health_detail; - if (stats.latest_avail_percent <= g_conf->mon_data_avail_crit) { + if (stats.fs_stats.avail_percent <= g_conf->mon_data_avail_crit) { health_status = HEALTH_ERR; health_detail = "low disk space, shutdown imminent"; - } else if (stats.latest_avail_percent <= g_conf->mon_data_avail_warn) { + } else if (stats.fs_stats.avail_percent <= g_conf->mon_data_avail_warn) { health_status = HEALTH_WARN; health_detail = "low disk space"; } @@ -110,7 +110,7 @@ void DataHealthService::get_health( stringstream ss; ss << "mon." << mon_name << " " << health_detail; summary.push_back(make_pair(health_status, ss.str())); - ss << " -- " << stats.latest_avail_percent << "% avail"; + ss << " -- " << stats.fs_stats.avail_percent << "% avail"; if (detail) detail->push_back(make_pair(health_status, ss.str())); } @@ -151,23 +151,18 @@ int DataHealthService::update_store_stats(DataStats &ours) int DataHealthService::update_stats() { - struct statfs stbuf; - int err = ::statfs(g_conf->mon_data.c_str(), &stbuf); - if (err < 0) { - derr << __func__ << " statfs error: " << cpp_strerror(errno) << dendl; - return -errno; - } - entity_inst_t our_inst = mon->messenger->get_myinst(); DataStats& ours = stats[our_inst]; - ours.kb_total = stbuf.f_blocks * stbuf.f_bsize / 1024; - ours.kb_used = (stbuf.f_blocks - stbuf.f_bfree) * stbuf.f_bsize / 1024; - ours.kb_avail = stbuf.f_bavail * stbuf.f_bsize / 1024; - ours.latest_avail_percent = (((float)ours.kb_avail/ours.kb_total)*100); - dout(0) << __func__ << " avail " << ours.latest_avail_percent << "%" - << " total " << ours.kb_total << " used " << ours.kb_used << " avail " << ours.kb_avail - << dendl; + int err = get_fs_stats(ours.fs_stats, g_conf->mon_data.c_str()); + if (err < 0) { + derr << __func__ << " get_fs_stats error: " << cpp_strerror(err) << dendl; + return err; + } + dout(0) << __func__ << " avail " << ours.fs_stats.avail_percent << "%" + << " total " << prettybyte_t(ours.fs_stats.byte_total) + << ", used " << prettybyte_t(ours.fs_stats.byte_used) + << ", avail " << prettybyte_t(ours.fs_stats.byte_avail) << dendl; ours.last_update = ceph_clock_now(g_ceph_context); return update_store_stats(ours); @@ -213,7 +208,7 @@ void DataHealthService::service_tick() DataStats &ours = stats[mon->messenger->get_myinst()]; - if (ours.latest_avail_percent <= g_conf->mon_data_avail_crit) { + if (ours.fs_stats.avail_percent <= g_conf->mon_data_avail_crit) { derr << "reached critical levels of available space on local monitor storage" << " -- shutdown!" << dendl; force_shutdown(); @@ -224,12 +219,12 @@ void DataHealthService::service_tick() // consumed in-between reports to assess if it's worth to log this info, // otherwise we may very well contribute to the consumption of the // already low available disk space. - if (ours.latest_avail_percent <= g_conf->mon_data_avail_warn) { - if (ours.latest_avail_percent != last_warned_percent) + if (ours.fs_stats.avail_percent <= g_conf->mon_data_avail_warn) { + if (ours.fs_stats.avail_percent != last_warned_percent) mon->clog.warn() << "reached concerning levels of available space on local monitor storage" - << " (" << ours.latest_avail_percent << "% free)\n"; - last_warned_percent = ours.latest_avail_percent; + << " (" << ours.fs_stats.avail_percent << "% free)\n"; + last_warned_percent = ours.fs_stats.avail_percent; } else { last_warned_percent = 0; } diff --git a/ceph/src/mon/Monitor.cc b/ceph/src/mon/Monitor.cc index fd3a358d..ad35e5ed 100644 --- a/ceph/src/mon/Monitor.cc +++ b/ceph/src/mon/Monitor.cc @@ -428,6 +428,8 @@ int Monitor::preinit() cluster_logger = pcb.create_perf_counters(); } + paxos->init_logger(); + // verify cluster_uuid { int r = check_fsid(); @@ -1406,6 +1408,8 @@ void Monitor::handle_probe(MMonProbe *m) */ void Monitor::handle_probe_probe(MMonProbe *m) { + MMonProbe *r; + dout(10) << "handle_probe_probe " << m->get_source_inst() << *m << " features " << m->get_connection()->get_features() << dendl; uint64_t missing = required_features & ~m->get_connection()->get_features(); @@ -1418,12 +1422,26 @@ void Monitor::handle_probe_probe(MMonProbe *m) m->required_features = required_features; messenger->send_message(r, m->get_connection()); } - m->put(); - return; + goto out; + } + + if (!is_probing() && !is_synchronizing()) { + // If the probing mon is way ahead of us, we need to re-bootstrap. + // Normally we capture this case when we initially bootstrap, but + // it is possible we pass those checks (we overlap with + // quorum-to-be) but fail to join a quorum before it moves past + // us. We need to be kicked back to bootstrap so we can + // synchonize, not keep calling elections. + if (paxos->get_version() + 1 < m->paxos_first_version) { + dout(1) << " peer " << m->get_source_addr() << " has first_committed " + << "ahead of us, re-bootstrapping" << dendl; + bootstrap(); + goto out; + + } } - MMonProbe *r = new MMonProbe(monmap->fsid, MMonProbe::OP_REPLY, - name, has_ever_joined); + r = new MMonProbe(monmap->fsid, MMonProbe::OP_REPLY, name, has_ever_joined); r->name = name; r->quorum = quorum; monmap->encode(r->monmap_bl, m->get_connection()->get_features()); @@ -1438,6 +1456,7 @@ void Monitor::handle_probe_probe(MMonProbe *m) extra_probe_peers.insert(m->get_source_addr()); } + out: m->put(); } diff --git a/ceph/src/mon/MonitorDBStore.h b/ceph/src/mon/MonitorDBStore.h index 88c4f936..1576db77 100644 --- a/ceph/src/mon/MonitorDBStore.h +++ b/ceph/src/mon/MonitorDBStore.h @@ -87,6 +87,9 @@ class MonitorDBStore struct Transaction { list ops; + uint64_t bytes, keys; + + Transaction() : bytes(0), keys(0) {} enum { OP_PUT = 1, @@ -96,6 +99,8 @@ class MonitorDBStore void put(string prefix, string key, bufferlist& bl) { ops.push_back(Op(OP_PUT, prefix, key, bl)); + ++keys; + bytes += prefix.length() + key.length() + bl.length(); } void put(string prefix, version_t ver, bufferlist& bl) { @@ -112,6 +117,8 @@ class MonitorDBStore void erase(string prefix, string key) { ops.push_back(Op(OP_ERASE, prefix, key)); + ++keys; + bytes += prefix.length() + key.length(); } void erase(string prefix, version_t ver) { @@ -129,14 +136,20 @@ class MonitorDBStore } void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); + ENCODE_START(2, 1, bl); ::encode(ops, bl); + ::encode(bytes, bl); + ::encode(keys, bl); ENCODE_FINISH(bl); } void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); + DECODE_START(2, bl); ::decode(ops, bl); + if (struct_v >= 2) { + ::decode(bytes, bl); + ::decode(keys, bl); + } DECODE_FINISH(bl); } @@ -153,6 +166,8 @@ class MonitorDBStore void append(Transaction& other) { ops.splice(ops.end(), other.ops); + keys += other.keys; + bytes += other.bytes; } void append_from_encoded(bufferlist& bl) { @@ -169,6 +184,12 @@ class MonitorDBStore bool size() { return ops.size(); } + uint64_t get_keys() const { + return keys; + } + uint64_t get_bytes() const { + return bytes; + } void dump(ceph::Formatter *f, bool dump_val=false) const { f->open_object_section("transaction"); @@ -218,6 +239,8 @@ class MonitorDBStore f->close_section(); } f->close_section(); + f->dump_unsigned("num_keys", keys); + f->dump_unsigned("num_bytes", bytes); f->close_section(); } }; diff --git a/ceph/src/mon/OSDMonitor.cc b/ceph/src/mon/OSDMonitor.cc index 7e469b2d..5f54f94d 100644 --- a/ceph/src/mon/OSDMonitor.cc +++ b/ceph/src/mon/OSDMonitor.cc @@ -1211,7 +1211,7 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m) osdmap.get_info(from).up_from > m->version) { dout(7) << "prepare_boot msg from before last up_from, ignoring" << dendl; send_latest(m, m->sb.current_epoch+1); - goto ignore; + return true; } // noup? @@ -3279,11 +3279,38 @@ int OSDMonitor::prepare_pool_crush_ruleset(const unsigned pool_type, if (*crush_ruleset < 0) { switch (pool_type) { case pg_pool_t::TYPE_REPLICATED: - *crush_ruleset = osdmap.crush->get_osd_pool_default_crush_replicated_ruleset(g_ceph_context); - if (*crush_ruleset < 0) { - // Errors may happen e.g. if no valid ruleset is available - ss << "No suitable CRUSH ruleset exists"; - return *crush_ruleset; + { + if (ruleset_name == "") { + //Use default ruleset + *crush_ruleset = osdmap.crush->get_osd_pool_default_crush_replicated_ruleset(g_ceph_context); + if (*crush_ruleset < 0) { + // Errors may happen e.g. if no valid ruleset is available + ss << "No suitable CRUSH ruleset exists"; + return *crush_ruleset; + } + } else { + int ret; + ret = osdmap.crush->get_rule_id(ruleset_name); + if (ret != -ENOENT) { + // found it, use it + *crush_ruleset = ret; + } else { + CrushWrapper newcrush; + _get_pending_crush(newcrush); + + ret = newcrush.get_rule_id(ruleset_name); + if (ret != -ENOENT) { + // found it, wait for it to be proposed + dout(20) << "prepare_pool_crush_ruleset: ruleset " + << ruleset_name << " is pending, try again" << dendl; + return -EAGAIN; + } else { + //Cannot find it , return error + ss << "Specified ruleset " << ruleset_name << " doesn't exist"; + return ret; + } + } + } } break; case pg_pool_t::TYPE_ERASURE: @@ -5004,35 +5031,41 @@ done: cmd_getval(g_ceph_context, cmdmap, "ruleset", ruleset_name); string erasure_code_profile; cmd_getval(g_ceph_context, cmdmap, "erasure_code_profile", erasure_code_profile); - if (erasure_code_profile == "") - erasure_code_profile = "default"; - if (erasure_code_profile == "default") { - if (!osdmap.has_erasure_code_profile(erasure_code_profile)) { - if (pending_inc.has_erasure_code_profile(erasure_code_profile)) { - dout(20) << "erasure code profile " << erasure_code_profile << " already pending" << dendl; - goto wait; - } - map profile_map; - err = osdmap.get_erasure_code_profile_default(g_ceph_context, + if (pool_type == pg_pool_t::TYPE_ERASURE) { + if (erasure_code_profile == "") + erasure_code_profile = "default"; + //handle the erasure code profile + if (erasure_code_profile == "default") { + if (!osdmap.has_erasure_code_profile(erasure_code_profile)) { + if (pending_inc.has_erasure_code_profile(erasure_code_profile)) { + dout(20) << "erasure code profile " << erasure_code_profile << " already pending" << dendl; + goto wait; + } + + map profile_map; + err = osdmap.get_erasure_code_profile_default(g_ceph_context, profile_map, &ss); - if (err) - goto reply; - dout(20) << "erasure code profile " << erasure_code_profile << " set" << dendl; - pending_inc.set_erasure_code_profile(erasure_code_profile, profile_map); - goto wait; + if (err) + goto reply; + dout(20) << "erasure code profile " << erasure_code_profile << " set" << dendl; + pending_inc.set_erasure_code_profile(erasure_code_profile, profile_map); + goto wait; + } } - } - - if (ruleset_name == "") { - if (erasure_code_profile == "default") { - ruleset_name = "erasure-code"; - } else { - dout(1) << "implicitly use ruleset named after the pool: " + if (ruleset_name == "") { + if (erasure_code_profile == "default") { + ruleset_name = "erasure-code"; + } else { + dout(1) << "implicitly use ruleset named after the pool: " << poolstr << dendl; - ruleset_name = poolstr; + ruleset_name = poolstr; + } } + } else { + //NOTE:for replicated pool,cmd_map will put ruleset_name to erasure_code_profile field + ruleset_name = erasure_code_profile; } err = prepare_new_pool(poolstr, 0, // auid=0 for admin created pool diff --git a/ceph/src/mon/PGMap.cc b/ceph/src/mon/PGMap.cc index 5ec8ee2a..59b6a032 100644 --- a/ceph/src/mon/PGMap.cc +++ b/ceph/src/mon/PGMap.cc @@ -379,17 +379,31 @@ void PGMap::update_pg(pg_t pgid, bufferlist& bl) { bufferlist::iterator p = bl.begin(); ceph::unordered_map::iterator s = pg_stat.find(pgid); - if (s != pg_stat.end()) + epoch_t old_lec = 0; + if (s != pg_stat.end()) { + old_lec = s->second.get_effective_last_epoch_clean(); stat_pg_sub(pgid, s->second); + } pg_stat_t& r = pg_stat[pgid]; ::decode(r, p); stat_pg_add(pgid, r); + + epoch_t lec = r.get_effective_last_epoch_clean(); + if (min_last_epoch_clean && + (lec < min_last_epoch_clean || // we did + (lec > min_last_epoch_clean && // we might + old_lec == min_last_epoch_clean) + )) + min_last_epoch_clean = 0; } void PGMap::remove_pg(pg_t pgid) { ceph::unordered_map::iterator s = pg_stat.find(pgid); if (s != pg_stat.end()) { + if (min_last_epoch_clean && + s->second.get_effective_last_epoch_clean() == min_last_epoch_clean) + min_last_epoch_clean = 0; stat_pg_sub(pgid, s->second); pg_stat.erase(s); } @@ -399,14 +413,33 @@ void PGMap::update_osd(int osd, bufferlist& bl) { bufferlist::iterator p = bl.begin(); ceph::unordered_map::iterator o = osd_stat.find(osd); - if (o != osd_stat.end()) + epoch_t old_lec = 0; + if (o != osd_stat.end()) { + ceph::unordered_map::iterator i = osd_epochs.find(osd); + if (i != osd_epochs.end()) + old_lec = i->second; stat_osd_sub(o->second); + } osd_stat_t& r = osd_stat[osd]; ::decode(r, p); stat_osd_add(r); // adjust [near]full status register_nearfull_status(osd, r); + + // epoch? + if (!p.end()) { + epoch_t e; + ::decode(e, p); + + if (e < min_last_epoch_clean || + (e > min_last_epoch_clean && + old_lec == min_last_epoch_clean)) + min_last_epoch_clean = 0; + } else { + // WARNING: we are not refreshing min_last_epoch_clean! must be old store + // or old mon running. + } } void PGMap::remove_osd(int osd) diff --git a/ceph/src/mon/PGMonitor.cc b/ceph/src/mon/PGMonitor.cc index 15f67466..364ad20c 100644 --- a/ceph/src/mon/PGMonitor.cc +++ b/ceph/src/mon/PGMonitor.cc @@ -545,6 +545,7 @@ void PGMonitor::encode_pending(MonitorDBStore::Transaction *t) ::encode(p->first, dirty); bufferlist bl; ::encode(p->second, bl, features); + ::encode(pending_inc.get_osd_epochs().find(p->first)->second, bl); t->put(prefix, stringify(p->first), bl); } for (set::const_iterator p = diff --git a/ceph/src/mon/Paxos.cc b/ceph/src/mon/Paxos.cc index b38b1116..2e41eb80 100644 --- a/ceph/src/mon/Paxos.cc +++ b/ceph/src/mon/Paxos.cc @@ -73,6 +73,44 @@ void Paxos::init() assert(is_consistent()); } +void Paxos::init_logger() +{ + PerfCountersBuilder pcb(g_ceph_context, "paxos", l_paxos_first, l_paxos_last); + pcb.add_u64_counter(l_paxos_start_leader, "start_leader"); + pcb.add_u64_counter(l_paxos_start_peon, "start_peon"); + pcb.add_u64_counter(l_paxos_restart, "restart"); + pcb.add_u64_counter(l_paxos_refresh, "refresh"); + pcb.add_time_avg(l_paxos_refresh_latency, "refresh_latency"); + pcb.add_u64_counter(l_paxos_begin, "begin"); + pcb.add_u64_avg(l_paxos_begin_keys, "begin_keys"); + pcb.add_u64_avg(l_paxos_begin_bytes, "begin_bytes"); + pcb.add_time_avg(l_paxos_begin_latency, "begin_latency"); + pcb.add_u64_counter(l_paxos_commit, "commit"); + pcb.add_u64_avg(l_paxos_commit_keys, "commit_keys"); + pcb.add_u64_avg(l_paxos_commit_bytes, "commit_bytes"); + pcb.add_time_avg(l_paxos_commit_latency, "commit_latency"); + pcb.add_u64_counter(l_paxos_collect, "collect"); + pcb.add_u64_avg(l_paxos_collect_keys, "collect_keys"); + pcb.add_u64_avg(l_paxos_collect_bytes, "collect_bytes"); + pcb.add_time_avg(l_paxos_collect_latency, "collect_latency"); + pcb.add_u64_counter(l_paxos_collect_uncommitted, "collect_uncommitted"); + pcb.add_u64_counter(l_paxos_collect_timeout, "collect_timeout"); + pcb.add_u64_counter(l_paxos_accept_timeout, "accept_timeout"); + pcb.add_u64_counter(l_paxos_lease_ack_timeout, "lease_ack_timeout"); + pcb.add_u64_counter(l_paxos_lease_timeout, "lease_timeout"); + pcb.add_u64_counter(l_paxos_store_state, "store_state"); + pcb.add_u64_avg(l_paxos_store_state_keys, "store_state_keys"); + pcb.add_u64_avg(l_paxos_store_state_bytes, "store_state_bytes"); + pcb.add_time_avg(l_paxos_store_state_latency, "store_state_latency"); + pcb.add_u64_counter(l_paxos_share_state, "share_state"); + pcb.add_u64_avg(l_paxos_share_state_keys, "share_state_keys"); + pcb.add_u64_avg(l_paxos_share_state_bytes, "share_state_bytes"); + pcb.add_u64_counter(l_paxos_new_pn, "new_pn"); + pcb.add_time_avg(l_paxos_new_pn_latency, "new_pn_latency"); + logger = pcb.create_perf_counters(); + g_ceph_context->get_perfcounters_collection()->add(logger); +} + void Paxos::dump_info(Formatter *f) { f->open_object_section("paxos"); @@ -120,6 +158,8 @@ void Paxos::collect(version_t oldpn) << " pn " << uncommitted_pn << " (" << uncommitted_value.length() << " bytes) from myself" << dendl; + + logger->inc(l_paxos_collect_uncommitted); } // pick new pn @@ -193,7 +233,15 @@ void Paxos::handle_collect(MMonPaxos *collect) f.flush(*_dout); *_dout << dendl; + logger->inc(l_paxos_collect); + logger->inc(l_paxos_collect_keys, t.get_keys()); + logger->inc(l_paxos_collect_bytes, t.get_bytes()); + utime_t start = ceph_clock_now(NULL); + get_store()->apply_transaction(t); + + utime_t end = ceph_clock_now(NULL); + logger->tinc(l_paxos_collect_latency, end - start); } else { // don't accept! dout(10) << "NOT accepting pn " << collect->pn << " from " << collect->pn_from @@ -229,6 +277,8 @@ void Paxos::handle_collect(MMonPaxos *collect) << " and crossing our fingers" << dendl; last->uncommitted_pn = previous_pn; } + + logger->inc(l_paxos_collect_uncommitted); } // send reply @@ -258,14 +308,19 @@ void Paxos::share_state(MMonPaxos *m, version_t peer_first_committed, version_t v = peer_last_committed + 1; // include incrementals + uint64_t bytes = 0; for ( ; v <= last_committed; v++) { if (get_store()->exists(get_name(), v)) { get_store()->get(get_name(), v, m->values[v]); assert(m->values[v].length()); dout(10) << " sharing " << v << " (" << m->values[v].length() << " bytes)" << dendl; + bytes += m->values[v].length() + 16; // paxos_ + 10 digits = 16 } } + logger->inc(l_paxos_share_state); + logger->inc(l_paxos_share_state_keys, m->values.size()); + logger->inc(l_paxos_share_state_bytes, bytes); m->last_committed = last_committed; } @@ -318,6 +373,7 @@ bool Paxos::store_state(MMonPaxos *m) dout(10) << "store_state [" << start->first << ".." << last_committed << "]" << dendl; t.put(get_name(), "last_committed", last_committed); + // we should apply the state here -- decode every single bufferlist in the // map and append the transactions to 't'. map::iterator it; @@ -345,8 +401,16 @@ bool Paxos::store_state(MMonPaxos *m) f.flush(*_dout); *_dout << dendl; + logger->inc(l_paxos_store_state); + logger->inc(l_paxos_store_state_bytes, t.get_bytes()); + logger->inc(l_paxos_store_state_keys, t.get_keys()); + utime_t start = ceph_clock_now(NULL); + get_store()->apply_transaction(t); + utime_t end = ceph_clock_now(NULL); + logger->tinc(l_paxos_store_state_latency, end - start); + // refresh first_committed; this txn may have trimmed. first_committed = get_store()->get(get_name(), "first_committed"); @@ -385,6 +449,7 @@ void Paxos::_sanity_check_store() void Paxos::handle_last(MMonPaxos *last) { bool need_refresh = false; + int from = last->get_source().num(); dout(10) << "handle_last " << *last << dendl; @@ -396,12 +461,13 @@ void Paxos::handle_last(MMonPaxos *last) // note peer's first_ and last_committed, in case we learn a new // commit and need to push it to them. - peer_first_committed[last->get_source().num()] = last->first_committed; - peer_last_committed[last->get_source().num()] = last->last_committed; + peer_first_committed[from] = last->first_committed; + peer_last_committed[from] = last->last_committed; - if (last->first_committed > last_committed+1) { + if (last->first_committed > last_committed + 1) { dout(5) << __func__ - << " peon's lowest version is too high for our last committed" + << " mon." << from + << " lowest version is too high for our last committed" << " (theirs: " << last->first_committed << "; ours: " << last_committed << ") -- bootstrap!" << dendl; last->put(); @@ -416,6 +482,31 @@ void Paxos::handle_last(MMonPaxos *last) assert(g_conf->paxos_kill_at != 2); + // is everyone contiguous and up to date? + for (map::iterator p = peer_last_committed.begin(); + p != peer_last_committed.end(); + ++p) { + if (p->second + 1 < first_committed && first_committed > 1) { + dout(5) << __func__ + << " peon " << p->first + << " last_committed (" << p->second + << ") is too low for our first_committed (" << first_committed + << ") -- bootstrap!" << dendl; + last->put(); + mon->bootstrap(); + return; + } + if (p->second < last_committed) { + // share committed values + dout(10) << " sending commit to mon." << p->first << dendl; + MMonPaxos *commit = new MMonPaxos(mon->get_epoch(), + MMonPaxos::OP_COMMIT, + ceph_clock_now(g_ceph_context)); + share_state(commit, peer_first_committed[p->first], p->second); + mon->messenger->send_message(commit, mon->monmap->get_inst(p->first)); + } + } + // do they accept your pn? if (last->pn > accepted_pn) { // no, try again. @@ -457,21 +548,6 @@ void Paxos::handle_last(MMonPaxos *last) // cancel timeout event mon->timer.cancel_event(collect_timeout_event); collect_timeout_event = 0; - - // share committed values? - for (map::iterator p = peer_last_committed.begin(); - p != peer_last_committed.end(); - ++p) { - if (p->second < last_committed) { - // share committed values - dout(10) << " sending commit to mon." << p->first << dendl; - MMonPaxos *commit = new MMonPaxos(mon->get_epoch(), - MMonPaxos::OP_COMMIT, - ceph_clock_now(g_ceph_context)); - share_state(commit, peer_first_committed[p->first], p->second); - mon->messenger->send_message(commit, mon->monmap->get_inst(p->first)); - } - } peer_first_committed.clear(); peer_last_committed.clear(); @@ -513,6 +589,7 @@ void Paxos::collect_timeout() { dout(1) << "collect timeout, calling fresh election" << dendl; collect_timeout_event = 0; + logger->inc(l_paxos_collect_timeout); assert(mon->is_leader()); mon->bootstrap(); } @@ -534,7 +611,7 @@ void Paxos::begin(bufferlist& v) // and no value, yet. assert(new_value.length() == 0); - + // accept it ourselves accepted.clear(); accepted.insert(mon->rank); @@ -573,8 +650,16 @@ void Paxos::begin(bufferlist& v) f.flush(*_dout); *_dout << dendl; + logger->inc(l_paxos_begin); + logger->inc(l_paxos_begin_keys, t.get_keys()); + logger->inc(l_paxos_begin_bytes, t.get_bytes()); + utime_t start = ceph_clock_now(NULL); + get_store()->apply_transaction(t); + utime_t end = ceph_clock_now(NULL); + logger->tinc(l_paxos_begin_latency, end - start); + assert(g_conf->paxos_kill_at != 3); if (mon->get_quorum().size() == 1) { @@ -629,6 +714,8 @@ void Paxos::handle_begin(MMonPaxos *begin) assert(g_conf->paxos_kill_at != 4); + logger->inc(l_paxos_begin); + // set state. state = STATE_UPDATING; lease_expire = utime_t(); // cancel lease @@ -651,8 +738,14 @@ void Paxos::handle_begin(MMonPaxos *begin) f.flush(*_dout); *_dout << dendl; + logger->inc(l_paxos_begin_bytes, t.get_bytes()); + utime_t start = ceph_clock_now(NULL); + get_store()->apply_transaction(t); + utime_t end = ceph_clock_now(NULL); + logger->tinc(l_paxos_begin_latency, end - start); + assert(g_conf->paxos_kill_at != 5); // reply @@ -733,6 +826,7 @@ void Paxos::accept_timeout() accept_timeout_event = 0; assert(mon->is_leader()); assert(is_updating() || is_updating_previous()); + logger->inc(l_paxos_accept_timeout); mon->bootstrap(); } @@ -764,8 +858,16 @@ void Paxos::commit() f.flush(*_dout); *_dout << dendl; + logger->inc(l_paxos_commit); + logger->inc(l_paxos_commit_keys, t.get_keys()); + logger->inc(l_paxos_commit_bytes, t.get_bytes()); + utime_t start = ceph_clock_now(NULL); + get_store()->apply_transaction(t); + utime_t end = ceph_clock_now(NULL); + logger->tinc(l_paxos_commit_latency, end - start); + assert(g_conf->paxos_kill_at != 8); // refresh first_committed; this txn may have trimmed. @@ -802,6 +904,8 @@ void Paxos::handle_commit(MMonPaxos *commit) { dout(10) << "handle_commit on " << commit->last_committed << dendl; + logger->inc(l_paxos_commit); + if (!mon->is_peon()) { dout(10) << "not a peon, dropping" << dendl; assert(0); @@ -883,9 +987,15 @@ bool Paxos::do_refresh() { bool need_bootstrap = false; + utime_t start = ceph_clock_now(NULL); + // make sure we have the latest state loaded up mon->refresh_from_paxos(&need_bootstrap); + utime_t end = ceph_clock_now(NULL); + logger->inc(l_paxos_refresh); + logger->tinc(l_paxos_refresh_latency, end - start); + if (need_bootstrap) { dout(10) << " doing requested bootstrap" << dendl; mon->bootstrap(); @@ -1019,7 +1129,7 @@ void Paxos::lease_ack_timeout() dout(1) << "lease_ack_timeout -- calling new election" << dendl; assert(mon->is_leader()); assert(is_active()); - + logger->inc(l_paxos_lease_ack_timeout); lease_ack_timeout_event = 0; mon->bootstrap(); } @@ -1037,7 +1147,7 @@ void Paxos::lease_timeout() { dout(1) << "lease_timeout -- calling new election" << dendl; assert(mon->is_peon()); - + logger->inc(l_paxos_lease_timeout); lease_timeout_event = 0; mon->bootstrap(); } @@ -1112,8 +1222,14 @@ version_t Paxos::get_new_proposal_number(version_t gt) f.flush(*_dout); *_dout << dendl; + logger->inc(l_paxos_new_pn); + utime_t start = ceph_clock_now(NULL); + get_store()->apply_transaction(t); + utime_t end = ceph_clock_now(NULL); + logger->tinc(l_paxos_new_pn_latency, end - start); + dout(10) << "get_new_proposal_number = " << last_pn << dendl; return last_pn; } @@ -1150,6 +1266,9 @@ void Paxos::shutdown() { finish_contexts(g_ceph_context, waiting_for_readable, -ECANCELED); finish_contexts(g_ceph_context, waiting_for_active, -ECANCELED); finish_contexts(g_ceph_context, proposals, -ECANCELED); + if (logger) + g_ceph_context->get_perfcounters_collection()->remove(logger); + delete logger; } void Paxos::leader_init() @@ -1159,6 +1278,8 @@ void Paxos::leader_init() finish_contexts(g_ceph_context, proposals, -EAGAIN); + logger->inc(l_paxos_start_leader); + if (mon->get_quorum().size() == 1) { state = STATE_ACTIVE; return; @@ -1186,6 +1307,8 @@ void Paxos::peon_init() finish_contexts(g_ceph_context, waiting_for_writeable, -EAGAIN); finish_contexts(g_ceph_context, waiting_for_commit, -EAGAIN); finish_contexts(g_ceph_context, proposals, -EAGAIN); + + logger->inc(l_paxos_start_peon); } void Paxos::restart() @@ -1199,6 +1322,8 @@ void Paxos::restart() finish_contexts(g_ceph_context, proposals, -EAGAIN); finish_contexts(g_ceph_context, waiting_for_commit, -EAGAIN); finish_contexts(g_ceph_context, waiting_for_active, -EAGAIN); + + logger->inc(l_paxos_restart); } diff --git a/ceph/src/mon/Paxos.h b/ceph/src/mon/Paxos.h index b9e43a14..b1ecedc1 100644 --- a/ceph/src/mon/Paxos.h +++ b/ceph/src/mon/Paxos.h @@ -118,6 +118,7 @@ e 12v #include "include/Context.h" #include "common/Timer.h" +#include "common/perf_counters.h" #include #include "MonitorDBStore.h" @@ -126,6 +127,43 @@ class Monitor; class MMonPaxos; class Paxos; +enum { + l_paxos_first = 45800, + l_paxos_start_leader, + l_paxos_start_peon, + l_paxos_restart, + l_paxos_refresh, + l_paxos_refresh_latency, + l_paxos_begin, + l_paxos_begin_keys, + l_paxos_begin_bytes, + l_paxos_begin_latency, + l_paxos_commit, + l_paxos_commit_keys, + l_paxos_commit_bytes, + l_paxos_commit_latency, + l_paxos_collect, + l_paxos_collect_keys, + l_paxos_collect_bytes, + l_paxos_collect_latency, + l_paxos_collect_uncommitted, + l_paxos_collect_timeout, + l_paxos_accept_timeout, + l_paxos_lease_ack_timeout, + l_paxos_lease_timeout, + l_paxos_store_state, + l_paxos_store_state_keys, + l_paxos_store_state_bytes, + l_paxos_store_state_latency, + l_paxos_share_state, + l_paxos_share_state_keys, + l_paxos_share_state_bytes, + l_paxos_new_pn, + l_paxos_new_pn_latency, + l_paxos_last, +}; + + // i am one state machine. /** * This libary is based on the Paxos algorithm, but varies in a few key ways: @@ -147,6 +185,11 @@ class Paxos { */ Monitor *mon; + /// perf counter for internal instrumentations + PerfCounters *logger; + + void init_logger(); + // my state machine info const string paxos_name; @@ -1004,6 +1047,7 @@ public: */ Paxos(Monitor *m, const string &name) : mon(m), + logger(NULL), paxos_name(name), state(STATE_RECOVERING), first_committed(0), diff --git a/ceph/src/mon/mon_types.h b/ceph/src/mon/mon_types.h index 0ae1aaf8..cc68ffba 100644 --- a/ceph/src/mon/mon_types.h +++ b/ceph/src/mon/mon_types.h @@ -16,6 +16,7 @@ #define CEPH_MON_TYPES_H #include "include/utime.h" +#include "include/util.h" #include "common/Formatter.h" #define PAXOS_PGMAP 0 // before osd, for pg kick to behave @@ -89,44 +90,50 @@ WRITE_CLASS_ENCODER(LevelDBStoreStats); // data stats struct DataStats { + ceph_data_stats_t fs_stats; // data dir - uint64_t kb_total; - uint64_t kb_used; - uint64_t kb_avail; - int latest_avail_percent; utime_t last_update; - LevelDBStoreStats store_stats; void dump(Formatter *f) const { assert(f != NULL); - f->dump_int("kb_total", kb_total); - f->dump_int("kb_used", kb_used); - f->dump_int("kb_avail", kb_avail); - f->dump_int("avail_percent", latest_avail_percent); + f->dump_int("kb_total", (fs_stats.byte_total/1024)); + f->dump_int("kb_used", (fs_stats.byte_used/1024)); + f->dump_int("kb_avail", (fs_stats.byte_avail/1024)); + f->dump_int("avail_percent", fs_stats.avail_percent); f->dump_stream("last_updated") << last_update; - f->open_object_section("store_stats"); store_stats.dump(f); f->close_section(); } void encode(bufferlist &bl) const { - ENCODE_START(2, 1, bl); - ::encode(kb_total, bl); - ::encode(kb_used, bl); - ::encode(kb_avail, bl); - ::encode(latest_avail_percent, bl); + ENCODE_START(3, 1, bl); + ::encode(fs_stats.byte_total, bl); + ::encode(fs_stats.byte_used, bl); + ::encode(fs_stats.byte_avail, bl); + ::encode(fs_stats.avail_percent, bl); ::encode(last_update, bl); ::encode(store_stats, bl); ENCODE_FINISH(bl); } void decode(bufferlist::iterator &p) { DECODE_START(1, p); - ::decode(kb_total, p); - ::decode(kb_used, p); - ::decode(kb_avail, p); - ::decode(latest_avail_percent, p); + // we moved from having fields in kb to fields in byte + if (struct_v > 2) { + ::decode(fs_stats.byte_total, p); + ::decode(fs_stats.byte_used, p); + ::decode(fs_stats.byte_avail, p); + } else { + uint64_t t; + ::decode(t, p); + fs_stats.byte_total = t*1024; + ::decode(t, p); + fs_stats.byte_used = t*1024; + ::decode(t, p); + fs_stats.byte_avail = t*1024; + } + ::decode(fs_stats.avail_percent, p); ::decode(last_update, p); if (struct_v > 1) ::decode(store_stats, p); diff --git a/ceph/src/ocf/Makefile.in b/ceph/src/ocf/Makefile.in index 4f243be0..e9e7b16d 100644 --- a/ceph/src/ocf/Makefile.in +++ b/ceph/src/ocf/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +80,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = src/ocf -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/ceph.in $(srcdir)/rbd.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_classpath.m4 \ @@ -88,14 +132,26 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(radir)" SCRIPTS = $(ra_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -323,8 +379,11 @@ rbd: $(top_builddir)/config.status $(srcdir)/rbd.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-raSCRIPTS: $(ra_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(radir)" || $(MKDIR_P) "$(DESTDIR)$(radir)" @list='$(ra_SCRIPTS)'; test -n "$(radir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(radir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(radir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -359,11 +418,11 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -506,17 +565,17 @@ uninstall-am: uninstall-raSCRIPTS .MAKE: install-am install-data-am install-strip uninstall-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-raSCRIPTS install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-hook \ - uninstall-raSCRIPTS + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-raSCRIPTS install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-hook uninstall-raSCRIPTS @WITH_OCF_TRUE@install-data-hook: diff --git a/ceph/src/os/FileJournal.cc b/ceph/src/os/FileJournal.cc index 7eb7927e..5eab7b53 100644 --- a/ceph/src/os/FileJournal.cc +++ b/ceph/src/os/FileJournal.cc @@ -103,12 +103,14 @@ int FileJournal::_open(bool forwrite, bool create) goto out_fd; #ifdef HAVE_LIBAIO - aio_ctx = 0; - ret = io_setup(128, &aio_ctx); - if (ret < 0) { - ret = errno; - derr << "FileJournal::_open: unable to setup io_context " << cpp_strerror(ret) << dendl; - goto out_fd; + if (aio) { + aio_ctx = 0; + ret = io_setup(128, &aio_ctx); + if (ret < 0) { + ret = errno; + derr << "FileJournal::_open: unable to setup io_context " << cpp_strerror(ret) << dendl; + goto out_fd; + } } #endif @@ -544,6 +546,7 @@ void FileJournal::close() // close assert(writeq_empty()); + assert(!must_write_header); assert(fd >= 0); VOID_TEMP_FAILURE_RETRY(::close(fd)); fd = -1; @@ -564,9 +567,9 @@ int FileJournal::dump(ostream& out) JSONFormatter f(true); f.open_array_section("journal"); + uint64_t seq = 0; while (1) { bufferlist bl; - uint64_t seq = 0; uint64_t pos = read_pos; if (!read_entry(bl, seq)) { dout(3) << "journal_replay: end of journal, done." << dendl; @@ -604,7 +607,8 @@ void FileJournal::start_writer() write_stop = false; write_thread.create(); #ifdef HAVE_LIBAIO - write_finish_thread.create(); + if (aio) + write_finish_thread.create(); #endif } @@ -613,19 +617,25 @@ void FileJournal::stop_writer() { Mutex::Locker l(write_lock); #ifdef HAVE_LIBAIO - Mutex::Locker q(aio_lock); + if (aio) + aio_lock.Lock(); #endif Mutex::Locker p(writeq_lock); write_stop = true; writeq_cond.Signal(); #ifdef HAVE_LIBAIO - aio_cond.Signal(); - write_finish_cond.Signal(); + if (aio) { + aio_cond.Signal(); + write_finish_cond.Signal(); + aio_lock.Unlock(); + } #endif } write_thread.join(); #ifdef HAVE_LIBAIO - write_finish_thread.join(); + if (aio) { + write_finish_thread.join(); + } #endif } @@ -649,6 +659,13 @@ int FileJournal::read_header() buffer::ptr bp = buffer::create_page_aligned(block_size); bp.zero(); int r = ::pread(fd, bp.c_str(), bp.length(), 0); + + if (r < 0) { + int err = errno; + dout(0) << "read_header got " << cpp_strerror(err) << dendl; + return -err; + } + bl.push_back(bp); try { @@ -660,11 +677,6 @@ int FileJournal::read_header() return -EINVAL; } - if (r < 0) { - int err = errno; - dout(0) << "read_header got " << cpp_strerror(err) << dendl; - return -err; - } /* * Unfortunately we weren't initializing the flags field for new @@ -1102,7 +1114,7 @@ void FileJournal::write_thread_entry() while (1) { { Mutex::Locker locker(writeq_lock); - if (writeq.empty()) { + if (writeq.empty() && !must_write_header) { if (write_stop) break; dout(20) << "write_thread_entry going to sleep" << dendl; @@ -1113,7 +1125,9 @@ void FileJournal::write_thread_entry() } #ifdef HAVE_LIBAIO - if (aio) { + //We hope write_finish_thread_entry return until the last aios complete + //when set write_stop. But it can't. So don't use aio mode when shutdown. + if (aio && !write_stop) { Mutex::Locker locker(aio_lock); // should we back off to limit aios in flight? try to do this // adaptively so that we submit larger aios once we have lots of @@ -1164,7 +1178,7 @@ void FileJournal::write_thread_entry() } #ifdef HAVE_LIBAIO - if (aio) + if (aio && !write_stop) do_aio_write(bl); else do_write(bl); @@ -1353,7 +1367,7 @@ void FileJournal::write_finish_thread_entry() aio_info *ai = (aio_info *)event[i].obj; if (event[i].res != ai->len) { derr << "aio to " << ai->off << "~" << ai->len - << " got " << cpp_strerror(event[i].res) << dendl; + << " wrote " << event[i].res << dendl; assert(0 == "unexpected aio error"); } dout(10) << "write_finish_thread_entry aio " << ai->off @@ -1376,7 +1390,7 @@ void FileJournal::check_aio_completion() assert(aio_lock.is_locked()); dout(20) << "check_aio_completion" << dendl; - bool completed_something = false; + bool completed_something = false, signal = false; uint64_t new_journaled_seq = 0; list::iterator p = aio_queue.begin(); @@ -1390,6 +1404,7 @@ void FileJournal::check_aio_completion() aio_num--; aio_bytes -= p->len; aio_queue.erase(p++); + signal = true; } if (completed_something) { @@ -1409,7 +1424,8 @@ void FileJournal::check_aio_completion() queue_completions_thru(journaled_seq); } } - + } + if (signal) { // maybe write queue was waiting for aio count to drop? aio_cond.Signal(); } diff --git a/ceph/src/osd/ECBackend.cc b/ceph/src/osd/ECBackend.cc index aefbb5e3..39e3429e 100644 --- a/ceph/src/osd/ECBackend.cc +++ b/ceph/src/osd/ECBackend.cc @@ -1245,10 +1245,18 @@ void ECBackend::submit_transaction( for (set::iterator i = need_hinfos.begin(); i != need_hinfos.end(); ++i) { + ECUtil::HashInfoRef ref = get_hash_info(*i); + if (!ref) { + derr << __func__ << ": get_hash_info(" << *i << ")" + << " returned a null pointer and there is no " + << " way to recover from such an error in this " + << " context" << dendl; + assert(0); + } op->unstable_hash_infos.insert( make_pair( *i, - get_hash_info(*i))); + ref)); } for (vector::iterator i = op->log_entries.begin(); @@ -1458,7 +1466,7 @@ ECUtil::HashInfoRef ECBackend::get_hash_info( ::decode(hinfo, bp); assert(hinfo.get_total_chunk_size() == (unsigned)st.st_size); } else { - assert(0 == "missing hash attr"); + return ECUtil::HashInfoRef(); } } ref = unstable_hashinfo_registry.lookup_or_create(hoid, hinfo); @@ -1754,31 +1762,37 @@ void ECBackend::be_deep_scrub( break; } - ECUtil::HashInfoRef hinfo = get_hash_info(poid); if (r == -EIO) { dout(0) << "_scan_list " << poid << " got " << r << " on read, read_error" << dendl; o.read_error = true; } - if (hinfo->get_chunk_hash(get_parent()->whoami_shard().shard) != h.digest()) { - dout(0) << "_scan_list " << poid << " got incorrect hash on read" << dendl; + ECUtil::HashInfoRef hinfo = get_hash_info(poid); + if (!hinfo) { + dout(0) << "_scan_list " << poid << " could not retrieve hash info" << dendl; o.read_error = true; - } + o.digest_present = false; + } else { + if (hinfo->get_chunk_hash(get_parent()->whoami_shard().shard) != h.digest()) { + dout(0) << "_scan_list " << poid << " got incorrect hash on read" << dendl; + o.read_error = true; + } - if (hinfo->get_total_chunk_size() != pos) { - dout(0) << "_scan_list " << poid << " got incorrect size on read" << dendl; - o.read_error = true; - } + if (hinfo->get_total_chunk_size() != pos) { + dout(0) << "_scan_list " << poid << " got incorrect size on read" << dendl; + o.read_error = true; + } - /* We checked above that we match our own stored hash. We cannot - * send a hash of the actual object, so instead we simply send - * our locally stored hash of shard 0 on the assumption that if - * we match our chunk hash and our recollection of the hash for - * chunk 0 matches that of our peers, there is likely no corruption. - */ - o.digest = hinfo->get_chunk_hash(0); - o.digest_present = true; + /* We checked above that we match our own stored hash. We cannot + * send a hash of the actual object, so instead we simply send + * our locally stored hash of shard 0 on the assumption that if + * we match our chunk hash and our recollection of the hash for + * chunk 0 matches that of our peers, there is likely no corruption. + */ + o.digest = hinfo->get_chunk_hash(0); + o.digest_present = true; + } o.omap_digest = 0; o.omap_digest_present = true; diff --git a/ceph/src/osd/OSD.cc b/ceph/src/osd/OSD.cc index dc67fdd7..77ed17ae 100644 --- a/ceph/src/osd/OSD.cc +++ b/ceph/src/osd/OSD.cc @@ -3762,6 +3762,53 @@ void OSD::_send_boot() monc->send_mon_message(mboot); } +bool OSD::_lsb_release_set (char *buf, const char *str, map *pm, const char *key) +{ + if (strncmp (buf, str, strlen (str)) == 0) { + char *value; + + if (buf[strlen(buf)-1] == '\n') + buf[strlen(buf)-1] = '\0'; + + value = buf + strlen (str) + 1; + (*pm)[key] = value; + + return true; + } + return false; +} + +void OSD::_lsb_release_parse (map *pm) +{ + FILE *fp = NULL; + char buf[512]; + + fp = popen("lsb_release -idrc", "r"); + if (!fp) { + int ret = -errno; + derr << "lsb_release_parse - failed to call lsb_release binary with error: " << cpp_strerror(ret) << dendl; + return; + } + + while (fgets(buf, sizeof(buf) - 1, fp) != NULL) { + if (_lsb_release_set(buf, "Distributor ID:", pm, "distro")) + continue; + if (_lsb_release_set(buf, "Description:", pm, "distro_description")) + continue; + if (_lsb_release_set(buf, "Release:", pm, "distro_version")) + continue; + if (_lsb_release_set(buf, "Codename:", pm, "distro_codename")) + continue; + + derr << "unhandled output: " << buf << dendl; + } + + if (pclose(fp)) { + int ret = -errno; + derr << "lsb_release_parse - pclose failed: " << cpp_strerror(ret) << dendl; + } +} + void OSD::_collect_metadata(map *pm) { (*pm)["ceph_version"] = pretty_version_to_str(); @@ -3831,34 +3878,7 @@ void OSD::_collect_metadata(map *pm) } // distro info - f = fopen("/etc/lsb-release", "r"); - if (f) { - char buf[100]; - while (!feof(f)) { - char *line = fgets(buf, sizeof(buf), f); - if (!line) - break; - char *eq = strchr(buf, '='); - if (!eq) - break; - *eq = '\0'; - ++eq; - while (*eq == '\"') - ++eq; - while (*eq && (eq[strlen(eq)-1] == '\n' || - eq[strlen(eq)-1] == '\"')) - eq[strlen(eq)-1] = '\0'; - if (strcmp(buf, "DISTRIB_ID") == 0) - (*pm)["distro"] = eq; - else if (strcmp(buf, "DISTRIB_RELEASE") == 0) - (*pm)["distro_version"] = eq; - else if (strcmp(buf, "DISTRIB_CODENAME") == 0) - (*pm)["distro_codename"] = eq; - else if (strcmp(buf, "DISTRIB_DESCRIPTION") == 0) - (*pm)["distro_description"] = eq; - } - fclose(f); - } + _lsb_release_parse(pm); dout(10) << __func__ << " " << *pm << dendl; } @@ -5784,8 +5804,13 @@ bool OSD::advance_pg( next_epoch <= osd_epoch && next_epoch <= max; ++next_epoch) { OSDMapRef nextmap = service.try_get_map(next_epoch); - if (!nextmap) + if (!nextmap) { + dout(20) << __func__ << " missing map " << next_epoch << dendl; + // make sure max is bumped up so that we can get past any + // gap in maps + max = MAX(max, next_epoch + g_conf->osd_map_max_advance); continue; + } vector newup, newacting; int up_primary, acting_primary; @@ -5816,7 +5841,7 @@ bool OSD::advance_pg( service.pg_update_epoch(pg->info.pgid, lastmap->get_epoch()); pg->handle_activate_map(rctx); if (next_epoch <= osd_epoch) { - dout(10) << __func__ << " advanced by max " << g_conf->osd_map_max_advance + dout(10) << __func__ << " advanced to max " << max << " past min epoch " << min_epoch << " ... will requeue " << *pg << dendl; return false; @@ -5874,10 +5899,7 @@ void OSD::advance_map(ObjectStore::Transaction& t, C_Contexts *tfin) while (p != waiting_for_pg.end()) { spg_t pgid = p->first; - vector acting; - int nrep = osdmap->pg_to_acting_osds(pgid.pgid, acting); - int role = osdmap->calc_pg_role(whoami, acting, nrep); - if (role >= 0) { + if (osdmap->osd_is_valid_op_target(pgid.pgid, whoami)) { ++p; // still me } else { dout(10) << " discarding waiting ops for " << pgid << dendl; @@ -6732,7 +6754,8 @@ void OSD::handle_pg_notify(OpRequestRef op) PG::CephPeeringEvtRef( new PG::CephPeeringEvt( it->first.epoch_sent, it->first.query_epoch, - PG::MNotifyRec(pg_shard_t(from, it->first.from), it->first))) + PG::MNotifyRec(pg_shard_t(from, it->first.from), it->first, + op->get_req()->get_connection()->get_features()))) ); } } @@ -7564,7 +7587,7 @@ void OSD::handle_op(OpRequestRef op) if (!pg) { dout(7) << "hit non-existent pg " << pgid << dendl; - if (osdmap->get_pg_acting_role(pgid.pgid, whoami) >= 0) { + if (osdmap->osd_is_valid_op_target(pgid.pgid, whoami)) { dout(7) << "we are valid target for op, waiting" << dendl; waiting_for_pg[pgid].push_back(op); op->mark_delayed("waiting for pg to exist locally"); @@ -7578,7 +7601,7 @@ void OSD::handle_op(OpRequestRef op) } OSDMapRef send_map = get_map(m->get_map_epoch()); - if (send_map->get_pg_acting_role(pgid.pgid, whoami) >= 0) { + if (send_map->osd_is_valid_op_target(pgid.pgid, whoami)) { dout(7) << "dropping request; client will resend when they get new map" << dendl; } else if (!send_map->have_pg_pool(pgid.pool())) { dout(7) << "dropping request; pool did not exist" << dendl; @@ -7835,7 +7858,9 @@ void OSD::process_peering_events( continue; } if (!advance_pg(curmap->get_epoch(), pg, handle, &rctx, &split_pgs)) { - pg->queue_null(curmap->get_epoch(), curmap->get_epoch()); + // we need to requeue the PG explicitly since we didn't actually + // handle an event + peering_wq.queue(pg); } else if (!pg->peering_queue.empty()) { PG::CephPeeringEvtRef evt = pg->peering_queue.front(); pg->peering_queue.pop_front(); @@ -7931,7 +7956,12 @@ void OSD::set_disk_tp_priority() << dendl; int cls = ceph_ioprio_string_to_class(cct->_conf->osd_disk_thread_ioprio_class); - disk_tp.set_ioprio(cls, cct->_conf->osd_disk_thread_ioprio_priority); + if (cls < 0) + derr << __func__ << cpp_strerror(cls) << ": " + << "osd_disk_thread_ioprio_class is " << cct->_conf->osd_disk_thread_ioprio_class + << " but only the following values are allowed: idle, be or rt" << dendl; + else + disk_tp.set_ioprio(cls, cct->_conf->osd_disk_thread_ioprio_priority); } // -------------------------------- diff --git a/ceph/src/osd/OSD.h b/ceph/src/osd/OSD.h index e2a3c8e3..9d03e4dc 100644 --- a/ceph/src/osd/OSD.h +++ b/ceph/src/osd/OSD.h @@ -1472,6 +1472,8 @@ protected: void _maybe_boot(epoch_t oldest, epoch_t newest); void _send_boot(); void _collect_metadata(map *pmeta); + bool _lsb_release_set(char *buf, const char *str, map *pm, const char *key); + void _lsb_release_parse (map *pm); void start_waiting_for_healthy(); bool _is_healthy(); diff --git a/ceph/src/osd/OSDMap.h b/ceph/src/osd/OSDMap.h index a3475836..b3b7ab6e 100644 --- a/ceph/src/osd/OSDMap.h +++ b/ceph/src/osd/OSDMap.h @@ -777,6 +777,18 @@ public: return calc_pg_role(osd, group, nrep); } + bool osd_is_valid_op_target(pg_t pg, int osd) const { + int primary; + vector group; + int nrep = pg_to_acting_osds(pg, &group, &primary); + if (osd == primary) + return true; + if (pg_is_ec(pg)) + return false; + + return calc_pg_role(osd, group, nrep) >= 0; + } + /* * handy helpers to build simple maps... diff --git a/ceph/src/osd/PG.cc b/ceph/src/osd/PG.cc index 9356df49..ebc2020c 100644 --- a/ceph/src/osd/PG.cc +++ b/ceph/src/osd/PG.cc @@ -194,7 +194,8 @@ PG::PG(OSDService *o, OSDMapRef curmap, finish_sync_event(NULL), scrub_after_recovery(false), active_pushes(0), - recovery_state(this) + recovery_state(this), + peer_features((uint64_t)-1) { #ifdef PG_DEBUG_REFS osd->add_pgid(p, this); @@ -1552,6 +1553,9 @@ void PG::activate(ObjectStore::Transaction& t, pi.hit_set = info.hit_set; pi.stats.stats.clear(); + // initialize peer with our purged_snaps. + pi.purged_snaps = info.purged_snaps; + m = new MOSDPGLog( i->shard, pg_whoami.shard, get_osdmap()->get_epoch(), pi); @@ -4685,7 +4689,10 @@ bool PG::old_peering_msg(epoch_t reply_epoch, epoch_t query_epoch) void PG::set_last_peering_reset() { dout(20) << "set_last_peering_reset " << get_osdmap()->get_epoch() << dendl; - last_peering_reset = get_osdmap()->get_epoch(); + if (last_peering_reset != get_osdmap()->get_epoch()) { + last_peering_reset = get_osdmap()->get_epoch(); + reset_interval_flush(); + } } struct FlushState { @@ -4739,7 +4746,6 @@ void PG::start_peering_interval( const OSDMapRef osdmap = get_osdmap(); set_last_peering_reset(); - reset_interval_flush(); vector oldacting, oldup; int oldrole = get_role(); @@ -5277,37 +5283,6 @@ void PG::queue_peering_event(CephPeeringEvtRef evt) osd->queue_for_peering(this); } -void PG::queue_notify(epoch_t msg_epoch, - epoch_t query_epoch, - pg_shard_t from, pg_notify_t& i) -{ - dout(10) << "notify " << i << " from replica " << from << dendl; - queue_peering_event( - CephPeeringEvtRef(new CephPeeringEvt(msg_epoch, query_epoch, - MNotifyRec(from, i)))); -} - -void PG::queue_info(epoch_t msg_epoch, - epoch_t query_epoch, - pg_shard_t from, pg_info_t& i) -{ - dout(10) << "info " << i << " from replica " << from << dendl; - queue_peering_event( - CephPeeringEvtRef(new CephPeeringEvt(msg_epoch, query_epoch, - MInfoRec(from, i, msg_epoch)))); -} - -void PG::queue_log(epoch_t msg_epoch, - epoch_t query_epoch, - pg_shard_t from, - MOSDPGLog *msg) -{ - dout(10) << "log " << *msg << " from replica " << from << dendl; - queue_peering_event( - CephPeeringEvtRef(new CephPeeringEvt(msg_epoch, query_epoch, - MLogRec(from, msg)))); -} - void PG::queue_null(epoch_t msg_epoch, epoch_t query_epoch) { @@ -5810,8 +5785,29 @@ PG::RecoveryState::Backfilling::react(const RemoteReservationRejected &) pg->osd->local_reserver.cancel_reservation(pg->info.pgid); pg->state_set(PG_STATE_BACKFILL_TOOFULL); + for (set::iterator it = pg->backfill_targets.begin(); + it != pg->backfill_targets.end(); + ++it) { + assert(*it != pg->pg_whoami); + ConnectionRef con = pg->osd->get_con_osd_cluster( + it->osd, pg->get_osdmap()->get_epoch()); + if (con) { + if (con->has_feature(CEPH_FEATURE_BACKFILL_RESERVATION)) { + pg->osd->send_message_osd_cluster( + new MBackfillReserve( + MBackfillReserve::REJECT, + spg_t(pg->info.pgid.pgid, it->shard), + pg->get_osdmap()->get_epoch()), + con.get()); + } + } + } + pg->osd->recovery_wq.dequeue(pg); + pg->waiting_on_backfill.clear(); + pg->finish_recovery_op(hobject_t::get_max()); + pg->schedule_backfill_full_retry(); return transit(); } @@ -6066,14 +6062,33 @@ boost::statechart::result PG::RecoveryState::RepWaitBackfillReserved::react(const RemoteBackfillReserved &evt) { PG *pg = context< RecoveryMachine >().pg; - pg->osd->send_message_osd_cluster( - pg->primary.osd, - new MBackfillReserve( - MBackfillReserve::GRANT, - spg_t(pg->info.pgid.pgid, pg->primary.shard), - pg->get_osdmap()->get_epoch()), - pg->get_osdmap()->get_epoch()); - return transit(); + + double ratio, max_ratio; + if (g_conf->osd_debug_reject_backfill_probability > 0 && + (rand()%1000 < (g_conf->osd_debug_reject_backfill_probability*1000.0))) { + dout(10) << "backfill reservation rejected after reservation: " + << "failure injection" << dendl; + pg->osd->remote_reserver.cancel_reservation(pg->info.pgid); + post_event(RemoteReservationRejected()); + return discard_event(); + } else if (pg->osd->too_full_for_backfill(&ratio, &max_ratio) && + !pg->cct->_conf->osd_debug_skip_full_check_in_backfill_reservation) { + dout(10) << "backfill reservation rejected after reservation: full ratio is " + << ratio << ", which is greater than max allowed ratio " + << max_ratio << dendl; + pg->osd->remote_reserver.cancel_reservation(pg->info.pgid); + post_event(RemoteReservationRejected()); + return discard_event(); + } else { + pg->osd->send_message_osd_cluster( + pg->primary.osd, + new MBackfillReserve( + MBackfillReserve::GRANT, + spg_t(pg->info.pgid.pgid, pg->primary.shard), + pg->get_osdmap()->get_epoch()), + pg->get_osdmap()->get_epoch()); + return transit(); + } } boost::statechart::result @@ -6097,7 +6112,7 @@ PG::RecoveryState::RepRecovering::react(const BackfillTooFull &) { PG *pg = context< RecoveryMachine >().pg; pg->reject_reservation(); - return transit(); + return discard_event(); } void PG::RecoveryState::RepRecovering::exit() @@ -6839,6 +6854,7 @@ PG::RecoveryState::GetInfo::GetInfo(my_context ctx) pg->publish_stats_to_osd(); + pg->reset_peer_features(); get_infos(); if (peer_info_requested.empty() && !prior_set->pg_down) { post_event(GotInfo()); @@ -6906,6 +6922,9 @@ boost::statechart::result PG::RecoveryState::GetInfo::react(const MNotifyRec& in } get_infos(); } + dout(20) << "Adding osd: " << infoevt.from.osd << " features: " + << hex << infoevt.features << dec << dendl; + pg->apply_peer_features(infoevt.features); // are we done getting everything? if (peer_info_requested.empty() && !prior_set->pg_down) { @@ -6964,6 +6983,7 @@ boost::statechart::result PG::RecoveryState::GetInfo::react(const MNotifyRec& in break; } } + dout(20) << "Common features: " << hex << pg->get_min_peer_features() << dec << dendl; post_event(GotInfo()); } } diff --git a/ceph/src/osd/PG.h b/ceph/src/osd/PG.h index 1aadaf03..e3194779 100644 --- a/ceph/src/osd/PG.h +++ b/ceph/src/osd/PG.h @@ -1308,10 +1308,12 @@ public: struct MNotifyRec : boost::statechart::event< MNotifyRec > { pg_shard_t from; pg_notify_t notify; - MNotifyRec(pg_shard_t from, pg_notify_t ¬ify) : - from(from), notify(notify) {} + uint64_t features; + MNotifyRec(pg_shard_t from, pg_notify_t ¬ify, uint64_t f) : + from(from), notify(notify), features(f) {} void print(std::ostream *out) const { - *out << "MNotifyRec from " << from << " notify: " << notify; + *out << "MNotifyRec from " << from << " notify: " << notify + << " features: 0x" << hex << features << dec; } }; @@ -1993,11 +1995,16 @@ public: // Prevent copying PG(const PG& rhs); PG& operator=(const PG& rhs); + uint64_t peer_features; public: spg_t get_pgid() const { return info.pgid; } int get_nrep() const { return acting.size(); } + void reset_peer_features() { peer_features = (uint64_t)-1; } + uint64_t get_min_peer_features() { return peer_features; } + void apply_peer_features(uint64_t f) { peer_features &= f; } + void init_primary_up_acting( const vector &newup, const vector &newacting, @@ -2189,12 +2196,6 @@ public: void take_waiters(); void queue_peering_event(CephPeeringEvtRef evt); void handle_peering_event(CephPeeringEvtRef evt, RecoveryCtx *rctx); - void queue_notify(epoch_t msg_epoch, epoch_t query_epoch, - pg_shard_t from, pg_notify_t& i); - void queue_info(epoch_t msg_epoch, epoch_t query_epoch, - pg_shard_t from, pg_info_t& i); - void queue_log(epoch_t msg_epoch, epoch_t query_epoch, pg_shard_t from, - MOSDPGLog *msg); void queue_query(epoch_t msg_epoch, epoch_t query_epoch, pg_shard_t from, const pg_query_t& q); void queue_null(epoch_t msg_epoch, epoch_t query_epoch); diff --git a/ceph/src/osd/ReplicatedPG.cc b/ceph/src/osd/ReplicatedPG.cc index d23e6fc9..e149abfd 100644 --- a/ceph/src/osd/ReplicatedPG.cc +++ b/ceph/src/osd/ReplicatedPG.cc @@ -595,6 +595,7 @@ int ReplicatedPG::do_command(cmdmap_t cmdmap, ostream& ss, if (command == "query") { f->open_object_section("pg"); f->dump_string("state", pg_state_string(get_state())); + f->dump_stream("snap_trimq") << snap_trimq; f->dump_unsigned("epoch", get_osdmap()->get_epoch()); f->open_array_section("up"); for (vector::iterator p = up.begin(); p != up.end(); ++p) @@ -2072,12 +2073,16 @@ void ReplicatedPG::do_scan( } peer_backfill_info[from] = bi; - assert(waiting_on_backfill.find(from) != waiting_on_backfill.end()); - waiting_on_backfill.erase(from); + if (waiting_on_backfill.find(from) != waiting_on_backfill.end()) { + waiting_on_backfill.erase(from); - if (waiting_on_backfill.empty()) { - assert(peer_backfill_info.size() == backfill_targets.size()); - finish_recovery_op(hobject_t::get_max()); + if (waiting_on_backfill.empty()) { + assert(peer_backfill_info.size() == backfill_targets.size()); + finish_recovery_op(hobject_t::get_max()); + } + } else { + // we canceled backfill for a while due to a too full, and this + // is an extra response from a non-too-full peer } } break; @@ -2560,10 +2565,6 @@ void ReplicatedPG::snap_trimmer() // replica collection trimming snap_trimmer_machine.process_event(SnapTrim()); } - if (snap_trimmer_machine.requeue) { - dout(10) << "snap_trimmer requeue" << dendl; - queue_snap_trim(); - } unlock(); return; } @@ -3353,6 +3354,11 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) break; } result = _delete_oid(ctx, true); + if (result >= 0) { + // mark that this is a cache eviction to avoid triggering normal + // make_writeable() clone or snapdir object creation in finish_ctx() + ctx->cache_evict = true; + } osd->logger->inc(l_osd_tier_evict); } break; @@ -3645,6 +3651,10 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) case CEPH_OSD_OP_SETALLOCHINT: ++ctx->num_write; { + if (!(get_min_peer_features() & CEPH_FEATURE_OSD_SET_ALLOC_HINT)) { + result = -EOPNOTSUPP; + break; + } if (!obs.exists) { ctx->mod_desc.create(); t->touch(soid); @@ -4836,6 +4846,7 @@ void ReplicatedPG::make_writeable(OpContext *ctx) if ((ctx->obs->exists && !ctx->obs->oi.is_whiteout()) && // head exist(ed) snapc.snaps.size() && // there are snaps + !ctx->cache_evict && snapc.snaps[0] > ctx->new_snapset.seq) { // existing object is old // clone hobject_t coid = soid; @@ -5156,7 +5167,8 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc ctx->snapset_obc->obs.exists = false; } } - } else if (ctx->new_snapset.clones.size()) { + } else if (ctx->new_snapset.clones.size() && + !ctx->cache_evict) { // save snapset on _snap hobject_t snapoid(soid.oid, soid.get_key(), CEPH_SNAPDIR, soid.hash, info.pgid.pool(), soid.get_namespace()); @@ -6968,6 +6980,7 @@ void ReplicatedPG::check_blacklisted_obc_watchers(ObjectContextRef obc) if (get_osdmap()->is_blacklisted(ea)) { dout(10) << "watch: Found blacklisted watcher for " << ea << dendl; assert(j->second->get_pg() == this); + j->second->unregister_cb(); handle_watch_timeout(j->second); } } @@ -9334,6 +9347,13 @@ void ReplicatedPG::on_removal(ObjectStore::Transaction *t) // adjust info to backfill info.last_backfill = hobject_t(); dirty_info = true; + + + // clear log + PGLogEntryHandler rollbacker; + pg_log.clear_can_rollback_to(&rollbacker); + rollbacker.apply(this, t); + write_if_dirty(*t); on_shutdown(); @@ -10952,7 +10972,7 @@ void ReplicatedPG::hit_set_persist() pg_log_entry_t::MODIFY, oid, ctx->at_version, - ctx->obs->oi.version, + eversion_t(), 0, osd_reqid_t(), ctx->mtime) @@ -11974,13 +11994,11 @@ ReplicatedPG::NotTrimming::NotTrimming(my_context ctx) : my_base(ctx), NamedState(context< SnapTrimmer >().pg->cct, "NotTrimming") { - context< SnapTrimmer >().requeue = false; context< SnapTrimmer >().log_enter(state_name); } void ReplicatedPG::NotTrimming::exit() { - context< SnapTrimmer >().requeue = true; context< SnapTrimmer >().log_exit(state_name, enter_time); } @@ -12040,32 +12058,45 @@ boost::statechart::result ReplicatedPG::TrimmingObjects::react(const SnapTrim&) dout(10) << "TrimmingObjects: trimming snap " << snap_to_trim << dendl; - // Get next - hobject_t old_pos = pos; - int r = pg->snap_mapper.get_next_object_to_trim(snap_to_trim, &pos); - if (r != 0 && r != -ENOENT) { - derr << __func__ << ": get_next returned " << cpp_strerror(r) << dendl; - assert(0); - } else if (r == -ENOENT) { - // Done! - dout(10) << "TrimmingObjects: got ENOENT" << dendl; - post_event(SnapTrim()); - return transit< WaitingOnReplicas >(); + for (set::iterator i = repops.begin(); + i != repops.end(); + ) { + if ((*i)->all_applied && (*i)->all_committed) { + (*i)->put(); + repops.erase(i++); + } else { + ++i; + } } - dout(10) << "TrimmingObjects react trimming " << pos << dendl; - RepGather *repop = pg->trim_object(pos); - if (!repop) { - dout(10) << __func__ << " could not get write lock on obj " - << pos << dendl; - pos = old_pos; - return discard_event(); - } - assert(repop); - repop->queue_snap_trimmer = true; + while (repops.size() < g_conf->osd_pg_max_concurrent_snap_trims) { + // Get next + hobject_t old_pos = pos; + int r = pg->snap_mapper.get_next_object_to_trim(snap_to_trim, &pos); + if (r != 0 && r != -ENOENT) { + derr << __func__ << ": get_next returned " << cpp_strerror(r) << dendl; + assert(0); + } else if (r == -ENOENT) { + // Done! + dout(10) << "TrimmingObjects: got ENOENT" << dendl; + post_event(SnapTrim()); + return transit< WaitingOnReplicas >(); + } + + dout(10) << "TrimmingObjects react trimming " << pos << dendl; + RepGather *repop = pg->trim_object(pos); + if (!repop) { + dout(10) << __func__ << " could not get write lock on obj " + << pos << dendl; + pos = old_pos; + return discard_event(); + } + assert(repop); + repop->queue_snap_trimmer = true; - repops.insert(repop->get()); - pg->simple_repop_submit(repop); + repops.insert(repop->get()); + pg->simple_repop_submit(repop); + } return discard_event(); } /* WaitingOnReplicasObjects */ @@ -12074,7 +12105,6 @@ ReplicatedPG::WaitingOnReplicas::WaitingOnReplicas(my_context ctx) NamedState(context< SnapTrimmer >().pg->cct, "Trimming/WaitingOnReplicas") { context< SnapTrimmer >().log_enter(state_name); - context< SnapTrimmer >().requeue = false; } void ReplicatedPG::WaitingOnReplicas::exit() @@ -12099,7 +12129,7 @@ boost::statechart::result ReplicatedPG::WaitingOnReplicas::react(const SnapTrim& for (set::iterator i = repops.begin(); i != repops.end(); repops.erase(i++)) { - if (!(*i)->all_applied) { + if (!(*i)->all_applied || !(*i)->all_committed) { return discard_event(); } else { (*i)->put(); @@ -12124,7 +12154,7 @@ boost::statechart::result ReplicatedPG::WaitingOnReplicas::react(const SnapTrim& context().need_share_pg_info = true; // Back to the start - post_event(SnapTrim()); + pg->queue_snap_trim(); return transit< NotTrimming >(); } diff --git a/ceph/src/osd/ReplicatedPG.h b/ceph/src/osd/ReplicatedPG.h index 9ef131c1..dc8ee625 100644 --- a/ceph/src/osd/ReplicatedPG.h +++ b/ceph/src/osd/ReplicatedPG.h @@ -438,6 +438,7 @@ public: bool modify; // (force) modification (even if op_t is empty) bool user_modify; // user-visible modification bool undirty; // user explicitly un-dirtying this object + bool cache_evict; ///< true if this is a cache eviction // side effects list watch_connects; @@ -539,7 +540,7 @@ public: ReplicatedPG *_pg) : op(_op), reqid(_reqid), ops(_ops), obs(_obs), snapset(0), new_obs(_obs->oi, _obs->exists), - modify(false), user_modify(false), undirty(false), + modify(false), user_modify(false), undirty(false), cache_evict(false), bytes_written(0), bytes_read(0), user_at_version(0), current_osd_subop_num(0), op_t(NULL), @@ -1331,8 +1332,7 @@ private: set repops; snapid_t snap_to_trim; bool need_share_pg_info; - bool requeue; - SnapTrimmer(ReplicatedPG *pg) : pg(pg), need_share_pg_info(false), requeue(false) {} + SnapTrimmer(ReplicatedPG *pg) : pg(pg), need_share_pg_info(false) {} ~SnapTrimmer(); void log_enter(const char *state_name); void log_exit(const char *state_name, utime_t duration); diff --git a/ceph/src/osd/Watch.h b/ceph/src/osd/Watch.h index e2cbfc1b..91a45749 100644 --- a/ceph/src/osd/Watch.h +++ b/ceph/src/osd/Watch.h @@ -98,6 +98,7 @@ class Notify { /// removes the timeout callback, called on completion or cancellation void unregister_cb(); public: + string gen_dbg_prefix() { stringstream ss; ss << "Notify(" << make_pair(cookie, notify_id) << " " @@ -172,15 +173,15 @@ class Watch { /// Registers the timeout callback with watch_timer void register_cb(); - /// Unregisters the timeout callback - void unregister_cb(); - /// send a Notify message when connected for notif void send_notify(NotifyRef notif); /// Cleans up state on discard or remove (including Connection state, obc) void discard_state(); public: + /// Unregisters the timeout callback + void unregister_cb(); + /// NOTE: must be called with pg lock held ~Watch(); diff --git a/ceph/src/osd/osd_types.cc b/ceph/src/osd/osd_types.cc index 16bdbaf3..d08e9b7d 100644 --- a/ceph/src/osd/osd_types.cc +++ b/ceph/src/osd/osd_types.cc @@ -2179,9 +2179,9 @@ void pg_interval_t::dump(Formatter *f) const f->open_array_section("acting"); for (vector::const_iterator p = acting.begin(); p != acting.end(); ++p) f->dump_int("osd", *p); + f->close_section(); f->dump_int("primary", primary); f->dump_int("up_primary", up_primary); - f->close_section(); } void pg_interval_t::generate_test_instances(list& o) @@ -2235,9 +2235,15 @@ bool pg_interval_t::check_new_interval( i.primary = old_acting_primary; i.up_primary = old_up_primary; - if (!i.acting.empty() && i.primary != -1 && - i.acting.size() >= - lastmap->get_pools().find(pool_id)->second.min_size) { + unsigned num_acting = 0; + for (vector::const_iterator p = i.acting.begin(); p != i.acting.end(); + ++p) + if (*p != CRUSH_ITEM_NONE) + ++num_acting; + + if (num_acting && + i.primary != -1 && + num_acting >= lastmap->get_pools().find(pgid.pool())->second.min_size) { if (out) *out << "generate_past_intervals " << i << ": not rw," diff --git a/ceph/src/osdc/ObjectCacher.cc b/ceph/src/osdc/ObjectCacher.cc index e1499b41..58fc6e5c 100644 --- a/ceph/src/osdc/ObjectCacher.cc +++ b/ceph/src/osdc/ObjectCacher.cc @@ -710,6 +710,9 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid, } } + ls.splice(ls.end(), waitfor_read); + waitfor_read.clear(); + // apply to bh's! loff_t opos = start; while (true) { @@ -1111,13 +1114,26 @@ int ObjectCacher::_readx(OSDRead *rd, ObjectSet *oset, Context *onfinish, for (map::iterator bh_it = missing.begin(); bh_it != missing.end(); ++bh_it) { - bh_read(bh_it->second); - if (success && onfinish) { - ldout(cct, 10) << "readx missed, waiting on " << *bh_it->second - << " off " << bh_it->first << dendl; - bh_it->second->waitfor_read[bh_it->first].push_back( new C_RetryRead(this, rd, oset, onfinish) ); + loff_t clean = get_stat_clean() + get_stat_rx() + + bh_it->second->length(); + if (get_stat_rx() > 0 && static_cast(clean) > max_size) { + // cache is full -- wait for rx's to complete + ldout(cct, 10) << "readx missed, waiting on cache to free " + << (clean - max_size) << " bytes" << dendl; + if (success) { + waitfor_read.push_back(new C_RetryRead(this, rd, oset, onfinish)); + } + bh_remove(o, bh_it->second); + delete bh_it->second; + } else { + bh_read(bh_it->second); + if (success && onfinish) { + ldout(cct, 10) << "readx missed, waiting on " << *bh_it->second + << " off " << bh_it->first << dendl; + bh_it->second->waitfor_read[bh_it->first].push_back( new C_RetryRead(this, rd, oset, onfinish) ); + } + bytes_not_in_cache += bh_it->second->length(); } - bytes_not_in_cache += bh_it->second->length(); success = false; } diff --git a/ceph/src/osdc/ObjectCacher.h b/ceph/src/osdc/ObjectCacher.h index d2aebe98..5b939984 100644 --- a/ceph/src/osdc/ObjectCacher.h +++ b/ceph/src/osdc/ObjectCacher.h @@ -340,6 +340,7 @@ class ObjectCacher { void *flush_set_callback_arg; vector > objects; // indexed by pool_id + list waitfor_read; ceph_tid_t last_read_tid; diff --git a/ceph/src/osdc/Objecter.cc b/ceph/src/osdc/Objecter.cc index d82b3e12..57954a59 100644 --- a/ceph/src/osdc/Objecter.cc +++ b/ceph/src/osdc/Objecter.cc @@ -1615,7 +1615,10 @@ void Objecter::finish_op(Op *op) ops.erase(op->tid); logger->set(l_osdc_op_active, ops.size()); - assert(check_latest_map_ops.find(op->tid) == check_latest_map_ops.end()); + + // our reply may have raced with pool deletion resulting in a map + // check in flight. + op_cancel_map_check(op); if (op->ontimeout) timer.cancel_event(op->ontimeout); @@ -1640,7 +1643,9 @@ void Objecter::send_op(Op *op) ldout(cct, 20) << " revoking rx buffer for " << op->tid << " on " << op->con << dendl; op->con->revoke_rx_buffer(op->tid); } - if (op->outbl && op->outbl->length()) { + if (op->outbl && + op->ontimeout == NULL && // only post rx_buffer if no timeout; see #9582 + op->outbl->length()) { ldout(cct, 20) << " posting rx buffer for " << op->tid << " on " << op->session->con << dendl; op->con = op->session->con; op->con->post_rx_buffer(op->tid, *op->outbl); diff --git a/ceph/src/pybind/rados.py b/ceph/src/pybind/rados.py index 0fbd10e6..ec689193 100644 --- a/ceph/src/pybind/rados.py +++ b/ceph/src/pybind/rados.py @@ -246,7 +246,8 @@ Rados object in state %s." % (self.state)) def shutdown(self): """ - Disconnects from the cluster. + Disconnects from the cluster. Call this explicitly when a + Rados.connect()ed object is no longer used. """ if (self.__dict__.has_key("state") and self.state != "shutdown"): run_in_thread(self.librados.rados_shutdown, (self.cluster,)) @@ -260,9 +261,6 @@ Rados object in state %s." % (self.state)) self.shutdown() return False - def __del__(self): - self.shutdown() - def version(self): """ Get the version number of the ``librados`` C library. @@ -410,7 +408,7 @@ Rados object in state %s." % (self.state)) def connect(self, timeout=0): """ - Connect to the cluster. + Connect to the cluster. Use shutdown() to release resources. """ self.require_state("configuring") ret = run_in_thread(self.librados.rados_connect, (self.cluster,), diff --git a/ceph/src/rgw/Makefile.am b/ceph/src/rgw/Makefile.am index 3d6886d1..6bf98044 100644 --- a/ceph/src/rgw/Makefile.am +++ b/ceph/src/rgw/Makefile.am @@ -72,6 +72,7 @@ radosgw_SOURCES = \ rgw/rgw_swift_auth.cc \ rgw/rgw_loadgen.cc \ rgw/rgw_civetweb.cc \ + rgw/rgw_civetweb_log.cc \ civetweb/src/civetweb.c \ rgw/rgw_main.cc radosgw_CFLAGS = -Icivetweb/include @@ -158,6 +159,7 @@ noinst_HEADERS += \ rgw/rgw_bucket.h \ rgw/rgw_keystone.h \ rgw/rgw_civetweb.h \ + rgw/rgw_civetweb_log.h \ civetweb/civetweb.h \ civetweb/include/civetweb.h \ civetweb/src/md5.h diff --git a/ceph/src/rgw/rgw_civetweb_log.cc b/ceph/src/rgw/rgw_civetweb_log.cc new file mode 100644 index 00000000..720bab5f --- /dev/null +++ b/ceph/src/rgw/rgw_civetweb_log.cc @@ -0,0 +1,14 @@ +#include "common/config.h" +#include "rgw_common.h" + +#include "civetweb/civetweb.h" + +#define dout_subsys ceph_subsys_civetweb + + +int rgw_civetweb_log_callback(const struct mg_connection *conn, const char *buf) { + dout(10) << "civetweb: " << (void *)conn << ": " << buf << dendl; + return 0; +} + + diff --git a/ceph/src/rgw/rgw_civetweb_log.h b/ceph/src/rgw/rgw_civetweb_log.h new file mode 100644 index 00000000..6c6b2c06 --- /dev/null +++ b/ceph/src/rgw/rgw_civetweb_log.h @@ -0,0 +1,6 @@ +#ifndef CEPH_RGW_CIVETWEB_LOG_H +#define CEPH_RGW_CIVETWEB_LOG_H + +int rgw_civetweb_log_callback(const struct mg_connection *conn, const char *buf); + +#endif diff --git a/ceph/src/rgw/rgw_http_client.cc b/ceph/src/rgw/rgw_http_client.cc index 1c6b6d4d..3adc0aec 100644 --- a/ceph/src/rgw/rgw_http_client.cc +++ b/ceph/src/rgw/rgw_http_client.cc @@ -42,17 +42,8 @@ static size_t send_http_data(void *ptr, size_t size, size_t nmemb, void *_info) return ret; } -int RGWHTTPClient::process(const char *method, const char *url) +static curl_slist *headers_to_slist(list >& headers) { - int ret = 0; - CURL *curl_handle; - - char error_buf[CURL_ERROR_SIZE]; - - curl_handle = curl_easy_init(); - - dout(20) << "sending request to " << url << dendl; - curl_slist *h = NULL; list >::iterator iter; @@ -63,11 +54,37 @@ int RGWHTTPClient::process(const char *method, const char *url) if (strncmp(val.c_str(), "HTTP_", 5) == 0) { val = val.substr(5); } + + /* we need to convert all underscores into dashes as some web servers forbid them + * in the http header field names + */ + for (size_t i = 0; i < val.size(); i++) { + if (val[i] == '_') { + val[i] = '-'; + } + } + val.append(": "); val.append(p.second); h = curl_slist_append(h, val.c_str()); } + return h; +} + +int RGWHTTPClient::process(const char *method, const char *url) +{ + int ret = 0; + CURL *curl_handle; + + char error_buf[CURL_ERROR_SIZE]; + + curl_handle = curl_easy_init(); + + dout(20) << "sending request to " << url << dendl; + + curl_slist *h = headers_to_slist(headers); + curl_easy_setopt(curl_handle, CURLOPT_CUSTOMREQUEST, method); curl_easy_setopt(curl_handle, CURLOPT_URL, url); curl_easy_setopt(curl_handle, CURLOPT_NOPROGRESS, 1L); @@ -139,20 +156,7 @@ int RGWHTTPClient::init_async(const char *method, const char *url, void **handle dout(20) << "sending request to " << url << dendl; - curl_slist *h = NULL; - - list >::iterator iter; - for (iter = headers.begin(); iter != headers.end(); ++iter) { - pair& p = *iter; - string val = p.first; - - if (strncmp(val.c_str(), "HTTP_", 5) == 0) { - val = val.substr(5); - } - val.append(": "); - val.append(p.second); - h = curl_slist_append(h, val.c_str()); - } + curl_slist *h = headers_to_slist(headers); req_data->h = h; diff --git a/ceph/src/rgw/rgw_main.cc b/ceph/src/rgw/rgw_main.cc index 9614b078..5fa3279d 100644 --- a/ceph/src/rgw/rgw_main.cc +++ b/ceph/src/rgw/rgw_main.cc @@ -54,6 +54,7 @@ #include "rgw_resolve.h" #include "rgw_loadgen.h" #include "rgw_civetweb.h" +#include "rgw_civetweb_log.h" #include "civetweb/civetweb.h" @@ -93,6 +94,8 @@ struct RGWRequest RGWRequest() : id(0), s(NULL), op(NULL) { } + virtual ~RGWRequest() {} + void init_state(req_state *_s) { s = _s; } @@ -636,6 +639,10 @@ void RGWFCGXProcess::handle_request(RGWRequest *r) FCGX_Finish_r(fcgx); + if (store->ctx()->_conf->rgw_fcgi_explicit_free) { + FCGX_Free(fcgx, 1); + } + delete req; } @@ -922,11 +929,13 @@ public: snprintf(thread_pool_buf, sizeof(thread_pool_buf), "%d", (int)g_conf->rgw_thread_pool_size); string port_str; conf->get_val("port", "80", &port_str); - const char *options[] = {"listening_ports", port_str.c_str(), "enable_keep_alive", "yes", "num_threads", thread_pool_buf, NULL}; + const char *options[] = {"listening_ports", port_str.c_str(), "enable_keep_alive", "yes", "num_threads", thread_pool_buf, + "decode_url", "no", NULL}; struct mg_callbacks cb; memset((void *)&cb, 0, sizeof(cb)); cb.begin_request = civetweb_callback; + cb.log_message = rgw_civetweb_log_callback; ctx = mg_start(&cb, &env, (const char **)&options); if (!ctx) { @@ -965,7 +974,7 @@ int main(int argc, const char **argv) vector def_args; def_args.push_back("--debug-rgw=1/5"); def_args.push_back("--keyring=$rgw_data/keyring"); - def_args.push_back("--log-file=/var/log/radosgw/$cluster-$name"); + def_args.push_back("--log-file=/var/log/radosgw/$cluster-$name.log"); vector args; argv_to_vec(argc, argv, args); diff --git a/ceph/src/rgw/rgw_op.cc b/ceph/src/rgw/rgw_op.cc index 76947480..457791fa 100644 --- a/ceph/src/rgw/rgw_op.cc +++ b/ceph/src/rgw/rgw_op.cc @@ -1566,22 +1566,15 @@ int RGWPutObj::user_manifest_iterate_cb(rgw_bucket& bucket, RGWObjEnt& ent, RGWA static int put_data_and_throttle(RGWPutObjProcessor *processor, bufferlist& data, off_t ofs, MD5 *hash, bool need_to_wait) { - const unsigned char *data_ptr = (hash ? (const unsigned char *)data.c_str() : NULL); bool again; - uint64_t len = data.length(); do { void *handle; - int ret = processor->handle_data(data, ofs, &handle, &again); + int ret = processor->handle_data(data, ofs, hash, &handle, &again); if (ret < 0) return ret; - if (hash) { - hash->Update(data_ptr, len); - hash = NULL; /* only calculate hash once */ - } - ret = processor->throttle_data(handle, need_to_wait); if (ret < 0) return ret; @@ -1719,6 +1712,7 @@ void RGWPutObj::execute() } if (need_calc_md5) { + processor->complete_hash(&hash); hash.Final(m); buf_to_hex(m, CEPH_CRYPTO_MD5_DIGESTSIZE, calc_md5); diff --git a/ceph/src/rgw/rgw_rados.cc b/ceph/src/rgw/rgw_rados.cc index e22bef0b..62d44aad 100644 --- a/ceph/src/rgw/rgw_rados.cc +++ b/ceph/src/rgw/rgw_rados.cc @@ -876,6 +876,11 @@ int RGWPutObjProcessor::complete(string& etag, time_t *mtime, time_t set_mtime, return 0; } +CephContext *RGWPutObjProcessor::ctx() +{ + return store->ctx(); +} + RGWPutObjProcessor::~RGWPutObjProcessor() { if (is_complete) @@ -900,8 +905,10 @@ int RGWPutObjProcessor_Plain::prepare(RGWRados *store, void *obj_ctx, string *oi return 0; }; -int RGWPutObjProcessor_Plain::handle_data(bufferlist& bl, off_t _ofs, void **phandle, bool *again) +int RGWPutObjProcessor_Plain::handle_data(bufferlist& bl, off_t _ofs, MD5 *hash, void **phandle, bool *again) { + assert(!hash); + *again = false; if (ofs != _ofs) @@ -1028,7 +1035,7 @@ int RGWPutObjProcessor_Atomic::write_data(bufferlist& bl, off_t ofs, void **phan return RGWPutObjProcessor_Aio::handle_obj_data(cur_obj, bl, ofs - cur_part_ofs, ofs, phandle, exclusive); } -int RGWPutObjProcessor_Atomic::handle_data(bufferlist& bl, off_t ofs, void **phandle, bool *again) +int RGWPutObjProcessor_Atomic::handle_data(bufferlist& bl, off_t ofs, MD5 *hash, void **phandle, bool *again) { *again = false; @@ -1062,7 +1069,10 @@ int RGWPutObjProcessor_Atomic::handle_data(bufferlist& bl, off_t ofs, void **pha if (!data_ofs && !immutable_head()) { first_chunk.claim(bl); obj_len = (uint64_t)first_chunk.length(); - int r = prepare_next_part(first_chunk.length()); + if (hash) { + hash->Update((const byte *)first_chunk.c_str(), obj_len); + } + int r = prepare_next_part(obj_len); if (r < 0) { return r; } @@ -1074,7 +1084,19 @@ int RGWPutObjProcessor_Atomic::handle_data(bufferlist& bl, off_t ofs, void **pha bool exclusive = (!write_ofs && immutable_head()); /* immutable head object, need to verify nothing exists there we could be racing with another upload, to the same object and cleanup can be messy */ - return write_data(bl, write_ofs, phandle, exclusive); + int ret = write_data(bl, write_ofs, phandle, exclusive); + if (ret >= 0) { /* we might return, need to clear bl as it was already sent */ + if (hash) { + hash->Update((const byte *)bl.c_str(), bl.length()); + } + bl.clear(); + } + return ret; +} + +void RGWPutObjProcessor_Atomic::complete_hash(MD5 *hash) +{ + hash->Update((const byte *)pending_data_bl.c_str(), pending_data_bl.length()); } @@ -3019,7 +3041,7 @@ public: do { void *handle; - int ret = processor->handle_data(bl, ofs, &handle, &again); + int ret = processor->handle_data(bl, ofs, NULL, &handle, &again); if (ret < 0) return ret; @@ -3029,6 +3051,11 @@ public: */ ret = opstate->renew_state(); if (ret < 0) { + ldout(processor->ctx(), 0) << "ERROR: RGWRadosPutObj::handle_data(): failed to renew op state ret=" << ret << dendl; + int r = processor->throttle_data(handle, false); + if (r < 0) { + ldout(processor->ctx(), 0) << "ERROR: RGWRadosPutObj::handle_data(): processor->throttle_data() returned " << r << dendl; + } /* could not renew state! might have been marked as cancelled */ return ret; } @@ -3286,7 +3313,7 @@ set_err_state: return ret; } - bool copy_data = !astate->has_manifest; + bool copy_data = !astate->has_manifest || (src_obj.bucket.data_pool != dest_obj.bucket.data_pool); bool copy_first = false; if (astate->has_manifest) { if (!astate->manifest.has_tail()) { @@ -3424,18 +3451,17 @@ int RGWRados::copy_obj_data(void *ctx, bufferlist first_chunk; RGWObjManifest manifest; map objs; - RGWObjManifestPart *first_part; - map::iterator iter; - rgw_obj shadow_obj = dest_obj; - string shadow_oid; + string tag; + append_rand_alpha(cct, tag, tag, 32); - append_rand_alpha(cct, dest_obj.object, shadow_oid, 32); - shadow_obj.init_ns(dest_obj.bucket, shadow_oid, shadow_ns); + RGWPutObjProcessor_Atomic processor(owner, dest_obj.bucket, dest_obj.object, + cct->_conf->rgw_obj_stripe_size, tag); + int ret = processor.prepare(this, ctx, NULL); + if (ret < 0) + return ret; - int ret, r; off_t ofs = 0; - PutObjMetaExtraParams ep; do { bufferlist bl; @@ -3443,55 +3469,37 @@ int RGWRados::copy_obj_data(void *ctx, if (ret < 0) return ret; - const char *data = bl.c_str(); + uint64_t read_len = ret; + bool again; - if ((uint64_t)ofs < max_chunk_size) { - uint64_t len = min(max_chunk_size - ofs, (uint64_t)ret); - first_chunk.append(data, len); - ofs += len; - ret -= len; - data += len; - } + do { + void *handle; - // In the first call to put_obj_data, we pass ofs == -1 so that it will do - // a write_full, wiping out whatever was in the object before this - r = 0; - if (ret > 0) { - r = put_obj_data(ctx, shadow_obj, data, ((ofs == 0) ? -1 : ofs), ret, false); - } - if (r < 0) - goto done_err; + ret = processor.handle_data(bl, ofs, NULL, &handle, &again); + if (ret < 0) { + return ret; + } + ret = processor.throttle_data(handle, false); + if (ret < 0) + return ret; + } while (again); - ofs += ret; + ofs += read_len; } while (ofs <= end); - first_part = &objs[0]; - first_part->loc = dest_obj; - first_part->loc_ofs = 0; - first_part->size = first_chunk.length(); - - if ((uint64_t)ofs > max_chunk_size) { - RGWObjManifestPart& tail = objs[max_chunk_size]; - tail.loc = shadow_obj; - tail.loc_ofs = max_chunk_size; - tail.size = ofs - max_chunk_size; + string etag; + map::iterator iter = attrs.find(RGW_ATTR_ETAG); + if (iter != attrs.end()) { + bufferlist& bl = iter->second; + etag = string(bl.c_str(), bl.length()); } - manifest.set_explicit(ofs, objs); - - ep.data = &first_chunk; - ep.manifest = &manifest; - ep.ptag = ptag; - ep.owner = owner; + ret = processor.complete(etag, NULL, 0, attrs); - ret = put_obj_meta(ctx, dest_obj, end + 1, attrs, category, PUT_OBJ_CREATE, ep); if (mtime) obj_stat(ctx, dest_obj, NULL, mtime, NULL, NULL, NULL, NULL); return ret; -done_err: - delete_obj(ctx, owner, shadow_obj); - return r; } /** diff --git a/ceph/src/rgw/rgw_rados.h b/ceph/src/rgw/rgw_rados.h index d811b499..9aefe1ef 100644 --- a/ceph/src/rgw/rgw_rados.h +++ b/ceph/src/rgw/rgw_rados.h @@ -298,6 +298,11 @@ public: bool has_tail() { if (explicit_objs) { + if (objs.size() == 1) { + map::iterator iter = objs.begin(); + rgw_obj& obj = iter->second.loc; + return head_obj.object != obj.object; + } return (objs.size() >= 2); } return (obj_size > head_size); @@ -548,9 +553,14 @@ public: obj_ctx = _o; return 0; }; - virtual int handle_data(bufferlist& bl, off_t ofs, void **phandle, bool *again) = 0; + virtual int handle_data(bufferlist& bl, off_t ofs, MD5 *hash, void **phandle, bool *again) = 0; virtual int throttle_data(void *handle, bool need_to_wait) = 0; + virtual void complete_hash(MD5 *hash) { + assert(0); + } virtual int complete(string& etag, time_t *mtime, time_t set_mtime, map& attrs); + + CephContext *ctx(); }; class RGWPutObjProcessor_Plain : public RGWPutObjProcessor @@ -564,7 +574,7 @@ class RGWPutObjProcessor_Plain : public RGWPutObjProcessor protected: int prepare(RGWRados *store, void *obj_ctx, string *oid_rand); - int handle_data(bufferlist& bl, off_t ofs, void **phandle, bool *again); + int handle_data(bufferlist& bl, off_t ofs, MD5 *hash /* NULL expected */, void **phandle, bool *again); int do_complete(string& etag, time_t *mtime, time_t set_mtime, map& attrs); public: @@ -654,7 +664,8 @@ public: void set_extra_data_len(uint64_t len) { extra_data_len = len; } - virtual int handle_data(bufferlist& bl, off_t ofs, void **phandle, bool *again); + virtual int handle_data(bufferlist& bl, off_t ofs, MD5 *hash, void **phandle, bool *again); + virtual void complete_hash(MD5 *hash); bufferlist& get_extra_data() { return extra_data_bl; } }; diff --git a/ceph/src/rgw/rgw_rest_s3.cc b/ceph/src/rgw/rgw_rest_s3.cc index c7961f4a..602a886e 100644 --- a/ceph/src/rgw/rgw_rest_s3.cc +++ b/ceph/src/rgw/rgw_rest_s3.cc @@ -2047,6 +2047,12 @@ int RGW_Auth_S3_Keystone_ValidateToken::validate_s3token(const string& auth_id, return 0; } +static void init_anon_user(struct req_state *s) +{ + rgw_get_anon_user(s->user); + s->perm_mask = RGW_PERM_FULL_CONTROL; +} + /* * verify that a signed request comes from the keyholder * by checking the signature against our locally-computed version @@ -2067,6 +2073,11 @@ int RGW_Auth_S3::authorize(RGWRados *store, struct req_state *s) return -EPERM; } + if (s->op == OP_OPTIONS) { + init_anon_user(s); + return 0; + } + if (!s->http_auth || !(*s->http_auth)) { auth_id = s->info.args.get("AWSAccessKeyId"); if (auth_id.size()) { @@ -2080,8 +2091,7 @@ int RGW_Auth_S3::authorize(RGWRados *store, struct req_state *s) qsr = true; } else { /* anonymous access */ - rgw_get_anon_user(s->user); - s->perm_mask = RGW_PERM_FULL_CONTROL; + init_anon_user(s); return 0; } } else { diff --git a/ceph/src/rgw/rgw_rest_swift.cc b/ceph/src/rgw/rgw_rest_swift.cc index b5620793..9bdb811c 100644 --- a/ceph/src/rgw/rgw_rest_swift.cc +++ b/ceph/src/rgw/rgw_rest_swift.cc @@ -776,7 +776,8 @@ RGWOp *RGWHandler_ObjStore_Obj_SWIFT::op_options() int RGWHandler_ObjStore_SWIFT::authorize() { - if (!s->os_auth_token && s->info.args.get("temp_url_sig").empty()) { + if ((!s->os_auth_token && s->info.args.get("temp_url_sig").empty()) || + (s->op == OP_OPTIONS)) { /* anonymous access */ rgw_get_anon_user(s->user); s->perm_mask = RGW_PERM_FULL_CONTROL; diff --git a/ceph/src/rgw/rgw_swift.cc b/ceph/src/rgw/rgw_swift.cc index d9654a76..2445e174 100644 --- a/ceph/src/rgw/rgw_swift.cc +++ b/ceph/src/rgw/rgw_swift.cc @@ -505,6 +505,8 @@ int RGWSwift::validate_keystone_token(RGWRados *store, const string& token, stru validate.append_header("X-Auth-Token", admin_token); + validate.set_send_length(0); + int ret = validate.process(url.c_str()); if (ret < 0) return ret; diff --git a/ceph/src/rgw/rgw_user.cc b/ceph/src/rgw/rgw_user.cc index 23575d8a..55d1d6a0 100644 --- a/ceph/src/rgw/rgw_user.cc +++ b/ceph/src/rgw/rgw_user.cc @@ -666,15 +666,6 @@ bool RGWAccessKeyPool::check_existing_key(RGWUserAdminOpState& op_state) switch (key_type) { case KEY_TYPE_SWIFT: - kiter = swift_keys->find(kid); - - existing_key = (kiter != swift_keys->end()); - if (existing_key) - break; - - if (swift_kid.empty()) - return false; - kiter = swift_keys->find(swift_kid); existing_key = (kiter != swift_keys->end()); @@ -845,7 +836,7 @@ int RGWAccessKeyPool::generate_key(RGWUserAdminOpState& op_state, std::string *e } while (!rgw_get_user_info_by_access_key(store, id, duplicate_check)); } - if (key_type == KEY_TYPE_SWIFT && gen_access) { + if (key_type == KEY_TYPE_SWIFT) { id = op_state.build_default_swift_kid(); if (id.empty()) { set_err_msg(err_msg, "empty swift access key"); diff --git a/ceph/src/test/Makefile.am b/ceph/src/test/Makefile.am index f527b96b..69f9e841 100644 --- a/ceph/src/test/Makefile.am +++ b/ceph/src/test/Makefile.am @@ -368,6 +368,9 @@ unittest_pglog_SOURCES = test/osd/TestPGLog.cc unittest_pglog_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_pglog_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) check_PROGRAMS += unittest_pglog +if LINUX +unittest_pglog_LDADD += -ldl +endif # LINUX unittest_ecbackend_SOURCES = test/osd/TestECBackend.cc unittest_ecbackend_CXXFLAGS = $(UNITTEST_CXXFLAGS) @@ -379,9 +382,10 @@ unittest_hitset_CXXFLAGS = $(UNITTEST_CXXFLAGS) unittest_hitset_LDADD = $(LIBOSD) $(UNITTEST_LDADD) $(CEPH_GLOBAL) check_PROGRAMS += unittest_hitset -if LINUX -unittest_pglog_LDADD += -ldl -endif # LINUX +unittest_io_priority_SOURCES = test/common/test_io_priority.cc +unittest_io_priority_CXXFLAGS = $(UNITTEST_CXXFLAGS) +unittest_io_priority_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) +check_PROGRAMS += unittest_io_priority unittest_gather_SOURCES = test/gather.cc unittest_gather_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) diff --git a/ceph/src/test/cli/crushtool/test-map-firstn-indep.t b/ceph/src/test/cli/crushtool/test-map-firstn-indep.t new file mode 100644 index 00000000..1b8c736e --- /dev/null +++ b/ceph/src/test/cli/crushtool/test-map-firstn-indep.t @@ -0,0 +1,14 @@ + $ crushtool -c "$TESTDIR/test-map-firstn-indep.txt" -o "$TESTDIR/test-map-firstn-indep.crushmap" + $ crushtool -i "$TESTDIR/test-map-firstn-indep.crushmap" --test --rule 0 --x 1 --show-bad-mappings + bad mapping rule 0 x 1 num_rep 9 result [93,80,88,87,56,50,53,72] + bad mapping rule 0 x 1 num_rep 10 result [93,80,88,87,56,50,53,72] + $ crushtool -i "$TESTDIR/test-map-firstn-indep.crushmap" --test --rule 1 --x 1 --show-bad-mappings + bad mapping rule 1 x 1 num_rep 3 result [93,56] + bad mapping rule 1 x 1 num_rep 4 result [93,56] + bad mapping rule 1 x 1 num_rep 5 result [93,56] + bad mapping rule 1 x 1 num_rep 6 result [93,56] + bad mapping rule 1 x 1 num_rep 7 result [93,56] + bad mapping rule 1 x 1 num_rep 8 result [93,56] + bad mapping rule 1 x 1 num_rep 9 result [93,56] + bad mapping rule 1 x 1 num_rep 10 result [93,56] + $ rm -f "$TESTDIR/test-map-firstn-indep.crushmap" diff --git a/ceph/src/test/cli/crushtool/test-map-firstn-indep.txt b/ceph/src/test/cli/crushtool/test-map-firstn-indep.txt new file mode 100644 index 00000000..4534eab2 --- /dev/null +++ b/ceph/src/test/cli/crushtool/test-map-firstn-indep.txt @@ -0,0 +1,443 @@ +# begin crush map +tunable choose_local_tries 0 +tunable choose_local_fallback_tries 0 +tunable choose_total_tries 50 +tunable chooseleaf_descend_once 1 + +# devices +device 0 device0 +device 1 device1 +device 2 device2 +device 3 device3 +device 4 device4 +device 5 device5 +device 6 device6 +device 7 device7 +device 8 device8 +device 9 device9 +device 10 device10 +device 11 device11 +device 12 device12 +device 13 device13 +device 14 device14 +device 15 device15 +device 16 device16 +device 17 device17 +device 18 device18 +device 19 device19 +device 20 device20 +device 21 device21 +device 22 device22 +device 23 device23 +device 24 device24 +device 25 device25 +device 26 device26 +device 27 device27 +device 28 device28 +device 29 device29 +device 30 device30 +device 31 device31 +device 32 device32 +device 33 device33 +device 34 device34 +device 35 device35 +device 36 device36 +device 37 device37 +device 38 device38 +device 39 device39 +device 40 device40 +device 41 device41 +device 42 device42 +device 43 device43 +device 44 device44 +device 45 device45 +device 46 device46 +device 47 device47 +device 48 device48 +device 49 device49 +device 50 device50 +device 51 device51 +device 52 device52 +device 53 device53 +device 54 device54 +device 55 device55 +device 56 device56 +device 57 device57 +device 58 device58 +device 59 device59 +device 60 device60 +device 61 device61 +device 62 device62 +device 63 device63 +device 64 device64 +device 65 device65 +device 66 device66 +device 67 device67 +device 68 device68 +device 69 device69 +device 70 device70 +device 71 device71 +device 72 device72 +device 73 device73 +device 74 device74 +device 75 device75 +device 76 device76 +device 77 device77 +device 78 device78 +device 79 device79 +device 80 device80 +device 81 device81 +device 82 device82 +device 83 device83 +device 84 device84 +device 85 device85 +device 86 device86 +device 87 device87 +device 88 device88 +device 89 device89 +device 90 device90 +device 91 device91 +device 92 device92 +device 93 device93 +device 94 device94 +device 95 device95 +device 96 device96 +device 97 device97 +device 98 device98 +device 99 device99 + +# types +type 0 device +type 1 host +type 2 rack +type 3 default + +# buckets +host host0 { + id -1 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device0 weight 1.000 + item device1 weight 1.000 + item device2 weight 1.000 + item device3 weight 1.000 +} +host host1 { + id -2 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device4 weight 1.000 + item device5 weight 1.000 + item device6 weight 1.000 + item device7 weight 1.000 +} +host host2 { + id -3 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device8 weight 1.000 + item device9 weight 1.000 + item device10 weight 1.000 + item device11 weight 1.000 +} +host host3 { + id -4 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device12 weight 1.000 + item device13 weight 1.000 + item device14 weight 1.000 + item device15 weight 1.000 +} +host host4 { + id -5 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device16 weight 1.000 + item device17 weight 1.000 + item device18 weight 1.000 + item device19 weight 1.000 +} +host host5 { + id -6 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device20 weight 1.000 + item device21 weight 1.000 + item device22 weight 1.000 + item device23 weight 1.000 +} +host host6 { + id -7 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device24 weight 1.000 + item device25 weight 1.000 + item device26 weight 1.000 + item device27 weight 1.000 +} +host host7 { + id -8 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device28 weight 1.000 + item device29 weight 1.000 + item device30 weight 1.000 + item device31 weight 1.000 +} +host host8 { + id -9 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device32 weight 1.000 + item device33 weight 1.000 + item device34 weight 1.000 + item device35 weight 1.000 +} +host host9 { + id -10 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device36 weight 1.000 + item device37 weight 1.000 + item device38 weight 1.000 + item device39 weight 1.000 +} +host host10 { + id -11 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device40 weight 1.000 + item device41 weight 1.000 + item device42 weight 1.000 + item device43 weight 1.000 +} +host host11 { + id -12 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device44 weight 1.000 + item device45 weight 1.000 + item device46 weight 1.000 + item device47 weight 1.000 +} +host host12 { + id -13 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device48 weight 1.000 + item device49 weight 1.000 + item device50 weight 1.000 + item device51 weight 1.000 +} +host host13 { + id -14 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device52 weight 1.000 + item device53 weight 1.000 + item device54 weight 1.000 + item device55 weight 1.000 +} +host host14 { + id -15 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device56 weight 1.000 + item device57 weight 1.000 + item device58 weight 1.000 + item device59 weight 1.000 +} +host host15 { + id -16 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device60 weight 1.000 + item device61 weight 1.000 + item device62 weight 1.000 + item device63 weight 1.000 +} +host host16 { + id -17 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device64 weight 1.000 + item device65 weight 1.000 + item device66 weight 1.000 + item device67 weight 1.000 +} +host host17 { + id -18 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device68 weight 1.000 + item device69 weight 1.000 + item device70 weight 1.000 + item device71 weight 1.000 +} +host host18 { + id -19 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device72 weight 1.000 + item device73 weight 1.000 + item device74 weight 1.000 + item device75 weight 1.000 +} +host host19 { + id -20 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device76 weight 1.000 + item device77 weight 1.000 + item device78 weight 1.000 + item device79 weight 1.000 +} +host host20 { + id -21 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device80 weight 1.000 + item device81 weight 1.000 + item device82 weight 1.000 + item device83 weight 1.000 +} +host host21 { + id -22 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device84 weight 1.000 + item device85 weight 1.000 + item device86 weight 1.000 + item device87 weight 1.000 +} +host host22 { + id -23 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device88 weight 1.000 + item device89 weight 1.000 + item device90 weight 1.000 + item device91 weight 1.000 +} +host host23 { + id -24 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device92 weight 1.000 + item device93 weight 1.000 + item device94 weight 1.000 + item device95 weight 1.000 +} +host host24 { + id -25 # do not change unnecessarily + # weight 4.000 + alg straw + hash 0 # rjenkins1 + item device96 weight 1.000 + item device97 weight 1.000 + item device98 weight 1.000 + item device99 weight 1.000 +} +rack rack0 { + id -26 # do not change unnecessarily + # weight 40.000 + alg straw + hash 0 # rjenkins1 + item host0 weight 4.000 + item host1 weight 4.000 + item host2 weight 4.000 + item host3 weight 4.000 + item host4 weight 4.000 + item host5 weight 4.000 + item host6 weight 4.000 + item host7 weight 4.000 + item host8 weight 4.000 + item host9 weight 4.000 +} +rack rack1 { + id -27 # do not change unnecessarily + # weight 40.000 + alg straw + hash 0 # rjenkins1 + item host10 weight 4.000 + item host11 weight 4.000 + item host12 weight 4.000 + item host13 weight 4.000 + item host14 weight 4.000 + item host15 weight 4.000 + item host16 weight 4.000 + item host17 weight 4.000 + item host18 weight 4.000 + item host19 weight 4.000 +} +rack rack2 { + id -28 # do not change unnecessarily + # weight 20.000 + alg straw + hash 0 # rjenkins1 + item host20 weight 4.000 + item host21 weight 4.000 + item host22 weight 4.000 + item host23 weight 4.000 + item host24 weight 4.000 +} + +default root { + id -31 # do not change unnecessarily + # weight 100.000 + alg straw + hash 0 # rjenkins1 + item rack1 weight 40.000 + item rack1 weight 40.000 + item rack2 weight 20.000 +} + +# rules +rule myrule { + ruleset 0 + type replicated + min_size 1 + max_size 10 + step take root + step choose firstn 2 type rack + step chooseleaf indep 4 type host + step emit +} + +rule myrule1 { + ruleset 1 + type replicated + min_size 1 + max_size 10 + step take root + step choose firstn 2 type rack + step chooseleaf indep 1 type host + step emit +} + +# end crush map diff --git a/ceph/src/test/cli/osdmaptool/test-map-pgs.t b/ceph/src/test/cli/osdmaptool/test-map-pgs.t index b64f2d99..222bd76f 100644 --- a/ceph/src/test/cli/osdmaptool/test-map-pgs.t +++ b/ceph/src/test/cli/osdmaptool/test-map-pgs.t @@ -24,7 +24,7 @@ pool 1 pg_num 8000 pool 2 pg_num 8000 $ TOTAL=$((POOL_COUNT * $PG_NUM)) - $ PATTERN=$(echo "size $SIZE\t$TOTAL") + $ PATTERN=$(echo "size $SIZE.$TOTAL") $ grep "$PATTERN" $OUT || cat "$OUT" size 3\t24000 (esc) $ STATS_CRUSH=$(grep '^ avg ' "$OUT") @@ -39,7 +39,7 @@ pool 1 pg_num 8000 pool 2 pg_num 8000 $ TOTAL=$((POOL_COUNT * $PG_NUM)) - $ PATTERN=$(echo "size $SIZE\t$TOTAL") + $ PATTERN=$(echo "size $SIZE.$TOTAL") $ grep "$PATTERN" $OUT || cat "$OUT" size 3\t24000 (esc) $ STATS_RANDOM=$(grep '^ avg ' "$OUT") diff --git a/ceph/src/test/common/histogram.cc b/ceph/src/test/common/histogram.cc index 2fd3cfec..765f4c97 100644 --- a/ceph/src/test/common/histogram.cc +++ b/ceph/src/test/common/histogram.cc @@ -47,61 +47,64 @@ TEST(Histogram, Set) { } TEST(Histogram, Position) { - { - pow2_hist_t h; - uint64_t lb, ub; - h.add(0); - ASSERT_EQ(-1, h.get_position_micro(-20, &lb, &ub)); - } - { - pow2_hist_t h; - h.add(0); - uint64_t lb, ub; - h.get_position_micro(0, &lb, &ub); - ASSERT_EQ(0u, lb); - ASSERT_EQ(1000000u, ub); - h.add(0); - h.add(0); - h.add(0); - h.get_position_micro(0, &lb, &ub); - ASSERT_EQ(0u, lb); - ASSERT_EQ(1000000u, ub); - } - { - pow2_hist_t h; - h.add(1); - h.add(1); - uint64_t lb, ub; - h.get_position_micro(0, &lb, &ub); - ASSERT_EQ(0u, lb); - ASSERT_EQ(0u, ub); - h.add(0); - h.get_position_micro(0, &lb, &ub); - ASSERT_EQ(0u, lb); - ASSERT_EQ(333333u, ub); - h.get_position_micro(1, &lb, &ub); - ASSERT_EQ(333333u, lb); - ASSERT_EQ(1000000u, ub); - } - { - pow2_hist_t h; - h.h.resize(10, 0); - h.h[0] = 1; - h.h[5] = 1; - uint64_t lb, ub; - h.get_position_micro(4, &lb, &ub); - ASSERT_EQ(500000u, lb); - ASSERT_EQ(500000u, ub); - } - { - pow2_hist_t h; - h.h.resize(10, 0); - h.h[0] = UINT_MAX; - h.h[5] = UINT_MAX; - uint64_t lb, ub; - ASSERT_EQ(500000u, lb); - ASSERT_EQ(500000u, ub); - } + pow2_hist_t h; + uint64_t lb, ub; + h.add(0); + ASSERT_EQ(-1, h.get_position_micro(-20, &lb, &ub)); +} + +TEST(Histogram, Position1) { + pow2_hist_t h; + h.add(0); + uint64_t lb, ub; + h.get_position_micro(0, &lb, &ub); + ASSERT_EQ(0u, lb); + ASSERT_EQ(1000000u, ub); + h.add(0); + h.add(0); + h.add(0); + h.get_position_micro(0, &lb, &ub); + ASSERT_EQ(0u, lb); + ASSERT_EQ(1000000u, ub); +} + +TEST(Histogram, Position2) { + pow2_hist_t h; + h.add(1); + h.add(1); + uint64_t lb, ub; + h.get_position_micro(0, &lb, &ub); + ASSERT_EQ(0u, lb); + ASSERT_EQ(0u, ub); + h.add(0); + h.get_position_micro(0, &lb, &ub); + ASSERT_EQ(0u, lb); + ASSERT_EQ(333333u, ub); + h.get_position_micro(1, &lb, &ub); + ASSERT_EQ(333333u, lb); + ASSERT_EQ(1000000u, ub); +} + +TEST(Histogram, Position3) { + pow2_hist_t h; + h.h.resize(10, 0); + h.h[0] = 1; + h.h[5] = 1; + uint64_t lb, ub; + h.get_position_micro(4, &lb, &ub); + ASSERT_EQ(500000u, lb); + ASSERT_EQ(500000u, ub); +} + +TEST(Histogram, Position4) { + pow2_hist_t h; + h.h.resize(10, 0); + h.h[0] = UINT_MAX; + h.h[5] = UINT_MAX; + uint64_t lb, ub; + h.get_position_micro(4, &lb, &ub); + ASSERT_EQ(0u, lb); + ASSERT_EQ(0u, ub); } TEST(Histogram, Decay) { diff --git a/ceph/src/test/common/test_io_priority.cc b/ceph/src/test/common/test_io_priority.cc new file mode 100644 index 00000000..b2d4e260 --- /dev/null +++ b/ceph/src/test/common/test_io_priority.cc @@ -0,0 +1,51 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph - scalable distributed file system + * + * Copyright (C) 2014 Red Hat + * + * Author: Loic Dachary + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + */ + +#include +#include + +#include "common/io_priority.h" + +TEST(io_priority, ceph_ioprio_string_to_class) { + ASSERT_EQ(IOPRIO_CLASS_IDLE, ceph_ioprio_string_to_class("idle")); + ASSERT_EQ(IOPRIO_CLASS_IDLE, ceph_ioprio_string_to_class("IDLE")); + + ASSERT_EQ(IOPRIO_CLASS_BE, ceph_ioprio_string_to_class("be")); + ASSERT_EQ(IOPRIO_CLASS_BE, ceph_ioprio_string_to_class("BE")); + ASSERT_EQ(IOPRIO_CLASS_BE, ceph_ioprio_string_to_class("besteffort")); + ASSERT_EQ(IOPRIO_CLASS_BE, ceph_ioprio_string_to_class("BESTEFFORT")); + ASSERT_EQ(IOPRIO_CLASS_BE, ceph_ioprio_string_to_class("best effort")); + ASSERT_EQ(IOPRIO_CLASS_BE, ceph_ioprio_string_to_class("BEST EFFORT")); + + ASSERT_EQ(IOPRIO_CLASS_RT, ceph_ioprio_string_to_class("rt")); + ASSERT_EQ(IOPRIO_CLASS_RT, ceph_ioprio_string_to_class("RT")); + ASSERT_EQ(IOPRIO_CLASS_RT, ceph_ioprio_string_to_class("realtime")); + ASSERT_EQ(IOPRIO_CLASS_RT, ceph_ioprio_string_to_class("REALTIME")); + ASSERT_EQ(IOPRIO_CLASS_RT, ceph_ioprio_string_to_class("real time")); + ASSERT_EQ(IOPRIO_CLASS_RT, ceph_ioprio_string_to_class("REAL TIME")); + + ASSERT_EQ(-EINVAL, ceph_ioprio_string_to_class("invalid")); +} + +/* + * Local Variables: + * compile-command: "cd ../.. ; + * make -j4 unittest_io_priority && + * libtool --mode=execute valgrind --tool=memcheck --leak-check=full \ + * ./unittest_io_priority + * " + * End: + */ diff --git a/ceph/src/test/erasure-code/Makefile.am b/ceph/src/test/erasure-code/Makefile.am index fdbe003f..c91eef9b 100644 --- a/ceph/src/test/erasure-code/Makefile.am +++ b/ceph/src/test/erasure-code/Makefile.am @@ -9,6 +9,14 @@ ceph_erasure_code_benchmark_LDADD += -ldl endif bin_DEBUGPROGRAMS += ceph_erasure_code_benchmark +ceph_erasure_code_non_regression_SOURCES = \ + test/erasure-code/ceph_erasure_code_non_regression.cc +ceph_erasure_code_non_regression_LDADD = $(LIBOSD) $(LIBCOMMON) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) +if LINUX +ceph_erasure_code_non_regression_LDADD += -ldl +endif +noinst_PROGRAMS += ceph_erasure_code_non_regression + ceph_erasure_code_SOURCES = \ test/erasure-code/ceph_erasure_code.cc ceph_erasure_code_LDADD = $(LIBOSD) $(LIBCOMMON) $(BOOST_PROGRAM_OPTIONS_LIBS) $(CEPH_GLOBAL) diff --git a/ceph/src/test/erasure-code/TestErasureCodeJerasure.cc b/ceph/src/test/erasure-code/TestErasureCodeJerasure.cc index 5c637dae..4b768a80 100644 --- a/ceph/src/test/erasure-code/TestErasureCodeJerasure.cc +++ b/ceph/src/test/erasure-code/TestErasureCodeJerasure.cc @@ -288,36 +288,6 @@ TEST(ErasureCodeTest, create_ruleset) } } - // - // The ruleid may be different from the ruleset when a crush rule is - // removed because the removed ruleid will be reused but the removed - // ruleset will not be reused. - // - // This also asserts that the create_ruleset() method returns a - // ruleset and not a ruleid http://tracker.ceph.com/issues/9044 - // - { - stringstream ss; - ErasureCodeJerasureReedSolomonVandermonde jerasure; - map parameters; - parameters["k"] = "2"; - parameters["m"] = "2"; - parameters["w"] = "8"; - jerasure.init(parameters); - int FIRST = jerasure.create_ruleset("FIRST", *c, &ss); - int SECOND = jerasure.create_ruleset("SECOND", *c, &ss); - int FIRST_ruleid = c->get_rule_id("FIRST"); - EXPECT_EQ(0, c->remove_rule(FIRST_ruleid)); - int ruleset = jerasure.create_ruleset("myrule", *c, &ss); - EXPECT_NE(FIRST, ruleset); - EXPECT_NE(SECOND, ruleset); - EXPECT_NE(ruleset, c->get_rule_id("myrule")); - int SECOND_ruleid = c->get_rule_id("SECOND"); - EXPECT_EQ(0, c->remove_rule(SECOND_ruleid)); - int myrule_ruleid = c->get_rule_id("myrule"); - EXPECT_EQ(0, c->remove_rule(myrule_ruleid)); - } - { stringstream ss; ErasureCodeJerasureReedSolomonVandermonde jerasure; diff --git a/ceph/src/test/erasure-code/ceph_erasure_code_non_regression.cc b/ceph/src/test/erasure-code/ceph_erasure_code_non_regression.cc new file mode 100644 index 00000000..c04accf7 --- /dev/null +++ b/ceph/src/test/erasure-code/ceph_erasure_code_non_regression.cc @@ -0,0 +1,325 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab +/* + * Ceph distributed storage system + * + * Red Hat (C) 2014 Red Hat + * + * Author: Loic Dachary + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "global/global_context.h" +#include "global/global_init.h" +#include "common/errno.h" +#include "common/ceph_argparse.h" +#include "common/config.h" +#include "erasure-code/ErasureCodePlugin.h" + +namespace po = boost::program_options; +using namespace std; + +class ErasureCodeNonRegression { + unsigned stripe_width; + string plugin; + bool create; + bool check; + string base; + string directory; + map parameters; +public: + int setup(int argc, char** argv); + int run(); + int run_create(); + int run_check(); + int decode_erasures(ErasureCodeInterfaceRef erasure_code, + set erasures, + map chunks); + string content_path(); + string chunk_path(unsigned int chunk); +}; + +int ErasureCodeNonRegression::setup(int argc, char** argv) { + + po::options_description desc("Allowed options"); + desc.add_options() + ("help,h", "produce help message") + ("stripe-width,s", po::value()->default_value(4 * 1024), + "stripe_width, i.e. the size of the buffer to be encoded") + ("plugin,p", po::value()->default_value("jerasure"), + "erasure code plugin name") + ("base", po::value()->default_value("."), + "prefix all paths with base") + ("parameter,P", po::value >(), + "parameters") + ("create", "create the erasure coded content in the directory") + ("check", "check the content in the directory matches the chunks and vice versa") + ; + + po::variables_map vm; + po::parsed_options parsed = + po::command_line_parser(argc, argv).options(desc).allow_unregistered().run(); + po::store( + parsed, + vm); + po::notify(vm); + + vector ceph_options, def_args; + vector ceph_option_strings = po::collect_unrecognized( + parsed.options, po::include_positional); + ceph_options.reserve(ceph_option_strings.size()); + for (vector::iterator i = ceph_option_strings.begin(); + i != ceph_option_strings.end(); + ++i) { + ceph_options.push_back(i->c_str()); + } + + global_init( + &def_args, ceph_options, CEPH_ENTITY_TYPE_CLIENT, + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); + common_init_finish(g_ceph_context); + g_ceph_context->_conf->apply_changes(NULL); + + if (vm.count("help")) { + cout << desc << std::endl; + return 1; + } + + stripe_width = vm["stripe-width"].as(); + plugin = vm["plugin"].as(); + base = vm["base"].as(); + check = vm.count("check") > 0; + create = vm.count("create") > 0; + + if (!check && !create) { + cerr << "must specifify either --check or --create" << endl; + return 1; + } + + { + stringstream path; + path << base << "/" << "plugin=" << plugin << " stipe-width=" << stripe_width; + directory = path.str(); + } + + if (vm.count("parameter")) { + const vector &p = vm["parameter"].as< vector >(); + for (vector::const_iterator i = p.begin(); + i != p.end(); + ++i) { + std::vector strs; + boost::split(strs, *i, boost::is_any_of("=")); + if (strs.size() != 2) { + cerr << "--parameter " << *i << " ignored because it does not contain exactly one =" << endl; + } else { + parameters[strs[0]] = strs[1]; + } + if (strs[0] != "directory") + directory += " " + *i; + } + } + if (parameters.count("directory") == 0) + parameters["directory"] = ".libs"; + + return 0; +} + +int ErasureCodeNonRegression::run() + { + int ret = 0; + if(create && (ret = run_create())) + return ret; + if(check && (ret = run_check())) + return ret; + return ret; +} + +int ErasureCodeNonRegression::run_create() +{ + ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance(); + ErasureCodeInterfaceRef erasure_code; + stringstream messages; + int code = instance.factory(plugin, parameters, &erasure_code, messages); + if (code) { + cerr << messages.str() << endl; + return code; + } + + if (::mkdir(directory.c_str(), 0755)) { + cerr << "mkdir(" << directory << "): " << cpp_strerror(errno) << endl; + return 1; + } + unsigned payload_chunk_size = 37; + string payload; + for (unsigned j = 0; j < payload_chunk_size; ++j) + payload.push_back('a' + (rand() % 26)); + bufferlist in; + for (unsigned j = 0; j < stripe_width; j += payload_chunk_size) + in.append(payload); + if (stripe_width < in.length()) + in.splice(stripe_width, in.length() - stripe_width); + if (in.write_file(content_path().c_str())) + return 1; + set want_to_encode; + for (unsigned int i = 0; i < erasure_code->get_chunk_count(); i++) { + want_to_encode.insert(i); + } + map encoded; + code = erasure_code->encode(want_to_encode, in, &encoded); + if (code) + return code; + for (map::iterator chunk = encoded.begin(); + chunk != encoded.end(); + chunk++) { + if (chunk->second.write_file(chunk_path(chunk->first).c_str())) + return 1; + } + return 0; +} + +int ErasureCodeNonRegression::decode_erasures(ErasureCodeInterfaceRef erasure_code, + set erasures, + map chunks) +{ + map available; + for (map::iterator chunk = chunks.begin(); + chunk != chunks.end(); + ++chunk) { + if (erasures.count(chunk->first) == 0) + available[chunk->first] = chunk->second; + + } + map decoded; + int code = erasure_code->decode(erasures, available, &decoded); + if (code) + return code; + for (set::iterator erasure = erasures.begin(); + erasure != erasures.end(); + ++erasure) { + if (!chunks[*erasure].contents_equal(decoded[*erasure])) { + cerr << "chunk " << *erasure << " incorrectly recovered" << endl; + return 1; + } + } + return 0; +} + +int ErasureCodeNonRegression::run_check() +{ + ErasureCodePluginRegistry &instance = ErasureCodePluginRegistry::instance(); + ErasureCodeInterfaceRef erasure_code; + stringstream messages; + int code = instance.factory(plugin, parameters, &erasure_code, messages); + if (code) { + cerr << messages.str() << endl; + return code; + } + string errors; + bufferlist in; + if (in.read_file(content_path().c_str(), &errors)) { + cerr << errors << endl; + return 1; + } + set want_to_encode; + for (unsigned int i = 0; i < erasure_code->get_chunk_count(); i++) { + want_to_encode.insert(i); + } + + map encoded; + code = erasure_code->encode(want_to_encode, in, &encoded); + if (code) + return code; + + for (map::iterator chunk = encoded.begin(); + chunk != encoded.end(); + chunk++) { + bufferlist existing; + if (existing.read_file(chunk_path(chunk->first).c_str(), &errors)) { + cerr << errors << endl; + return 1; + } + bufferlist &old = chunk->second; + if (existing.length() != old.length() || + memcmp(existing.c_str(), old.c_str(), old.length())) { + cerr << "chunk " << chunk->first << " encodes differently" << endl; + return 1; + } + } + + // erasing a single chunk is likely to use a specific code path in every plugin + set erasures; + erasures.clear(); + erasures.insert(0); + code = decode_erasures(erasure_code, erasures, encoded); + if (code) + return code; + + if (erasure_code->get_chunk_count() - erasure_code->get_data_chunk_count() > 1) { + // erasing two chunks is likely to be the general case + erasures.clear(); + erasures.insert(0); + erasures.insert(erasure_code->get_chunk_count() - 1); + code = decode_erasures(erasure_code, erasures, encoded); + if (code) + return code; + } + + return 0; +} + +string ErasureCodeNonRegression::content_path() +{ + stringstream path; + path << directory << "/content"; + return path.str(); +} + +string ErasureCodeNonRegression::chunk_path(unsigned int chunk) +{ + stringstream path; + path << directory << "/" << chunk; + return path.str(); +} + +int main(int argc, char** argv) { + ErasureCodeNonRegression non_regression; + int err = non_regression.setup(argc, argv); + if (err) + return err; + return non_regression.run(); +} + +/* + * Local Variables: + * compile-command: "cd ../.. ; make -j4 && + * make ceph_erasure_code_non_regression && + * libtool --mode=execute valgrind --tool=memcheck --leak-check=full \ + * ./ceph_erasure_code_non_regression \ + * --plugin jerasure \ + * --parameter directory=.libs \ + * --parameter technique=reed_sol_van \ + * --parameter k=2 \ + * --parameter m=2 \ + * --directory /tmp/ceph_erasure_code_non_regression \ + * --stripe-width 3181 \ + * --create \ + * --check + * " + * End: + */ diff --git a/ceph/src/test/libcephfs/test.cc b/ceph/src/test/libcephfs/test.cc index 9d917f51..6baadaed 100644 --- a/ceph/src/test/libcephfs/test.cc +++ b/ceph/src/test/libcephfs/test.cc @@ -1138,6 +1138,7 @@ TEST(LibCephFS, GetOsdCrushLocation) { } } + ceph_close(cmount, fd); ceph_shutdown(cmount); } diff --git a/ceph/src/test/librados/tier.cc b/ceph/src/test/librados/tier.cc index 42673895..a89d68b0 100644 --- a/ceph/src/test/librados/tier.cc +++ b/ceph/src/test/librados/tier.cc @@ -966,6 +966,82 @@ TEST_F(LibRadosTwoPoolsPP, EvictSnap) { } } +// this test case reproduces http://tracker.ceph.com/issues/8629 +TEST_F(LibRadosTwoPoolsPP, EvictSnap2) { + // create object + { + bufferlist bl; + bl.append("hi there"); + ObjectWriteOperation op; + op.write_full(bl); + ASSERT_EQ(0, ioctx.operate("foo", &op)); + } + // create a snapshot, clone + vector my_snaps(1); + ASSERT_EQ(0, ioctx.selfmanaged_snap_create(&my_snaps[0])); + ASSERT_EQ(0, ioctx.selfmanaged_snap_set_write_ctx(my_snaps[0], + my_snaps)); + { + bufferlist bl; + bl.append("ciao!"); + ObjectWriteOperation op; + op.write_full(bl); + ASSERT_EQ(0, ioctx.operate("foo", &op)); + } + // configure cache + bufferlist inbl; + ASSERT_EQ(0, cluster.mon_command( + "{\"prefix\": \"osd tier add\", \"pool\": \"" + pool_name + + "\", \"tierpool\": \"" + cache_pool_name + + "\", \"force_nonempty\": \"--force-nonempty\" }", + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + "{\"prefix\": \"osd tier set-overlay\", \"pool\": \"" + pool_name + + "\", \"overlaypool\": \"" + cache_pool_name + "\"}", + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + "{\"prefix\": \"osd tier cache-mode\", \"pool\": \"" + cache_pool_name + + "\", \"mode\": \"writeback\"}", + inbl, NULL, NULL)); + + // wait for maps to settle + cluster.wait_for_latest_osdmap(); + + // read, trigger a promote on the head + { + bufferlist bl; + ASSERT_EQ(1, ioctx.read("foo", bl, 1, 0)); + ASSERT_EQ('c', bl[0]); + } + + // evict + { + ObjectReadOperation op; + op.cache_evict(); + librados::AioCompletion *completion = cluster.aio_create_completion(); + ASSERT_EQ(0, cache_ioctx.aio_operate( + "foo", completion, &op, + librados::OPERATION_IGNORE_CACHE, NULL)); + completion->wait_for_safe(); + ASSERT_EQ(0, completion->get_return_value()); + completion->release(); + } + + // verify the snapdir is not present in the cache pool + { + ObjectReadOperation op; + librados::snap_set_t snapset; + op.list_snaps(&snapset, NULL); + ioctx.snap_set_read(librados::SNAP_DIR); + librados::AioCompletion *completion = cluster.aio_create_completion(); + ASSERT_EQ(0, ioctx.aio_operate("foo", completion, &op, + librados::OPERATION_IGNORE_CACHE, NULL)); + completion->wait_for_safe(); + ASSERT_EQ(-ENOENT, completion->get_return_value()); + completion->release(); + } +} + TEST_F(LibRadosTwoPoolsPP, TryFlush) { // configure cache bufferlist inbl; diff --git a/ceph/src/test/mon/mon-test-helpers.sh b/ceph/src/test/mon/mon-test-helpers.sh index d228569e..052b1ca3 100644 --- a/ceph/src/test/mon/mon-test-helpers.sh +++ b/ceph/src/test/mon/mon-test-helpers.sh @@ -59,8 +59,9 @@ function run_mon() { function kill_daemons() { local dir=$1 for pidfile in $(find $dir | grep pidfile) ; do + pid=$(cat $pidfile) for try in 0 1 1 1 2 3 ; do - kill -9 $(cat $pidfile 2> /dev/null) 2> /dev/null || break + kill -9 $pid 2> /dev/null || break sleep $try done done diff --git a/ceph/test-driver b/ceph/test-driver new file mode 100755 index 00000000..d3060566 --- /dev/null +++ b/ceph/test-driver @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/debian/changelog b/debian/changelog index 7943e3a7..bb251158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +ceph (0.80.8-0~mos6.1) trusty; urgency=low + + * New upstream maintenance release; + * Bump version according to MOS versioning policy: + - this was taken directly from upstream, hense no 'ubuntu'; + - no custom patches applied (both 9877 and 9226 are present); + * Replaces/Breaks between python-ceph and ceph added from upstream commit + 726c6a147a14c00cf12eb6c6561655475282419f; + + -- Aleksandr Mogylchenko Wed, 25 Feb 2015 17:28:57 +0200 + ceph (0.80.7-0ubuntu0.14.04.1~mos6.1+1) trusty; urgency=low * Sync with Ubuntu 14.04 sources. diff --git a/debian/control b/debian/control index 5e94b902..ce973bf8 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,9 @@ Source: ceph Section: admin Priority: optional -Maintainer: Ubuntu Developers +Maintainer: MOS Linux team XSBC-Original-Maintainer: Ceph Maintainers -Uploaders: Laszlo Boszormenyi (GCS) , - James Page Homepage: http://ceph.com/ -Vcs-Git: git://anonscm.debian.org/pkg-ceph/ceph.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ceph/ceph.git Build-Depends: debhelper (>= 9~), default-jdk, dh-autoreconf, @@ -17,10 +13,10 @@ Build-Depends: debhelper (>= 9~), libaio-dev, libatomic-ops-dev, libblkid-dev (>= 2.17), - libboost-dev (>= 1.42), - libboost-program-options-dev (>= 1.42), - libboost-system-dev (>= 1.42), - libboost-thread-dev (>= 1.42), + libboost-dev (>= 1.54), + libboost-program-options-dev (>= 1.54), + libboost-system-dev (>= 1.54), + libboost-thread-dev (>= 1.54), libcurl4-gnutls-dev, libedit-dev, libexpat1-dev, @@ -35,7 +31,7 @@ Build-Depends: debhelper (>= 9~), libtool, libxml2-dev, pkg-config, - python-all (>= 2.6.6-3~), + python-all (>= 2.7.1), python-nose, uuid-dev, uuid-runtime, @@ -43,7 +39,7 @@ Build-Depends: debhelper (>= 9~), yasm Build-Conflicts: libcrypto++-dev Standards-Version: 3.9.4 -X-Python-Version: >= 2.6 +X-Python-Version: >= 2.7 XS-Testsuite: autopkgtest Package: ceph diff --git a/debian/patches/0001-rgw-RGWRados-get_obj-returns-wrong-len-if-len-0.patch b/debian/patches/0001-rgw-RGWRados-get_obj-returns-wrong-len-if-len-0.patch deleted file mode 100644 index f9b47e8f..00000000 --- a/debian/patches/0001-rgw-RGWRados-get_obj-returns-wrong-len-if-len-0.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fe7bf06366adaf787816d1e68f5e3f68e8c91134 Mon Sep 17 00:00:00 2001 -From: Yehuda Sadeh -Date: Tue, 4 Nov 2014 22:05:03 -0800 -Subject: [PATCH] rgw: RGWRados::get_obj() returns wrong len if len == 0 - -Fixes: #9877 -We only updated if len was > 0, should update it if r >= 0. This was the -culprit for issue #9877. -Backport: giant, firefly - -Signed-off-by: Yehuda Sadeh ---- - src/rgw/rgw_rados.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc -index 1d05509..709b802 100644 ---- a/src/rgw/rgw_rados.cc -+++ b/src/rgw/rgw_rados.cc -@@ -4689,7 +4689,7 @@ int RGWRados::get_obj(void *ctx, RGWObjVersionTracker *objv_tracker, void **hand - bl.append(read_bl); - - done: -- if (bl.length() > 0) { -+ if (r >= 0) { - r = bl.length(); - } - if (r < 0 || !len || ((off_t)(ofs + len - 1) == end)) { --- -1.9.3 (Apple Git-50) - diff --git a/debian/patches/0001-rgw-fix-test-to-identify-whether-object-has-tail.patch b/debian/patches/0001-rgw-fix-test-to-identify-whether-object-has-tail.patch deleted file mode 100644 index a712ff98..00000000 --- a/debian/patches/0001-rgw-fix-test-to-identify-whether-object-has-tail.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b8fa2ed60b6cce51701df972dbb6f5e02e0d84ba Mon Sep 17 00:00:00 2001 -From: Yehuda Sadeh -Date: Mon, 25 Aug 2014 10:38:42 -0700 -Subject: [PATCH] rgw: fix test to identify whether object has tail - -Fixes: #9226 -Reported-by: Sylvain Munaut -Backport: firefly - -We need to identify whether an object is just composed of a head, or -also has a tail. Test for pre-firefly objects ("explicit objs") was -broken as it was just looking at the number of explicit objs in the -manifest. However, this is insufficient, as we might have empty head, -and in this case it wouldn't appear, so we need to check whether the -sole object is actually pointing at the head. - -Signed-off-by: Yehuda Sadeh -(cherry picked from commit 751b3e26532932a42ca34f9c062a0a3e29a58cff) ---- - src/rgw/rgw_rados.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h -index eea1137..dcaec83 100644 ---- a/src/rgw/rgw_rados.h -+++ b/src/rgw/rgw_rados.h -@@ -298,6 +298,11 @@ public: - - bool has_tail() { - if (explicit_objs) { -+ if (objs.size() == 1) { -+ map::iterator iter = objs.begin(); -+ rgw_obj& obj = iter->second.loc; -+ return head_obj.object != obj.object; -+ } - return (objs.size() >= 2); - } - return (obj_size > head_size); --- -1.9.3 (Apple Git-50) - diff --git a/debian/patches/series b/debian/patches/series index d7134e03..8e560e85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ virtualenv-never-download modules.patch -0001-rgw-RGWRados-get_obj-returns-wrong-len-if-len-0.patch -0001-rgw-fix-test-to-identify-whether-object-has-tail.patch -- 2.45.2