From: Alexey Sheplyakov Date: Wed, 13 Jan 2016 14:03:27 +0000 (+0300) Subject: Upgrade to ceph 0.80.11 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F16073%2F4;p=packages%2Ftrusty%2Fceph.git Upgrade to ceph 0.80.11 Upgrade to the latest Firefly bugfix only release (0.80.11) to pick the upstream security and possible data loss fixes - http://tracker.ceph.com/issues/11056 (qemu VMs with ceph backed storage: vcpu lockup) - http://tracker.ceph.com/issues/11493 (data loss due to a seemingly innocent user command) - http://tracker.ceph.com/issues/11036 - http://tracker.ceph.com/issues/11323 and many others, see http://docs.ceph.com/docs/master/release-notes/#v0-80-11-firefly http://docs.ceph.com/docs/master/release-notes/#v0-80-10-firefly for the details. The source has been dowloaded from http://download.ceph.com/tarballs/ceph-0.80.11.tar.gz Packaging rules have been picked from http://archive.ubuntu.com/ubuntu/pool/main/c/ceph/ceph_0.80.11-0ubuntu1.14.04.1.dsc http://archive.ubuntu.com/ubuntu/pool/main/c/ceph/ceph_0.80.11-0ubuntu1.14.04.1.debian.tar.xz Additional patches: - rgw-fix-empty-json-response-when-getting-user-quota.patch picked from https://github.com/ceph/ceph/commit/64fceed2202c94edf28b8315fe14c9affa8c0116 fixes http://tracker.ceph.com/issues/12117 - ObjectCacher-fix-bh_read_finish-offset-logic.patch picked from https://github.com/ceph/ceph/commit/9ec6e7f608608088d51e449c9d375844631dcdde fixes http://tracker.ceph.com/issues/17545 Dropped patches: - url_encode_exposed_bucket.patch, included upstream Closes-Bug: #1532882 Related-Bug: #1532967 Change-Id: I0f8d6c2b94bad92c545768604dc3d1fad1090ee9 --- diff --git a/ceph/Makefile.am b/ceph/Makefile.am index cba3af2b..7b6960c5 100644 --- a/ceph/Makefile.am +++ b/ceph/Makefile.am @@ -20,9 +20,9 @@ EXTRA_DIST += \ # why is it so hard to make autotools to this? install-data-local: -mkdir -p $(DESTDIR)$(datadir)/ceph - -install -m 644 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com - -install -m 644 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com - -install -m 644 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub + -install -m 600 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com + -install -m 600 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com + -install -m 600 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub all-local: if WITH_DEBUG diff --git a/ceph/Makefile.in b/ceph/Makefile.in index eb16431e..969724b8 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 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,15 +858,15 @@ 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? install-data-local: -mkdir -p $(DESTDIR)$(datadir)/ceph - -install -m 644 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com - -install -m 644 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com - -install -m 644 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub + -install -m 600 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com + -install -m 600 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com + -install -m 600 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub all-local: # We need gtest to build the rados-api tests. We only build those in 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/ar-lib b/ceph/ar-lib index c0286a4c..fe2301e7 100755 --- a/ceph/ar-lib +++ b/ceph/ar-lib @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-01-30.22; # UTC +scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010, 2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2013 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify @@ -153,7 +153,9 @@ action=${action#-} delete= extract= list= +quick= replace= +index= create= while test -n "$action" @@ -162,7 +164,10 @@ do d*) delete=yes ;; x*) extract=yes ;; t*) list=yes ;; + q*) quick=yes ;; r*) replace=yes ;; + s*) index=yes ;; + S*) ;; # the index is always updated implicitly c*) create=yes ;; u*) ;; # TODO: don't ignore the update modifier v*) ;; # TODO: don't ignore the verbose modifier @@ -173,8 +178,8 @@ do action=${action#?} done -case $delete$extract$list$replace in - yes) +case $delete$extract$list$quick$replace,$index in + yes,* | ,yes) ;; yesyes*) func_error "more than one action specified" @@ -225,7 +230,7 @@ elif test -n "$extract"; then done fi -elif test -n "$replace"; then +elif test -n "$quick$replace"; then if test ! -f "$orig_archive"; then if test -z "$create"; then echo "$me: creating $orig_archive" diff --git a/ceph/autogen.sh b/ceph/autogen.sh index 103caa45..e7124525 100755 --- a/ceph/autogen.sh +++ b/ceph/autogen.sh @@ -23,6 +23,15 @@ else exit 1 fi +if test -d ".git" ; then + force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi) + if ! git submodule sync || ! git submodule update $force --init --recursive; then + echo "Error: could not initialize submodule projects" + echo " Network connectivity might be required." + exit 1 + fi +fi + rm -f config.cache aclocal -I m4 --install check_for_pkg_config diff --git a/ceph/ceph.spec b/ceph/ceph.spec index 4984c05c..772cc8a9 100644 --- a/ceph/ceph.spec +++ b/ceph/ceph.spec @@ -5,11 +5,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif +%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} + ################################################################################# # common ################################################################################# + Name: ceph -Version: 0.80.9 +Version: 0.80.11 Release: 0%{?dist} Summary: User space components of the Ceph file system License: GPL-2.0 @@ -24,7 +27,6 @@ Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} Requires: ceph-common = %{version}-%{release} Requires: python -Requires: python-argparse Requires: python-ceph Requires: python-requests Requires: python-flask @@ -44,7 +46,6 @@ BuildRequires: gdbm BuildRequires: pkgconfig BuildRequires: python BuildRequires: python-nose -BuildRequires: python-argparse BuildRequires: libaio-devel BuildRequires: libcurl-devel BuildRequires: libxml2-devel @@ -77,7 +78,6 @@ BuildRequires: %insserv_prereq BuildRequires: mozilla-nss-devel BuildRequires: keyutils-devel BuildRequires: libatomic-ops-devel -BuildRequires: fdupes %else Requires: gdisk BuildRequires: nss-devel @@ -107,6 +107,11 @@ Requires: librados2 = %{version}-%{release} Requires: python-ceph = %{version}-%{release} Requires: python-requests Requires: redhat-lsb-core +# python-argparse is only needed in distros with Python 2.6 or lower +%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?suse_version} && 0%{?suse_version} <= 1110) +Requires: python-argparse +BuildRequires: python-argparse +%endif %description -n ceph-common common utilities to mount and interact with a ceph storage cluster @@ -219,9 +224,6 @@ Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} Requires: librbd1 = %{version}-%{release} -%if 0%{defined suse_version} -%py_requires -%endif %description -n python-ceph This package contains Python libraries for interacting with Cephs RADOS object storage. @@ -262,8 +264,13 @@ License: LGPL-2.0 Requires: java Requires: libcephfs_jni1 = %{version}-%{release} BuildRequires: java-devel +%if 0%{?el6} Requires: junit4 BuildRequires: junit4 +%else +Requires: junit +BuildRequires: junit +%endif %description -n cephfs-java This package contains the Java libraries for the Ceph File System. @@ -352,13 +359,8 @@ 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 || 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 -install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules -install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -%endif +install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT%{_udevrulesdir}/50-rbd.rules +install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT%{_udevrulesdir}/60-ceph-partuuid-workaround.rules %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 @@ -385,12 +387,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-osd mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-mds mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/radosgw -%if %{defined suse_version} -# Fedora seems to have some problems with this macro, use it only on SUSE -%fdupes -s $RPM_BUILD_ROOT/%{python_sitelib} -%fdupes %buildroot -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -449,8 +445,10 @@ fi %{_sbindir}/ceph-create-keys %{_sbindir}/rcceph %if 0%{?rhel} >= 7 || 0%{?fedora} +%{_sbindir}/mkcephfs %{_sbindir}/mount.ceph %else +/sbin/mkcephfs /sbin/mount.ceph %endif %dir %{_libdir}/ceph @@ -475,16 +473,12 @@ 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 || 0%{?fedora} -/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -/usr/lib/udev/rules.d/95-ceph-osd.rules -%else -/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -/lib/udev/rules.d/95-ceph-osd.rules -%endif +%{_udevrulesdir}/60-ceph-partuuid-workaround.rules +%{_udevrulesdir}/95-ceph-osd.rules %config %{_sysconfdir}/bash_completion.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw +%{_mandir}/man8/ceph-disk.8* %{_mandir}/man8/ceph-mon.8* %{_mandir}/man8/ceph-mds.8* %{_mandir}/man8/ceph-osd.8* @@ -540,6 +534,7 @@ fi %config %{_sysconfdir}/bash_completion.d/rbd %config(noreplace) %{_sysconfdir}/ceph/rbdmap %{_initrddir}/rbdmap +%{_udevrulesdir}/50-rbd.rules %postun -n ceph-common # Package removal cleanup @@ -706,8 +701,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_bindir}/ceph_smalliobenchdumb %{_bindir}/ceph_smalliobenchfs %{_bindir}/ceph_smalliobenchrbd -%{_bindir}/ceph_filestore_dump -%{_bindir}/ceph_filestore_tool +%{_bindir}/ceph-objectstore-tool %{_bindir}/ceph_streamtest %{_bindir}/ceph_test_* %{_bindir}/ceph_tpbench diff --git a/ceph/ceph.spec.in b/ceph/ceph.spec.in index 02b300bd..67a38258 100644 --- a/ceph/ceph.spec.in +++ b/ceph/ceph.spec.in @@ -5,9 +5,12 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif +%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} + ################################################################################# # common ################################################################################# + Name: ceph Version: @VERSION@ Release: @RPM_RELEASE@%{?dist} @@ -24,7 +27,6 @@ Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} Requires: ceph-common = %{version}-%{release} Requires: python -Requires: python-argparse Requires: python-ceph Requires: python-requests Requires: python-flask @@ -44,7 +46,6 @@ BuildRequires: gdbm BuildRequires: pkgconfig BuildRequires: python BuildRequires: python-nose -BuildRequires: python-argparse BuildRequires: libaio-devel BuildRequires: libcurl-devel BuildRequires: libxml2-devel @@ -77,7 +78,6 @@ BuildRequires: %insserv_prereq BuildRequires: mozilla-nss-devel BuildRequires: keyutils-devel BuildRequires: libatomic-ops-devel -BuildRequires: fdupes %else Requires: gdisk BuildRequires: nss-devel @@ -107,6 +107,11 @@ Requires: librados2 = %{version}-%{release} Requires: python-ceph = %{version}-%{release} Requires: python-requests Requires: redhat-lsb-core +# python-argparse is only needed in distros with Python 2.6 or lower +%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?suse_version} && 0%{?suse_version} <= 1110) +Requires: python-argparse +BuildRequires: python-argparse +%endif %description -n ceph-common common utilities to mount and interact with a ceph storage cluster @@ -219,9 +224,6 @@ Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} Requires: librbd1 = %{version}-%{release} -%if 0%{defined suse_version} -%py_requires -%endif %description -n python-ceph This package contains Python libraries for interacting with Cephs RADOS object storage. @@ -262,8 +264,13 @@ License: LGPL-2.0 Requires: java Requires: libcephfs_jni1 = %{version}-%{release} BuildRequires: java-devel +%if 0%{?el6} Requires: junit4 BuildRequires: junit4 +%else +Requires: junit +BuildRequires: junit +%endif %description -n cephfs-java This package contains the Java libraries for the Ceph File System. @@ -352,13 +359,8 @@ 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 || 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 -install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules -install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -%endif +install -m 0644 -D udev/50-rbd.rules $RPM_BUILD_ROOT%{_udevrulesdir}/50-rbd.rules +install -m 0644 -D udev/60-ceph-partuuid-workaround.rules $RPM_BUILD_ROOT%{_udevrulesdir}/60-ceph-partuuid-workaround.rules %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 @@ -385,12 +387,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-osd mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-mds mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/radosgw -%if %{defined suse_version} -# Fedora seems to have some problems with this macro, use it only on SUSE -%fdupes -s $RPM_BUILD_ROOT/%{python_sitelib} -%fdupes %buildroot -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -449,8 +445,10 @@ fi %{_sbindir}/ceph-create-keys %{_sbindir}/rcceph %if 0%{?rhel} >= 7 || 0%{?fedora} +%{_sbindir}/mkcephfs %{_sbindir}/mount.ceph %else +/sbin/mkcephfs /sbin/mount.ceph %endif %dir %{_libdir}/ceph @@ -475,16 +473,12 @@ 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 || 0%{?fedora} -/usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -/usr/lib/udev/rules.d/95-ceph-osd.rules -%else -/lib/udev/rules.d/60-ceph-partuuid-workaround.rules -/lib/udev/rules.d/95-ceph-osd.rules -%endif +%{_udevrulesdir}/60-ceph-partuuid-workaround.rules +%{_udevrulesdir}/95-ceph-osd.rules %config %{_sysconfdir}/bash_completion.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/ceph %config(noreplace) %{_sysconfdir}/logrotate.d/radosgw +%{_mandir}/man8/ceph-disk.8* %{_mandir}/man8/ceph-mon.8* %{_mandir}/man8/ceph-mds.8* %{_mandir}/man8/ceph-osd.8* @@ -540,6 +534,7 @@ fi %config %{_sysconfdir}/bash_completion.d/rbd %config(noreplace) %{_sysconfdir}/ceph/rbdmap %{_initrddir}/rbdmap +%{_udevrulesdir}/50-rbd.rules %postun -n ceph-common # Package removal cleanup @@ -706,8 +701,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_bindir}/ceph_smalliobenchdumb %{_bindir}/ceph_smalliobenchfs %{_bindir}/ceph_smalliobenchrbd -%{_bindir}/ceph_filestore_dump -%{_bindir}/ceph_filestore_tool +%{_bindir}/ceph-objectstore-tool %{_bindir}/ceph_streamtest %{_bindir}/ceph_test_* %{_bindir}/ceph_tpbench 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 1953007a..b39fb90d 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.9. +# Generated by GNU Autoconf 2.69 for ceph 0.80.11. # # 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.9' -PACKAGE_STRING='ceph 0.80.9' +PACKAGE_VERSION='0.80.11' +PACKAGE_STRING='ceph 0.80.11' 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.9 to adapt to many kinds of systems. +\`configure' configures ceph 0.80.11 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.9:";; + short | recursive ) echo "Configuration of ceph 0.80.11:";; 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.9 -generated by GNU Autoconf 2.68 +ceph configure 0.80.11 +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.9, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by ceph $as_me 0.80.11, 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.9' + VERSION='0.80.11' 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 @@ -5790,7 +5859,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -6025,7 +6095,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 +6135,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 @@ -6191,10 +6261,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6233,7 +6299,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -6371,7 +6437,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 +6477,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 +6580,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 +6624,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 +6749,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 +6789,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 +6848,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 +6888,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 @@ -7314,7 +7380,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7330,9 +7396,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7351,7 +7427,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -7471,7 +7550,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 +7590,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 +7670,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 +7710,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 +7762,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 +7802,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 +7854,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 +7894,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 +7946,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 +7986,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 +8038,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 +8078,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 @@ -9159,7 +9238,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -11329,17 +11408,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -11456,7 +11524,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12520,8 +12588,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 +12622,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 +12640,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 +12649,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 +12728,7 @@ fi # Define the identity of the package. PACKAGE='ceph' - VERSION='0.80.9' + VERSION='0.80.11' cat >>confdefs.h <<_ACEOF @@ -12688,17 +12756,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 +12789,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 +12825,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 +12843,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 +12852,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 +12907,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 +13048,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 +13092,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 +13288,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 +13324,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 +13342,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 +13351,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} @@ -14094,9 +14214,6 @@ fi ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes @@ -14258,7 +14375,7 @@ fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -15118,7 +15235,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -15990,17 +16107,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -16117,7 +16223,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -16510,8 +16616,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 +16652,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 +16670,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 +16679,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 +17225,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 +17380,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 +18015,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 +18058,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 +19110,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 +19153,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 +19190,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 19087 "configure" */ +/* #line 19193 "configure" */ public class Test { } EOF @@ -19126,7 +19232,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 +19302,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 +19345,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 +21694,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 +21713,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 +21727,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 +21771,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 +21837,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 +21869,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 +21913,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 +22064,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 +22502,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 +22571,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 +22601,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.9, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by ceph $as_me 0.80.11, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -22530,11 +22667,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.9 -configured by $0, generated by GNU Autoconf 2.68, +ceph config.status 0.80.11 +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 +22762,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 +23778,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 +23791,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 +23825,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 46217388..4b0bec29 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.9], [ceph-devel@vger.kernel.org]) +AC_INIT([ceph], [0.80.11], [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/m4/libtool.m4 b/ceph/m4/libtool.m4 index 828104cf..d7c043f4 100644 --- a/ceph/m4/libtool.m4 +++ b/ceph/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,9 +1324,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1688,7 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2512,17 +2526,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2642,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3255,10 +3258,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3296,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4048,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4347,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6240,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +6401,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff --git a/ceph/man/Makefile.am b/ceph/man/Makefile.am index be071b17..2ba11dcc 100644 --- a/ceph/man/Makefile.am +++ b/ceph/man/Makefile.am @@ -1,6 +1,7 @@ AUTOMAKE_OPTIONS = gnu dist_man_MANS = \ + ceph-disk.8 \ ceph-osd.8 \ ceph-mds.8 \ ceph-mon.8 \ diff --git a/ceph/man/Makefile.in b/ceph/man/Makefile.in index e5732312..aef60af0 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@ @@ -277,6 +333,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = gnu dist_man_MANS = \ + ceph-disk.8 \ ceph-osd.8 \ ceph-mds.8 \ ceph-mon.8 \ @@ -346,11 +403,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 +444,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 +589,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/man/ceph-disk.8 b/ceph/man/ceph-disk.8 new file mode 100644 index 00000000..32d98c53 --- /dev/null +++ b/ceph/man/ceph-disk.8 @@ -0,0 +1,272 @@ +.\" Man page generated from reStructuredText. +. +.TH "CEPH-DISK" "8" "November 26, 2014" "dev" "Ceph" +.SH NAME +ceph-disk \- Ceph disk preparation and activation utility for OSD +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.SH SYNOPSIS +.nf +\fBceph\-disk\fP \fBprepare\fP [\-\-cluster \fIclustername\fP] [\-\-cluster\-uuid \fIuuid\fP] +[\-\-fs\-type \fIxfs|ext4|btrfs\fP] [\fIdata\-path\fP] [\fIjournal\-path\fP] +.fi +.sp +.nf +\fBceph\-disk\fP \fBactivate\fP [\fIdata\-path\fP] [\-\-activate\-key \fIpath\fP] +.fi +.sp +.nf +\fBceph\-disk\fP \fBactivate\-all\fP +.fi +.sp +.nf +\fBceph\-disk\fP \fBlist\fP +.fi +.sp +.SH DESCRIPTION +.sp +\fBceph\-disk\fP is a utility that can prepare and activate a disk, partition or +directory as a ceph OSD. It is run directly or triggered by \fBceph\-deploy\fP +or udev. +.sp +It actually automates the multiple steps involved in manual creation and start +of an OSD into 2 steps of preparing and activating the OSD by using the +subcommands \fBprepare\fP and \fBactivate\fP\&. +.SH SUBCOMMANDS +.sp +\fBprepare\fP: Prepare a directory, disk or drive for a ceph OSD. It creates a GPT +partition, marks the partition with ceph type uuid, creates a file system, marks +the file system as ready for ceph consumption, uses entire partition and adds a +new partition to the journal disk. It is run directly or triggered by +\fBceph\-deploy\fP\&. +.sp +Usage: ceph\-disk prepare \-\-cluster [cluster\-name] \-\-cluster\-uuid [uuid] \-\-fs\-type +[ext4|xfs|btrfs] [data\-path] [journal\-path] +.sp +Other options like \-\-osd\-uuid, \-\-journal\-uuid, \-\-zap\-disk, \-\-data\-dir, \-\-data\-dev, +\-\-journal\-file, \-\-journal\-dev, \-\-dmcrypt and \-\-dmcrypt\-key\-dir can also be used +with the subcommand. +.sp +\fBactivate\fP: Activate the ceph OSD. It mounts the volume in a temporary +location, allocates an OSD id (if needed), remounts in the correct location +/var/lib/ceph/osd/$cluster\-$id and starts ceph\-osd. It is triggered by udev +when it sees the OSD GPT partition type or on ceph service start with +\(aqceph disk activate\-all\(aq. It is also run directly or triggered by \fBceph\-deploy\fP\&. +.sp +Usage: ceph\-disk activate [PATH] +.sp +Here, [PATH] is path to block device or directory. +.sp +An additional option [\-\-activate\-key PATH] has to be used with this subcommand +when a copy of /var/lib/ceph/bootstrap\-osd/{cluster}.keyring isn\(aqt present in the +OSD node. +.sp +Usage: ceph\-disk activate [PATH] [\-\-activate\-key PATH] +.sp +Another option \-\-mark\-init can also be used with this subcommand. +.sp +\fBactivate\-journal\fP: Activate an OSD via it\(aqs journal device. udev triggers +\(aqceph\-disk activate\-journal \(aq based on the partition type. +.sp +Usage: ceph\-disk activate\-journal [DEV] +.sp +Here, [DEV] is the path to journal block device. +.sp +Others options can also be used with this subcommand like \-\-activate\-key and +\-\-mark\-init. +.sp +Usage: ceph\-disk activate\-journal [\-\-activate\-key PATH] [\-\-mark\-init INITSYSTEM] +[DEV] +.sp +\fBactivate\-all\fP: Activate all tagged OSD partitions. activate\-all relies on +/dev/disk/by\-parttype\-uuid/$typeuuid.$uuid to find all partitions. Special udev +rules are installed to create these links. It is triggered on ceph service start +or run directly. +.sp +Usage: ceph\-disk activate\-all +.sp +Others options can also be used with this subcommand like \-\-activate\-key and +\-\-mark\-init. +.sp +Usage: ceph\-disk activate\-all [\-\-activate\-key PATH] [\-\-mark\-init INITSYSTEM] +.sp +\fBlist\fP: List disk partitions and ceph OSDs. It is run directly or triggered +by \fBceph\-deploy\fP\&. +.sp +Usage: ceph\-disk list +.sp +\fBsuppress\-activate\fP: Suppress activate on a device (prefix). +Mark devices that you want to suppress activate with a file like +/var/lib/ceph/tmp/suppress\-activate.sdb where the last bit is +the sanitized device name (/dev/X without the /dev/ prefix). A +function is_suppressed() checks for and matches a prefix (/dev/). +It means suppressing sdb will stop activate on sdb1, sdb2, etc. +.sp +Usage: ceph\-disk suppress\-activate [PATH] +.sp +Here, [PATH] is path to block device or directory. +.sp +\fBunsuppress\-activate\fP: Stop suppressing activate on a device (prefix). +.sp +Usage: ceph\-disk unsuppress\-activate [PATH] +.sp +Here, [PATH] is path to block device or directory. +.sp +\fBzap\fP: Zap/erase/destroy a device\(aqs partition table and contents. +It actually uses \(aqsgdisk\(aq and it\(aqs option \(aq\-\-zap\-all\(aq to destroy both +GPT and MBR data structures so that the disk becomes suitable for +repartitioning. \(aqsgdisk\(aq then uses \(aq\-\-mbrtogpt\(aq to convert the MBR or +BSD disklabel disk to a GPT disk. The \fBprepare\fP subcommand can now be +executed which will create a new GPT partition. It is also run directly +or triggered by \fBceph\-deploy\fP\&. +.sp +Usage: ceph\-disk zap [DEV] +.sp +Here, [DEV] is path to block device. +.SH OPTIONS +.INDENT 0.0 +.TP +.B \-\-prepend\-to\-path PATH +Prepend PATH to $PATH for backward compatibility (default /usr/bin). +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-statedir PATH +Directory in which ceph configuration is preserved (default /usr/lib/ceph). +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-sysconfdir PATH +Directory in which ceph configuration files are found (default /etc/ceph). +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-cluster +Provide name of the ceph cluster in which the OSD is being prepared. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-cluster\-uuid +Provide uuid of the ceph cluster in which the OSD is being prepared. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-fs\-type +Provide the filesytem type for the OSD. e.g. \(aqxfs/ext4/btrfs\(aq. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-osd\-uuid +Unique OSD uuid to assign to the disk. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-journal\-uuid +Unique uuid to assign to the journal. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-zap\-disk +Destroy the partition table and content of a disk. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-data\-dir +Verify that [data\-path] is of a directory. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-data\-dev +Verify that [data\-path] is of a block device. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-journal\-file +Verify that journal is a file. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-journal\-dev +Verify that journal is a block device. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-dmcrypt +Encrypt [data\-path] and/or journal devices with dm\-crypt. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-dmcrypt\-key\-dir +Directory where dm\-crypt keys are stored. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-activate\-key +Use when a copy of /var/lib/ceph/bootstrap\-osd/{cluster}.keyring isn\(aqt +present in the OSD node. Suffix the option by the path to the keyring. +.UNINDENT +.INDENT 0.0 +.TP +.B \-\-mark\-init +Provide init system to manage the OSD directory. +.UNINDENT +.SH AVAILABILITY +.sp +\fBceph\-disk\fP is a part of the Ceph distributed storage system. Please refer to +the Ceph documentation at \fI\%http://ceph.com/docs\fP for more information. +.SH COPYRIGHT +2010-2014, Inktank Storage, Inc. and contributors. Licensed under Creative Commons BY-SA +.\" Generated by docutils manpage writer. +. diff --git a/ceph/man/ceph.8 b/ceph/man/ceph.8 index 5f7b8dc7..16513e72 100644 --- a/ceph/man/ceph.8 +++ b/ceph/man/ceph.8 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "CEPH" "8" "December 18, 2014" "dev" "Ceph" +.TH "CEPH" "8" "March 13, 2015" "dev" "Ceph" .SH NAME ceph \- ceph administration tool . @@ -59,27 +59,47 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .. .SH SYNOPSIS .nf -\fBceph\fP \fBauth\fP \fIadd\fP \fI\fP {\fI\fP [\fI\fP\&...]} +\fBceph\fP \fBauth\fP [ \fIadd\fP | \fIcaps\fP | \fIdel\fP | \fIexport\fP | \fIget\fP | \fIget\-key\fP | \fIget\-or\-create\fP | \fIget\-or\-create\-key\fP | \fIimport\fP | \fIlist\fP | \fIprint\-key\fP | \fIprint_key\fP ] ... .fi .sp .nf -\fBceph\fP \fBauth\fP \fIexport\fP \fI\fP +\fBceph\fP \fBcompact\fP .fi .sp .nf -\fBceph\fP \fBconfig\-key\fP \fIget\fP \fI\fP +\fBceph\fP \fBconfig\-key\fP [ \fIdel\fP | \fIexists\fP | \fIget\fP | \fIlist\fP | \fIput\fP ] ... .fi .sp .nf -\fBceph\fP \fBmds\fP \fIadd_data_pool\fP \fI\fP +\fBceph\fP \fBdf\fP \fI{detail}\fP .fi .sp .nf -\fBceph\fP \fBmds\fP \fIgetmap\fP {\fI\fP} +\fBceph\fP \fBfsid\fP .fi .sp .nf -\fBceph\fP \fBmon\fP \fIadd\fP \fI\fP <\fIIPaddr[:port]\fP> +\fBceph\fP \fBhealth\fP \fI{detail}\fP +.fi +.sp +.nf +\fBceph\fP \fBheap\fP [ \fIdump\fP | \fIstart_profiler\fP | \fIstop_profiler\fP | \fIrelease\fP | \fIstats\fP ] ... +.fi +.sp +.nf +\fBceph\fP \fBinjectargs\fP \fI\fP [ \fI\fP\&... ] +.fi +.sp +.nf +\fBceph\fP \fBlog\fP \fI\fP [ \fI\fP\&... ] +.fi +.sp +.nf +\fBceph\fP \fBmds\fP [ \fIadd_data_pool\fP | \fIcluster_down\fP | \fIcluster_up\fP | \fIcompat\fP | \fIdeactivate\fP | \fIdump\fP | \fIfail\fP | \fIgetmap\fP | \fInewfs\fP | \fIremove_data_pool\fP | \fIrm\fP | \fIrmfailed\fP | \fIset\fP | \fIset_max_mds\fP | \fIset_state\fP | \fIsetmap\fP | \fIstat\fP | \fIstop\fP | \fItell\fP ] ... +.fi +.sp +.nf +\fBceph\fP \fBmon\fP [ \fIadd\fP | \fIdump\fP | \fIgetmap\fP | \fIremove\fP | \fIstat\fP ] ... .fi .sp .nf @@ -87,27 +107,53 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .fi .sp .nf -\fBceph\fP \fBosd\fP \fIcreate\fP {\fI\fP} +\fBceph\fP \fBosd\fP [ \fIblacklist\fP | \fIcreate\fP | \fIdeep\-scrub\fP | \fIdown\fP | \fIdump\fP | \fIerasure\-code\-profile\fP | \fIfind\fP | \fIgetcrushmap\fP | \fIgetmap\fP | \fIgetmaxosd\fP | \fIin\fP | \fIlost\fP | \fIls\fP | \fIlspools\fP | \fImap\fP | \fImetadata\fP | \fIout\fP | \fIpause\fP | \fIperf\fP | \fIprimary\-affinity\fP | \fIprimary\-temp\fP | \fIrepair\fP | \fIreweight\fP | \fIreweight\-by\-utilization\fP | \fIrm\fP | \fIscrub\fP | \fIset\fP | \fIsetcrushmap\fP | \fIsetmaxosd\fP | \fIstat\fP | \fIthrash\fP | \fItree\fP | \fIunpause\fP | \fIunset\fP ] ... .fi .sp .nf -\fBceph\fP \fBosd\fP \fBcrush\fP \fIadd\fP \fI\fP +\fBceph\fP \fBosd\fP \fBcrush\fP [ \fIadd\fP | \fIadd\-bucket\fP | \fIcreate\-or\-move\fP | \fIdump\fP | \fIget\-tunable\fP | \fIlink\fP | \fImove\fP | \fIremove\fP | \fIreweight\fP | \fIreweight\-all\fP | \fIrm\fP | \fIrule\fP | \fIset\fP | \fIset\-tunable\fP | \fIshow\-tunables\fP | \fItunables\fP | \fIunlink\fP ] ... .fi .sp +.nf +\fBceph\fP \fBosd\fP \fBpool\fP [ \fIcreate\fP | \fIdelete\fP | \fIget\fP | \fIget\-quota\fP | \fImksnap\fP | \fIrename\fP | \fIrmsnap\fP | \fIset\fP | \fIset\-quota\fP | \fIstats\fP ] ... +.fi .sp -\fI\fP \fI\fP [\fI\fP\&...] .nf -\fBceph\fP \fBpg\fP \fIforce_create_pg\fP \fI\fP +\fBceph\fP \fBosd\fP \fBtier\fP [ \fIadd\fP | \fIadd\-cache\fP | \fIcache\-mode\fP | \fIremove\fP | \fIremove\-overlay\fP | \fIset\-overlay\fP ] ... .fi .sp .nf -\fBceph\fP \fBpg\fP \fIstat\fP +\fBceph\fP \fBpg\fP [ \fIdebug\fP | \fIdeep\-scrub\fP | \fIdump\fP | \fIdump_json\fP | \fIdump_pools_json\fP | \fIdump_stuck\fP | \fIforce_create_pg\fP | \fIgetmap\fP | \fImap\fP | \fIrepair\fP | \fIscrub\fP | \fIsend_pg_creates\fP | \fIset_full_ratio\fP | \fIset_nearfull_ratio\fP | \fIstat\fP ] ... +.fi +.sp +.nf +\fBceph\fP \fBquorum\fP [ \fIenter\fP | \fIexit\fP ] .fi .sp .nf \fBceph\fP \fBquorum_status\fP .fi .sp +.nf +\fBceph\fP \fBreport\fP { \fI\fP [ \fI...\fP ] } +.fi +.sp +.nf +\fBceph\fP \fBscrub\fP +.fi +.sp +.nf +\fBceph\fP \fBstatus\fP +.fi +.sp +.nf +\fBceph\fP \fBsync\fP \fBforce\fP {\-\-yes\-i\-really\-mean\-it} {\-\-i\-know\-what\-i\-am\-doing} +.fi +.sp +.nf +\fBceph\fP \fBtell\fP \fI [...]\fP +.fi +.sp .SH DESCRIPTION .sp \fBceph\fP is a control utility which is used for manual deployment and maintenance @@ -313,7 +359,7 @@ ceph compact .sp Manage configuration key. It uses some additional subcommands. .sp -Subcommand \fBget\fP gets the configuration key. +Subcommand \fBdel\fP deletes configuration key. .sp Usage: .INDENT 0.0 @@ -321,13 +367,13 @@ Usage: .sp .nf .ft C -ceph config\-key get +ceph config\-key del .ft P .fi .UNINDENT .UNINDENT .sp -Subcommand \fBput\fP puts configuration key and values. +Subcommand \fBexists\fP checks for configuration keys existence. .sp Usage: .INDENT 0.0 @@ -335,13 +381,13 @@ Usage: .sp .nf .ft C -ceph config\-key put {} +ceph config\-key exists .ft P .fi .UNINDENT .UNINDENT .sp -Subcommand \fBexists\fP checks for configuration keys existence. +Subcommand \fBget\fP gets the configuration key. .sp Usage: .INDENT 0.0 @@ -349,7 +395,7 @@ Usage: .sp .nf .ft C -ceph config\-key exists +ceph config\-key get .ft P .fi .UNINDENT @@ -369,7 +415,7 @@ ceph config\-key list .UNINDENT .UNINDENT .sp -Subcommand \fBdel\fP deletes configuration key. +Subcommand \fBput\fP puts configuration key and values. .sp Usage: .INDENT 0.0 @@ -377,7 +423,7 @@ Usage: .sp .nf .ft C -ceph config\-key del +ceph config\-key put {} .ft P .fi .UNINDENT @@ -392,7 +438,7 @@ Usage: .sp .nf .ft C -ceph df +ceph df {detail} .ft P .fi .UNINDENT @@ -422,7 +468,7 @@ Usage: .sp .nf .ft C -ceph health +ceph health {detail} .ft P .fi .UNINDENT @@ -676,6 +722,20 @@ ceph mds rmfailed .UNINDENT .UNINDENT .sp +Subcommand \fBset\fP set mds parameter to +.sp +Usage: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +ceph mds set max_mds|max_file_size|allow_new_snaps|inline_data {} +.ft P +.fi +.UNINDENT +.UNINDENT +.sp Subcommand \fBset_max_mds\fP sets max MDS index. .sp Usage: @@ -833,8 +893,9 @@ ceph mon stat .fi .UNINDENT .UNINDENT +.SS mon_status .sp -Subcommand \fBmon_status\fP reports status of monitors. +Reports status of monitors. .sp Usage: .INDENT 0.0 @@ -852,6 +913,52 @@ ceph mon_status Manage OSD configuration and administration. It uses some additional subcommands. .sp +Subcommand \fBblacklist\fP manage blacklisted clients. It uses some additional +subcommands. +.sp +Subcommand \fBadd\fP add to blacklist (optionally until seconds +from now) +.sp +Usage: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +ceph osd blacklist add {} +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Subcommand \fBls\fP show blacklisted clients +.sp +Usage: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +ceph osd blacklist ls +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Subcommand \fBrm\fP remove from blacklist +.sp +Usage: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +ceph osd blacklist rm +.ft P +.fi +.UNINDENT +.UNINDENT +.sp Subcommand \fBcreate\fP creates new osd (with optional UUID). .sp Usage: @@ -909,13 +1016,12 @@ Usage: .nf .ft C ceph osd crush create\-or\-move +[...] .ft P .fi .UNINDENT .UNINDENT .sp -[...] -.sp Subcommand \fBdump\fP dumps crush map. .sp Usage: @@ -930,6 +1036,20 @@ ceph osd crush dump .UNINDENT .UNINDENT .sp +Subcommand \fBget\-tunable\fP get crush tunable straw_calc_version +.sp +Usage: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +ceph osd crush get\-tunable straw_calc_version +.ft P +.fi +.UNINDENT +.UNINDENT +.sp Subcommand \fBlink\fP links existing entry for under location . .sp Usage: @@ -987,6 +1107,21 @@ ceph osd crush reweight .UNINDENT .UNINDENT .sp +Subcommand \fBreweight\-all\fP recalculate the weights for the tree to +ensure they sum correctly +.sp +Usage: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +ceph osd crush reweight\-all +.ft P +.fi +.UNINDENT +.UNINDENT +.sp Subcommand \fBrm\fP removes from crush map (everywhere, or just at ). .sp @@ -1092,7 +1227,7 @@ ceph osd crush rule rm .UNINDENT .UNINDENT .sp -Subcommand \fBset\fP sets crush map from input file. +Subcommand \fBset\fP used alone, sets crush map from input file. .sp Usage: .INDENT 0.0 @@ -1121,6 +1256,21 @@ ceph osd crush set [...] .UNINDENT .UNINDENT .sp +Subcommand \fBset\-tunable\fP set crush tunable to . The only +tunable that can be set is straw_calc_version. +.sp +Usage: +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +ceph osd crush set\-tunable straw_calc_version +.ft P +.fi +.UNINDENT +.UNINDENT +.sp Subcommand \fBshow\-tunables\fP shows current crush tunables. .sp Usage: @@ -1505,7 +1655,7 @@ Usage: .nf .ft C ceph osd pool get size|min_size|crash_replay_interval|pg_num| -pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp| +pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp ceph osd pool get auid|target_max_objects|target_max_bytes @@ -1582,19 +1732,12 @@ Usage: .sp .nf .ft C -ceph osd pool set size|min_size|crash_replay_interval|pg_num| -pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period| - -ceph osd pool set hit_set_count|hit_set_fpp|debug_fake_ec_pool - -ceph osd pool set target_max_bytes|target_max_objects - -ceph osd pool set cache_target_dirty_ratio|cache_target_full_ratio - -ceph osd pool set cache_min_flush_age - -ceph osd pool set cache_min_evict_age|auid -{\-\-yes\-i\-really\-mean\-it} +ceph osd pool set size|min_size|crash_replay_interval| +pg_num|pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period| +hit_set_count|hit_set_fpp|debug_fake_ec_pool| target_max_bytes| +target_max_objects|cache_target_dirty_ratio|cache_target_full_ratio| +cache_min_flush_age|cache_min_evict_age|auid + {\-\-yes\-i\-really\-mean\-it} .ft P .fi .UNINDENT @@ -1975,9 +2118,7 @@ Usage: .sp .nf .ft C -ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief} - -ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief...} +ceph pg dump {all|summary|sum|delta|pools|osds|pgs|pgs_brief} [{all|summary|sum|delta|pools|osds|pgs|pgs_brief...]} .ft P .fi .UNINDENT @@ -1991,8 +2132,7 @@ Usage: .sp .nf .ft C -ceph pg dump_json {all|summary|sum|pools|osds|pgs[all|summary|sum|pools| -osds|pgs...]} +ceph pg dump_json {all|summary|sum|delta|pools|osds|pgs|pgs_brief} [{all|summary|sum|delta|pools|osds|pgs|pgs_brief...]} .ft P .fi .UNINDENT @@ -2020,8 +2160,7 @@ Usage: .sp .nf .ft C -ceph pg dump_stuck {inactive|unclean|stale[inactive|unclean|stale...]} -{} +ceph pg dump_stuck {inactive|unclean|stale [inactive|unclean|stale...]} {} .ft P .fi .UNINDENT 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/py-compile b/ceph/py-compile index 15c834c4..46ea866a 100755 --- a/ceph/py-compile +++ b/ceph/py-compile @@ -3,8 +3,7 @@ scriptversion=2011-06-08.12; # UTC -# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free -# Software Foundation, Inc. +# Copyright (C) 2000-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 @@ -37,7 +36,7 @@ me=py-compile usage_error () { echo "$me: $*" >&2 - echo "Try \`$me --help' for more information." >&2 + echo "Try '$me --help' for more information." >&2 exit 1 } @@ -117,7 +116,7 @@ else fi $PYTHON -c " -import sys, os, py_compile +import sys, os, py_compile, imp files = '''$files''' @@ -130,12 +129,19 @@ for file in files.split(): continue sys.stdout.write(file) sys.stdout.flush() - py_compile.compile(filepath, filepath + 'c', path) + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath), path) + else: + py_compile.compile(filepath, filepath + 'c', path) sys.stdout.write('\n')" || exit $? # this will fail for python < 1.5, but that doesn't matter ... $PYTHON -O -c " -import sys, os, py_compile +import sys, os, py_compile, imp + +# pypy does not use .pyo optimization +if hasattr(sys, 'pypy_translation_info'): + sys.exit(0) files = '''$files''' sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') @@ -147,7 +153,10 @@ for file in files.split(): continue sys.stdout.write(file) sys.stdout.flush() - py_compile.compile(filepath, filepath + 'o', path) + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) + else: + py_compile.compile(filepath, filepath + 'o', path) sys.stdout.write('\n')" 2>/dev/null || : # Local Variables: diff --git a/ceph/src/.git_version b/ceph/src/.git_version index b5dcc6d6..654f55e2 100644 --- a/ceph/src/.git_version +++ b/ceph/src/.git_version @@ -1,2 +1,2 @@ -b5a67f0e1d15385bc0d60a6da6e7fc810bde6047 -v0.80.9 +8424145d49264624a3b0a204aedb127835161070 +v0.80.11 diff --git a/ceph/src/Makefile.in b/ceph/src/Makefile.in index 5d9ea8b9..1c86a61a 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,35 +84,35 @@ 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) \ - rados$(EXEEXT) $(am__EXEEXT_11) ceph-conf$(EXEEXT) \ - ceph-authtool$(EXEEXT) ceph_mon_store_converter$(EXEEXT) \ - ceph-mon$(EXEEXT) ceph-osd$(EXEEXT) ceph-mds$(EXEEXT) \ - cephfs$(EXEEXT) librados-config$(EXEEXT) ceph-syn$(EXEEXT) \ - $(am__EXEEXT_12) $(am__EXEEXT_13) + ceph-objectstore-tool$(EXEEXT) monmaptool$(EXEEXT) \ + crushtool$(EXEEXT) osdmaptool$(EXEEXT) rados$(EXEEXT) \ + $(am__EXEEXT_11) ceph-conf$(EXEEXT) ceph-authtool$(EXEEXT) \ + ceph_mon_store_converter$(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 = ceph_erasure_code_non_regression$(EXEEXT) \ get_command_descriptions$(EXEEXT) sbin_PROGRAMS = @@ -201,15 +245,14 @@ check_PROGRAMS = unittest_erasure_code_plugin$(EXEEXT) \ @WITH_RADOSGW_TRUE@am__append_55 = ceph_test_cls_rgw @LINUX_TRUE@am__append_56 = ceph_test_objectstore @LINUX_TRUE@am__append_57 = -ldl -@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 +@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 subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_classpath.m4 \ @@ -236,10 +279,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 @@ -324,6 +365,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 \ @@ -1055,10 +1097,16 @@ am_ceph_monstore_tool_OBJECTS = tools/ceph_monstore_tool.$(OBJEXT) ceph_monstore_tool_OBJECTS = $(am_ceph_monstore_tool_OBJECTS) ceph_monstore_tool_DEPENDENCIES = $(am__DEPENDENCIES_5) \ $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1) -am_ceph_osd_OBJECTS = ceph_osd.$(OBJEXT) -ceph_osd_OBJECTS = $(am_ceph_osd_OBJECTS) +am_ceph_objectstore_tool_OBJECTS = \ + tools/ceph_objectstore_tool.$(OBJEXT) +ceph_objectstore_tool_OBJECTS = $(am_ceph_objectstore_tool_OBJECTS) am__DEPENDENCIES_10 = libosd.la $(LIBOSDC) $(am__DEPENDENCIES_5) \ $(am__DEPENDENCIES_7) +ceph_objectstore_tool_DEPENDENCIES = $(am__DEPENDENCIES_10) \ + $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \ + $(am__DEPENDENCIES_1) $(LIBRADOS) $(am__DEPENDENCIES_1) +am_ceph_osd_OBJECTS = ceph_osd.$(OBJEXT) +ceph_osd_OBJECTS = $(am_ceph_osd_OBJECTS) ceph_osd_DEPENDENCIES = $(am__DEPENDENCIES_10) $(am__DEPENDENCIES_6) \ $(LIBCOMMON) am_ceph_osdomap_tool_OBJECTS = tools/ceph_osdomap_tool.$(OBJEXT) @@ -1096,16 +1144,6 @@ 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) \ - $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_ceph_filestore_tool_OBJECTS = tools/ceph_filestore_tool.$(OBJEXT) -ceph_filestore_tool_OBJECTS = $(am_ceph_filestore_tool_OBJECTS) -ceph_filestore_tool_DEPENDENCIES = $(am__DEPENDENCIES_10) \ - $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \ - $(am__DEPENDENCIES_1) am__ceph_kvstorebench_SOURCES_DIST = test/kv_store_bench.cc \ key_value_store/kv_flat_btree_async.cc @LINUX_TRUE@am_ceph_kvstorebench_OBJECTS = \ @@ -2643,6 +2681,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 @@ -2655,7 +2705,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) \ @@ -2664,14 +2715,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) \ @@ -2680,17 +2733,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) \ @@ -2734,12 +2786,12 @@ SOURCES = $(libcls_log_client_a_SOURCES) \ $(ceph_dencoder_SOURCES) $(ceph_fuse_SOURCES) \ $(ceph_kvstore_tool_SOURCES) $(ceph_mds_SOURCES) \ $(ceph_mon_SOURCES) $(ceph_monstore_tool_SOURCES) \ - $(ceph_osd_SOURCES) $(ceph_osdomap_tool_SOURCES) \ - $(ceph_syn_SOURCES) $(ceph_bench_log_SOURCES) \ - $(ceph_dupstore_SOURCES) $(ceph_erasure_code_SOURCES) \ + $(ceph_objectstore_tool_SOURCES) $(ceph_osd_SOURCES) \ + $(ceph_osdomap_tool_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) \ $(ceph_multi_stress_watch_SOURCES) $(ceph_omapbench_SOURCES) \ @@ -2890,13 +2942,12 @@ DIST_SOURCES = $(libcls_log_client_a_SOURCES) \ $(am__ceph_dencoder_SOURCES_DIST) \ $(am__ceph_fuse_SOURCES_DIST) $(ceph_kvstore_tool_SOURCES) \ $(ceph_mds_SOURCES) $(ceph_mon_SOURCES) \ - $(ceph_monstore_tool_SOURCES) $(ceph_osd_SOURCES) \ - $(ceph_osdomap_tool_SOURCES) $(ceph_syn_SOURCES) \ - $(ceph_bench_log_SOURCES) $(ceph_dupstore_SOURCES) \ - $(ceph_erasure_code_SOURCES) \ + $(ceph_monstore_tool_SOURCES) $(ceph_objectstore_tool_SOURCES) \ + $(ceph_osd_SOURCES) $(ceph_osdomap_tool_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) \ $(am__ceph_kvstorebench_SOURCES_DIST) \ $(ceph_mon_store_converter_SOURCES) \ $(ceph_multi_stress_watch_SOURCES) $(ceph_omapbench_SOURCES) \ @@ -3009,14 +3060,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) @@ -3307,13 +3366,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`; \ @@ -3520,7 +3774,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_62) +SUBDIRS = ocf java $(am__append_61) DIST_SUBDIRS = gtest ocf libs3 java BUILT_SOURCES = init-ceph @@ -3855,7 +4109,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_66) +lib_LTLIBRARIES = librados.la librbd.la libcephfs.la $(am__append_65) 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 \ @@ -5026,7 +5280,7 @@ ceph_test_librbd_LDADD = $(LIBRBD) $(LIBRADOS) $(UNITTEST_LDADD) $(CEPH_GLOBAL) ceph_test_librbd_CXXFLAGS = $(UNITTEST_CXXFLAGS) @LINUX_TRUE@ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c @LINUX_TRUE@ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm -@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format +@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} ceph_test_cls_rbd_SOURCES = test/cls_rbd/test_cls_rbd.cc ceph_test_cls_rbd_LDADD = $(LIBRADOS) libcls_rbd_client.la libcls_lock_client.la $(UNITTEST_LDADD) $(RADOS_TEST_LDADD) ceph_test_cls_rbd_CXXFLAGS = $(UNITTEST_CXXFLAGS) @@ -5184,12 +5438,9 @@ ceph_monstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) ceph_kvstore_tool_SOURCES = tools/ceph_kvstore_tool.cc 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_57) -ceph_filestore_dump_SOURCES = tools/ceph_filestore_dump.cc -ceph_filestore_dump_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) \ - $(BOOST_PROGRAM_OPTIONS_LIBS) $(am__append_58) +ceph_objectstore_tool_SOURCES = tools/ceph_objectstore_tool.cc +ceph_objectstore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) \ + $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBRADOS) $(am__append_57) monmaptool_SOURCES = tools/monmaptool.cc monmaptool_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON) crushtool_SOURCES = tools/crushtool.cc @@ -5217,7 +5468,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_60) $(am__append_61) +@WITH_REST_BENCH_TRUE@ $(am__append_59) $(am__append_60) @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) @@ -5328,7 +5579,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 \ @@ -5362,8 +5613,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 @@ -5386,6 +5637,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) @@ -5405,6 +5657,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) @@ -5418,6 +5671,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) @@ -5434,6 +5688,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) @@ -5448,6 +5703,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) @@ -5460,13 +5716,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 \ @@ -5474,6 +5731,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)"; \ } @@ -5489,15 +5748,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 \ @@ -5505,6 +5766,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)"; \ } @@ -5520,24 +5783,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 \ @@ -5545,6 +5812,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)"; \ } @@ -5560,12 +5829,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) @@ -5575,6 +5846,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): @@ -5632,8 +5904,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): @@ -5648,6 +5922,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) rgw/$(am__dirstamp): @@ -5668,6 +5943,7 @@ civetweb/src/$(DEPDIR)/$(am__dirstamp): @: > civetweb/src/$(DEPDIR)/$(am__dirstamp) civetweb/src/libcivetweb_la-civetweb.lo: civetweb/src/$(am__dirstamp) \ civetweb/src/$(DEPDIR)/$(am__dirstamp) + libcivetweb.la: $(libcivetweb_la_OBJECTS) $(libcivetweb_la_DEPENDENCIES) $(EXTRA_libcivetweb_la_DEPENDENCIES) $(AM_V_CXXLD)$(libcivetweb_la_LINK) $(am_libcivetweb_la_rpath) $(libcivetweb_la_OBJECTS) $(libcivetweb_la_LIBADD) $(LIBS) client/$(am__dirstamp): @@ -5690,10 +5966,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): @@ -5704,6 +5982,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): @@ -5714,6 +5993,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): @@ -5724,6 +6004,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) \ @@ -5732,10 +6013,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): @@ -5746,10 +6029,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): @@ -5770,14 +6055,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): @@ -5792,22 +6080,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) \ @@ -5978,6 +6271,7 @@ mds/inode_backtrace.lo: mds/$(am__dirstamp) \ mds/$(DEPDIR)/$(am__dirstamp) mds/mdstypes.lo: mds/$(am__dirstamp) mds/$(DEPDIR)/$(am__dirstamp) mds/flock.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) \ @@ -5992,6 +6286,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): @@ -6011,6 +6306,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): @@ -6022,21 +6318,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): @@ -6048,6 +6348,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): @@ -6116,6 +6417,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: \ @@ -6172,6 +6474,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: \ @@ -6228,26 +6531,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): @@ -6258,6 +6566,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): @@ -6274,6 +6583,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): @@ -6286,6 +6596,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): @@ -6296,6 +6607,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) @@ -6329,6 +6641,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) @@ -6349,9 +6662,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): @@ -6369,6 +6684,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) \ @@ -6411,10 +6727,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) @@ -6456,6 +6774,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) \ @@ -6464,6 +6783,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): @@ -6478,6 +6798,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): @@ -6494,6 +6815,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): @@ -6510,6 +6832,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): @@ -6523,6 +6846,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): @@ -6545,6 +6869,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/librgw_la-librgw.lo: rgw/$(am__dirstamp) \ @@ -6615,6 +6940,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): @@ -6629,18 +6955,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 } \ @@ -6661,7 +6993,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 @@ -6694,14 +7027,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 } \ @@ -6722,7 +7060,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 @@ -6737,14 +7076,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 } \ @@ -6765,7 +7109,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 @@ -6786,16 +7131,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) @@ -6818,38 +7166,53 @@ 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) +tools/ceph_objectstore_tool.$(OBJEXT): tools/$(am__dirstamp) \ + tools/$(DEPDIR)/$(am__dirstamp) + +ceph-objectstore-tool$(EXEEXT): $(ceph_objectstore_tool_OBJECTS) $(ceph_objectstore_tool_DEPENDENCIES) $(EXTRA_ceph_objectstore_tool_DEPENDENCIES) + @rm -f ceph-objectstore-tool$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(ceph_objectstore_tool_OBJECTS) $(ceph_objectstore_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) @@ -6861,72 +7224,73 @@ 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) test/kv_store_bench.$(OBJEXT): test/$(am__dirstamp) \ test/$(DEPDIR)/$(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) @@ -6938,21 +7302,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) @@ -6971,6 +7339,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) @@ -6978,6 +7347,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) @@ -6986,6 +7356,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) @@ -6993,21 +7364,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) @@ -7020,6 +7395,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) @@ -7032,6 +7408,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) @@ -7044,6 +7421,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) @@ -7056,6 +7434,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) @@ -7068,6 +7447,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) @@ -7080,6 +7460,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) @@ -7092,21 +7473,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) @@ -7119,6 +7504,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) @@ -7131,21 +7517,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) @@ -7169,6 +7559,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) @@ -7184,21 +7575,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) @@ -7211,6 +7606,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) @@ -7220,6 +7616,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) @@ -7241,6 +7638,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) @@ -7253,12 +7651,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) @@ -7270,16 +7670,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) @@ -7289,6 +7692,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) @@ -7302,18 +7706,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) @@ -7331,78 +7738,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) @@ -7411,12 +7831,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) @@ -7432,18 +7854,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) @@ -7456,11 +7881,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) @@ -7472,63 +7899,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) @@ -7542,11 +7982,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) @@ -7566,6 +8008,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) @@ -7605,14 +8048,17 @@ rgw/rgw_loadgen.$(OBJEXT): rgw/$(am__dirstamp) \ rgw/$(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) @@ -7624,6 +8070,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) @@ -7631,6 +8078,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) @@ -7646,6 +8094,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) @@ -7815,6 +8264,7 @@ mds/test_build_libcommon-mdstypes.$(OBJEXT): mds/$(am__dirstamp) \ mds/$(DEPDIR)/$(am__dirstamp) mds/test_build_libcommon-flock.$(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) @@ -7828,6 +8278,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) @@ -7901,81 +8352,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) @@ -7988,43 +8454,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) @@ -8085,23 +8559,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) @@ -8113,6 +8591,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) @@ -8120,197 +8599,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; \ @@ -8341,8 +8859,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; \ @@ -8373,8 +8894,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; \ @@ -8405,8 +8929,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; \ @@ -8437,8 +8964,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; \ @@ -8469,8 +8999,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; \ @@ -8502,1129 +9035,117 @@ 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/libcivetweb_la-civetweb.$(OBJEXT) - -rm -f civetweb/src/libcivetweb_la-civetweb.lo - -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-flock.$(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/libcivetweb_la-rgw_civetweb.$(OBJEXT) - -rm -f rgw/libcivetweb_la-rgw_civetweb.lo - -rm -f rgw/libcivetweb_la-rgw_civetweb_log.$(OBJEXT) - -rm -f rgw/libcivetweb_la-rgw_civetweb_log.lo - -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_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_io_priority-test_io_priority.$(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/ceph_erasure_code_non_regression.$(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 civetweb/src/*.lo + -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 @@ -10374,10 +9895,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph-client-debug.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_authtool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_conf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_filestore_dump.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_filestore_tool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_kvstore_tool-ceph_kvstore_tool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_monstore_tool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_objectstore_tool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/ceph_osdomap_tool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/crushtool.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/dupstore.Po@am__quote@ @@ -15348,8 +14868,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 \ @@ -15371,20 +14894,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"; \ @@ -15401,8 +14937,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"; \ @@ -15419,8 +14958,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"; \ @@ -15437,8 +14979,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"; \ @@ -15455,8 +15000,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"; \ @@ -15473,22 +15021,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; \ @@ -15503,57 +15054,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 \ @@ -15569,12 +15075,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; \ @@ -15586,15 +15087,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 @@ -15603,102 +15100,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'`; \ @@ -15732,13 +15832,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; \ @@ -15796,6 +15893,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) @@ -16038,28 +16138,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 \ @@ -16069,7 +16167,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 \ 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-disk b/ceph/src/ceph-disk index 6bd02201..c5e7af6a 100755 --- a/ceph/src/ceph-disk +++ b/ceph/src/ceph-disk @@ -919,6 +919,9 @@ def unmount( ########################################### +def extract_parted_partition_numbers(partitions): + numbers_as_strings = re.findall('^\d+', partitions, re.MULTILINE) + return map(int, numbers_as_strings) def get_free_partition_index(dev): """ @@ -943,31 +946,19 @@ def get_free_partition_index(dev): if not lines: raise Error('parted failed to output anything') - lines = str(lines).splitlines(True) - - # work around buggy libreadline(?) library in rhel/centos. - idiot_prefix = '\x1b\x5b\x3f\x31\x30\x33\x34\x68' - if lines[0].startswith(idiot_prefix): - lines[0] = lines[0][8:] - - if lines[0] not in ['CHS;\n', 'CYL;\n', 'BYT;\n']: - raise Error('weird parted units', lines[0]) - del lines[0] - - if not lines[0].startswith('/dev/'): - raise Error('weird parted disk entry', lines[0]) - del lines[0] - - seen = set() - for line in lines: - idx, _ = line.split(':', 1) - idx = int(idx) - seen.add(idx) - - num = 1 - while num in seen: - num += 1 - return num + if ('CHS;' not in lines and + 'CYL;' not in lines and + 'BYT;' not in lines): + raise Error('parted output expected to contain one of ' + + 'CHH; CYL; or BYT; : ' + lines) + if dev not in lines: + raise Error('parted output expected to contain ' + dev + ': ' + lines) + _, partitions = lines.split(dev) + partition_numbers = extract_parted_partition_numbers(partitions) + if partition_numbers: + return max(partition_numbers) + 1 + else: + return 1 def update_partition(action, dev, description): @@ -1018,6 +1009,13 @@ def zap(dev): [ 'sgdisk', '--zap-all', + '--', + dev, + ], + ) + command_check_call( + [ + 'sgdisk', '--clear', '--mbrtogpt', '--', @@ -1039,10 +1037,40 @@ def prepare_journal_dev( journal_dm_keypath, ): + reusing_partition = False + if is_partition(journal): LOG.debug('Journal %s is a partition', journal) LOG.warning('OSD will not be hot-swappable if journal is not the same device as the osd data') - return (journal, None, None) + if get_partition_type(journal) == JOURNAL_UUID: + LOG.debug('Journal %s was previously prepared with ceph-disk. Reusing it.', journal) + reusing_partition = True + # Read and reuse the partition uuid from this journal's previous life. + # We reuse the uuid instead of changing it because udev does not reliably + # notice changes to an existing partition's GUID. + # See http://tracker.ceph.com/issues/10146 + journal_uuid = get_partition_uuid(journal) + LOG.debug('Reusing journal with uuid %s', journal_uuid) + else: + LOG.warning('Journal %s was not prepared with ceph-disk. Symlinking directly.', journal) + return (journal, None, None) + + journal_symlink = '/dev/disk/by-partuuid/{journal_uuid}'.format( + journal_uuid=journal_uuid, + ) + + journal_dmcrypt = None + if journal_dm_keypath: + journal_dmcrypt = journal_symlink + journal_symlink = '/dev/mapper/{uuid}'.format(uuid=journal_uuid) + + if reusing_partition: + # confirm that the journal_symlink exists. It should since this was an active journal + # in the past. Continuing otherwise would be futile. + assert os.path.exists(journal_symlink) + return (journal_symlink, journal_dmcrypt, journal_uuid) + + # From here on we are creating a new journal device, not reusing. ptype = JOURNAL_UUID if journal_dm_keypath: @@ -1099,8 +1127,8 @@ def prepare_journal_dev( '--mbrtogpt', '--', journal, - ], - ) + ] + ) update_partition('-a', journal, 'prepared') @@ -1112,16 +1140,11 @@ def prepare_journal_dev( ], ) - journal_symlink = '/dev/disk/by-partuuid/{journal_uuid}'.format( - journal_uuid=journal_uuid, - ) + LOG.debug('Journal is GPT partition %s', journal_symlink) - journal_dmcrypt = None - if journal_dm_keypath: - journal_dmcrypt = journal_symlink - journal_symlink = '/dev/mapper/{uuid}'.format(uuid=journal_uuid) + # udev should have created the symlink by now. If not, abort. + assert os.path.exists(journal_symlink) - LOG.debug('Journal is GPT partition %s', journal_symlink) return (journal_symlink, journal_dmcrypt, journal_uuid) except subprocess.CalledProcessError as e: @@ -2158,6 +2181,13 @@ def get_dev_fs(dev): return None +def split_dev_base_partnum(dev): + if 'loop' in dev or 'cciss' in dev or 'nvme' in dev: + return re.match('(.*\d+)p(\d+)', dev).group(1, 2) + else: + return re.match('(\D+)(\d+)', dev).group(1, 2) + + def get_partition_type(part): """ Get the GPT partition type UUID. If we have an old blkid and can't @@ -2207,7 +2237,7 @@ def get_partition_type(part): if 'blkid' not in warned_about: LOG.warning('Old blkid does not support ID_PART_ENTRY_* fields, trying sgdisk; may not correctly identify ceph volumes with dmcrypt') warned_about['blkid'] = True - (base, partnum) = re.match('(\D+)(\d+)', part).group(1, 2) + (base, partnum) = split_dev_base_partnum(part) sgdisk, _ = command( [ 'sgdisk', @@ -2233,7 +2263,7 @@ def get_partition_type(part): def get_partition_uuid(dev): - (base, partnum) = re.match('(\D+)(\d+)', dev).group(1, 2) + (base, partnum) = split_dev_base_partnum(dev) out, _ = command(['sgdisk', '-i', partnum, base]) for line in out.splitlines(): m = re.match('Partition unique GUID: (\S+)', line) diff --git a/ceph/src/ceph-post-file.in b/ceph/src/ceph-post-file.in index 9b922a6c..b278e8ab 100755 --- a/ceph/src/ceph-post-file.in +++ b/ceph/src/ceph-post-file.in @@ -1,16 +1,16 @@ #!/bin/bash -e -# if we start up as ./$0, assume we are running from a source -# checkout. -if [ `dirname $0` = "." ] && [ $PWD != "/usr/bin" ]; then - known_hosts=../share/known_hosts_drop.ceph.com - ssh_key=../share/id_dsa_drop.ceph.com -else - known_hosts=@datadir@/known_hosts_drop.ceph.com - ssh_key=@datadir@/id_dsa_drop.ceph.com +# If these files exist, assume we are a source install. +if [[ -f ../share/known_hosts_drop.ceph.com && -f ../share/id_dsa_drop.ceph.com ]] + then # running from source install + known_hosts=../share/known_hosts_drop.ceph.com + ssh_key=../share/id_dsa_drop.ceph.com + else # running from a pkg install + known_hosts=@datadir@/known_hosts_drop.ceph.com + ssh_key=@datadir@/id_dsa_drop.ceph.com fi -usage() { +function usage() { echo "Usage: $0 [options] file1 [dir2 ...] Easily upload files or directories to ceph.com for analysis by Ceph @@ -155,7 +155,7 @@ done cp "$ssh_key" "$t4" cp "${ssh_key}.pub" "$t4.pub" -sftp -i $t4 \ +sftp -o "IdentityFile=$t4" \ -C \ -oCheckHostIP=no \ -oGlobalKnownHostsFile=$known_hosts \ diff --git a/ceph/src/ceph_fuse.cc b/ceph/src/ceph_fuse.cc index 54616f60..cc97938a 100644 --- a/ceph/src/ceph_fuse.cc +++ b/ceph/src/ceph_fuse.cc @@ -120,9 +120,7 @@ int main(int argc, const char **argv, const char *envp[]) { goto out_mc_start_failed; // start up network - messenger = Messenger::create(g_ceph_context, - entity_name_t::CLIENT(), "client", - getpid()); + messenger = Messenger::create_client_messenger(g_ceph_context, "client"); messenger->set_default_policy(Messenger::Policy::lossy_client(0, 0)); messenger->set_policy(entity_name_t::TYPE_MDS, Messenger::Policy::lossless_client(0, 0)); diff --git a/ceph/src/ceph_syn.cc b/ceph/src/ceph_syn.cc index c3410aa6..1d10fa2e 100644 --- a/ceph/src/ceph_syn.cc +++ b/ceph/src/ceph_syn.cc @@ -65,9 +65,8 @@ int main(int argc, const char **argv, char *envp[]) cout << "ceph-syn: starting " << g_conf->num_client << " syn client(s)" << std::endl; for (int i=0; inum_client; i++) { - messengers[i] = Messenger::create(g_ceph_context, - entity_name_t(entity_name_t::TYPE_CLIENT,-1), "synclient", - i * 1000000 + getpid()); + messengers[i] = Messenger::create_client_messenger(g_ceph_context, + "synclient"); messengers[i]->bind(g_conf->public_addr); mclients[i] = new MonClient(g_ceph_context); mclients[i]->build_initial_monmap(); diff --git a/ceph/src/cls/rgw/cls_rgw.cc b/ceph/src/cls/rgw/cls_rgw.cc index 7a15a90f..e69b59ee 100644 --- a/ceph/src/cls/rgw/cls_rgw.cc +++ b/ceph/src/cls/rgw/cls_rgw.cc @@ -453,10 +453,11 @@ int rgw_bucket_prepare_op(cls_method_context_t hctx, bufferlist *in, bufferlist } // fill in proper state - struct rgw_bucket_pending_info& info = entry.pending_map[op.tag]; + struct rgw_bucket_pending_info info; info.timestamp = ceph_clock_now(g_ceph_context); info.state = CLS_RGW_STATE_PENDING_MODIFY; info.op = op.op; + entry.pending_map.insert(pair(op.tag, info)); bufferlist header_bl; diff --git a/ceph/src/cls/rgw/cls_rgw_types.h b/ceph/src/cls/rgw/cls_rgw_types.h index 1ed56ba0..6abc831c 100644 --- a/ceph/src/cls/rgw/cls_rgw_types.h +++ b/ceph/src/cls/rgw/cls_rgw_types.h @@ -200,7 +200,7 @@ struct rgw_bucket_dir_entry { std::string locator; bool exists; struct rgw_bucket_dir_entry_meta meta; - map pending_map; + multimap pending_map; uint64_t index_ver; string tag; diff --git a/ceph/src/common/Mutex.cc b/ceph/src/common/Mutex.cc index f1e9a550..de666553 100644 --- a/ceph/src/common/Mutex.cc +++ b/ceph/src/common/Mutex.cc @@ -55,6 +55,7 @@ Mutex::Mutex(const char *n, bool r, bool ld, pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); pthread_mutex_init(&_m, &attr); + pthread_mutexattr_destroy(&attr); if (g_lockdep) _register(); } diff --git a/ceph/src/common/RWLock.h b/ceph/src/common/RWLock.h index f901ac0d..308092c6 100644 --- a/ceph/src/common/RWLock.h +++ b/ceph/src/common/RWLock.h @@ -19,28 +19,45 @@ #include #include "lockdep.h" +#include "include/assert.h" +#include "include/atomic.h" class RWLock { mutable pthread_rwlock_t L; const char *name; mutable int id; + mutable ceph::atomic_t nrlock, nwlock; public: RWLock(const RWLock& other); const RWLock& operator=(const RWLock& other); - RWLock(const char *n) : name(n), id(-1) { + RWLock(const char *n) : name(n), id(-1), nrlock(0), nwlock(0) { pthread_rwlock_init(&L, NULL); if (g_lockdep) id = lockdep_register(name); } + bool is_locked() const { + return (nrlock.read() > 0) || (nwlock.read() > 0); + } + + bool is_wlocked() const { + return (nwlock.read() > 0); + } virtual ~RWLock() { - pthread_rwlock_unlock(&L); + // The following check is racy but we are about to destroy + // the object and we assume that there are no other users. + assert(!is_locked()); pthread_rwlock_destroy(&L); } void unlock() const { + if (nwlock.read() > 0) { + nwlock.dec(); + } else { + nrlock.dec(); + } if (g_lockdep) id = lockdep_will_unlock(name, id); pthread_rwlock_unlock(&L); } @@ -50,9 +67,11 @@ public: if (g_lockdep) id = lockdep_will_lock(name, id); pthread_rwlock_rdlock(&L); if (g_lockdep) id = lockdep_locked(name, id); + nrlock.inc(); } bool try_get_read() const { if (pthread_rwlock_tryrdlock(&L) == 0) { + nrlock.inc(); if (g_lockdep) id = lockdep_locked(name, id); return true; } @@ -67,10 +86,12 @@ public: if (g_lockdep) id = lockdep_will_lock(name, id); pthread_rwlock_wrlock(&L); if (g_lockdep) id = lockdep_locked(name, id); + nwlock.inc(); } bool try_get_write() { if (pthread_rwlock_trywrlock(&L) == 0) { if (g_lockdep) id = lockdep_locked(name, id); + nwlock.inc(); return true; } return false; diff --git a/ceph/src/common/Thread.cc b/ceph/src/common/Thread.cc index a962e06f..9f09a926 100644 --- a/ceph/src/common/Thread.cc +++ b/ceph/src/common/Thread.cc @@ -87,11 +87,11 @@ int Thread::kill(int signal) int Thread::try_create(size_t stacksize) { pthread_attr_t *thread_attr = NULL; + pthread_attr_t thread_attr_loc; + stacksize &= CEPH_PAGE_MASK; // must be multiple of page if (stacksize) { - thread_attr = (pthread_attr_t*) malloc(sizeof(pthread_attr_t)); - if (!thread_attr) - return -ENOMEM; + thread_attr = &thread_attr_loc; pthread_attr_init(thread_attr); pthread_attr_setstacksize(thread_attr, stacksize); } @@ -113,8 +113,10 @@ int Thread::try_create(size_t stacksize) r = pthread_create(&thread_id, thread_attr, _entry_func, (void*)this); restore_sigset(&old_sigset); - if (thread_attr) - free(thread_attr); + if (thread_attr) { + pthread_attr_destroy(thread_attr); + } + return r; } diff --git a/ceph/src/common/Throttle.cc b/ceph/src/common/Throttle.cc index 026d731e..5c68a1fe 100644 --- a/ceph/src/common/Throttle.cc +++ b/ceph/src/common/Throttle.cc @@ -267,6 +267,12 @@ void SimpleThrottle::end_op(int r) m_cond.Signal(); } +bool SimpleThrottle::pending_error() const +{ + Mutex::Locker l(m_lock); + return (m_ret < 0); +} + int SimpleThrottle::wait_for_ret() { Mutex::Locker l(m_lock); diff --git a/ceph/src/common/Throttle.h b/ceph/src/common/Throttle.h index 6d039888..b171e27e 100644 --- a/ceph/src/common/Throttle.h +++ b/ceph/src/common/Throttle.h @@ -76,9 +76,10 @@ public: ~SimpleThrottle(); void start_op(); void end_op(int r); + bool pending_error() const; int wait_for_ret(); private: - Mutex m_lock; + mutable Mutex m_lock; Cond m_cond; uint64_t m_max; uint64_t m_current; diff --git a/ceph/src/common/WorkQueue.cc b/ceph/src/common/WorkQueue.cc index 0f8bc9d4..8559b03a 100644 --- a/ceph/src/common/WorkQueue.cc +++ b/ceph/src/common/WorkQueue.cc @@ -142,8 +142,13 @@ void ThreadPool::worker(WorkThread *wt) } ldout(cct,20) << "worker waiting" << dendl; - cct->get_heartbeat_map()->reset_timeout(hb, 4, 0); - _cond.WaitInterval(cct, _lock, utime_t(2, 0)); + cct->get_heartbeat_map()->reset_timeout( + hb, + cct->_conf->threadpool_default_timeout, + 0); + _cond.WaitInterval(cct, _lock, + utime_t( + cct->_conf->threadpool_empty_queue_max_wait, 0)); } ldout(cct,1) << "worker finish" << dendl; diff --git a/ceph/src/common/WorkQueue.h b/ceph/src/common/WorkQueue.h index cbf49a8b..a9eaffb7 100644 --- a/ceph/src/common/WorkQueue.h +++ b/ceph/src/common/WorkQueue.h @@ -330,7 +330,7 @@ private: public: ThreadPool(CephContext *cct_, string nm, int n, const char *option = NULL); - ~ThreadPool(); + virtual ~ThreadPool(); /// return number of threads currently running int get_num_threads() { @@ -340,10 +340,12 @@ public: /// assign a work queue to this thread pool void add_work_queue(WorkQueue_* wq) { + Mutex::Locker l(_lock); work_queues.push_back(wq); } /// remove a work queue from this thread pool void remove_work_queue(WorkQueue_* wq) { + Mutex::Locker l(_lock); unsigned i = 0; while (work_queues[i] != wq) i++; @@ -433,4 +435,35 @@ public: } }; +class ContextWQ : public ThreadPool::WorkQueueVal { +public: + ContextWQ(const string &name, time_t ti, ThreadPool *tp) + : ThreadPool::WorkQueueVal(name, ti, 0, tp) {} + + void queue(Context *ctx) { + ThreadPool::WorkQueueVal::queue(ctx); + } + +protected: + virtual void _enqueue(Context *item) { + _queue.push_back(item); + } + virtual void _enqueue_front(Context *item) { + _queue.push_front(item); + } + virtual bool _empty() { + return _queue.empty(); + } + virtual Context *_dequeue() { + Context *item = _queue.front(); + _queue.pop_front(); + return item; + } + virtual void _process(Context *item) { + item->complete(0); + } +private: + list _queue; +}; + #endif diff --git a/ceph/src/common/admin_socket.cc b/ceph/src/common/admin_socket.cc index 4af2904e..77048d4d 100644 --- a/ceph/src/common/admin_socket.cc +++ b/ceph/src/common/admin_socket.cc @@ -149,6 +149,33 @@ std::string AdminSocket::create_shutdown_pipe(int *pipe_rd, int *pipe_wr) return ""; } +std::string AdminSocket::destroy_shutdown_pipe() +{ + // Send a byte to the shutdown pipe that the thread is listening to + char buf[1] = { 0x0 }; + int ret = safe_write(m_shutdown_wr_fd, buf, sizeof(buf)); + + // Close write end + VOID_TEMP_FAILURE_RETRY(close(m_shutdown_wr_fd)); + m_shutdown_wr_fd = -1; + + if (ret != 0) { + ostringstream oss; + oss << "AdminSocket::destroy_shutdown_pipe error: failed to write" + "to thread shutdown pipe: error " << ret; + return oss.str(); + } + + join(); + + // Close read end. Doing this before join() blocks the listenter and prevents + // joining. + VOID_TEMP_FAILURE_RETRY(close(m_shutdown_rd_fd)); + m_shutdown_rd_fd = -1; + + return ""; +} + std::string AdminSocket::bind_and_listen(const std::string &sock_path, int *fd) { ldout(m_cct, 5) << "bind_and_listen " << sock_path << dendl; @@ -544,30 +571,31 @@ bool AdminSocket::init(const std::string &path) void AdminSocket::shutdown() { + std::string err; + + // Under normal operation this is unlikely to occur. However for some unit + // tests, some object members are not initialized and so cannot be deleted + // without fault. if (m_shutdown_wr_fd < 0) return; ldout(m_cct, 5) << "shutdown" << dendl; - // Send a byte to the shutdown pipe that the thread is listening to - char buf[1] = { 0x0 }; - int ret = safe_write(m_shutdown_wr_fd, buf, sizeof(buf)); - VOID_TEMP_FAILURE_RETRY(close(m_shutdown_wr_fd)); - m_shutdown_wr_fd = -1; - - if (ret == 0) { - join(); - } else { - lderr(m_cct) << "AdminSocket::shutdown: failed to write " - "to thread shutdown pipe: error " << ret << dendl; + err = destroy_shutdown_pipe(); + if (!err.empty()) { + lderr(m_cct) << "AdminSocket::shutdown: error: " << err << dendl; } + VOID_TEMP_FAILURE_RETRY(close(m_sock_fd)); + unregister_command("version"); unregister_command("git_version"); unregister_command("0"); delete m_version_hook; + unregister_command("help"); delete m_help_hook; + unregister_command("get_command_descriptions"); delete m_getdescs_hook; diff --git a/ceph/src/common/admin_socket.h b/ceph/src/common/admin_socket.h index 3bc84834..5e855bcb 100644 --- a/ceph/src/common/admin_socket.h +++ b/ceph/src/common/admin_socket.h @@ -79,6 +79,7 @@ private: void shutdown(); std::string create_shutdown_pipe(int *pipe_rd, int *pipe_wr); + std::string destroy_shutdown_pipe(); std::string bind_and_listen(const std::string &sock_path, int *fd); void *entry(); diff --git a/ceph/src/common/buffer.cc b/ceph/src/common/buffer.cc index 35c5d360..fc00f0b2 100644 --- a/ceph/src/common/buffer.cc +++ b/ceph/src/common/buffer.cc @@ -1060,12 +1060,23 @@ static uint32_t simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZE it != _buffers.end(); ++it) { if (p + it->length() > o) { - if (p >= o && p+it->length() <= o+l) - it->zero(); // all - else if (p >= o) - it->zero(0, o+l-p); // head - else - it->zero(o-p, it->length()-(o-p)); // tail + if (p >= o && p+it->length() <= o+l) { + // 'o'------------- l -----------| + // 'p'-- it->length() --| + it->zero(); + } else if (p >= o) { + // 'o'------------- l -----------| + // 'p'------- it->length() -------| + it->zero(0, o+l-p); + } else if (p + it->length() <= o+l) { + // 'o'------------- l -----------| + // 'p'------- it->length() -------| + it->zero(o-p, it->length()-(o-p)); + } else { + // 'o'----------- l -----------| + // 'p'---------- it->length() ----------| + it->zero(o-p, l); + } } p += it->length(); if (o+l <= p) diff --git a/ceph/src/common/ceph_context.cc b/ceph/src/common/ceph_context.cc index 4ebf79e8..77488b64 100644 --- a/ceph/src/common/ceph_context.cc +++ b/ceph/src/common/ceph_context.cc @@ -265,6 +265,7 @@ CephContext::CephContext(uint32_t module_type_) _crypto_aes(NULL) { ceph_spin_init(&_service_thread_lock); + ceph_spin_init(&_associated_objs_lock); _log = new ceph::log::Log(&_conf->subsys); _log->start(); @@ -298,6 +299,10 @@ CephContext::~CephContext() { join_service_thread(); + for (map::iterator it = _associated_objs.begin(); + it != _associated_objs.end(); it++) + delete it->second; + if (_conf->lockdep) { lockdep_unregister_ceph_context(this); } @@ -335,6 +340,7 @@ CephContext::~CephContext() delete _conf; ceph_spin_destroy(&_service_thread_lock); + ceph_spin_destroy(&_associated_objs_lock); delete _crypto_none; delete _crypto_aes; diff --git a/ceph/src/common/ceph_context.h b/ceph/src/common/ceph_context.h index ba606203..7241c855 100644 --- a/ceph/src/common/ceph_context.h +++ b/ceph/src/common/ceph_context.h @@ -17,6 +17,7 @@ #include #include +#include #include "include/buffer.h" #include "include/atomic.h" @@ -58,6 +59,10 @@ private: ~CephContext(); atomic_t nref; public: + class AssociatedSingletonObject { + public: + virtual ~AssociatedSingletonObject() {} + }; CephContext *get() { nref.inc(); return this; @@ -102,6 +107,17 @@ public: void do_command(std::string command, cmdmap_t& cmdmap, std::string format, bufferlist *out); + template + void lookup_or_create_singleton_object(T*& p, const std::string &name) { + ceph_spin_lock(&_associated_objs_lock); + if (!_associated_objs.count(name)) { + p = new T(this); + _associated_objs[name] = reinterpret_cast(p); + } else { + p = reinterpret_cast(_associated_objs[name]); + } + ceph_spin_unlock(&_associated_objs_lock); + } /** * get a crypto handler */ @@ -138,6 +154,9 @@ private: ceph::HeartbeatMap *_heartbeat_map; + ceph_spinlock_t _associated_objs_lock; + std::map _associated_objs; + // crypto CryptoNone *_crypto_none; CryptoAES *_crypto_aes; diff --git a/ceph/src/common/code_environment.h b/ceph/src/common/code_environment.h index 761d6c02..e21f0eff 100644 --- a/ceph/src/common/code_environment.h +++ b/ceph/src/common/code_environment.h @@ -19,6 +19,7 @@ enum code_environment_t { CODE_ENVIRONMENT_UTILITY = 0, CODE_ENVIRONMENT_DAEMON = 1, CODE_ENVIRONMENT_LIBRARY = 2, + CODE_ENVIRONMENT_UTILITY_NODOUT = 3, }; #ifdef __cplusplus diff --git a/ceph/src/common/common_init.cc b/ceph/src/common/common_init.cc index 1f97e292..dd0b0e76 100644 --- a/ceph/src/common/common_init.cc +++ b/ceph/src/common/common_init.cc @@ -63,6 +63,7 @@ CephContext *common_preinit(const CephInitParameters &iparams, conf->set_val("keyring", "$osd_data/keyring", false); break; + case CODE_ENVIRONMENT_UTILITY_NODOUT: case CODE_ENVIRONMENT_LIBRARY: conf->set_val_or_die("log_to_stderr", "false"); conf->set_val_or_die("err_to_stderr", "false"); diff --git a/ceph/src/common/config.cc b/ceph/src/common/config.cc index fc470832..7650b883 100644 --- a/ceph/src/common/config.cc +++ b/ceph/src/common/config.cc @@ -148,7 +148,7 @@ md_config_t::md_config_t() #undef OPTION #undef SUBSYS #undef DEFAULT_SUBSYS - lock("md_config_t", true) + lock("md_config_t", true, false) { init_subsys(); } diff --git a/ceph/src/common/config_opts.h b/ceph/src/common/config_opts.h index 03074412..1033a8e3 100644 --- a/ceph/src/common/config_opts.h +++ b/ceph/src/common/config_opts.h @@ -137,6 +137,8 @@ OPTION(mon_sync_fs_threshold, OPT_INT, 5) // sync() when writing this many obj OPTION(mon_compact_on_start, OPT_BOOL, false) // compact leveldb on ceph-mon start OPTION(mon_compact_on_bootstrap, OPT_BOOL, false) // trigger leveldb compaction on bootstrap OPTION(mon_compact_on_trim, OPT_BOOL, true) // compact (a prefix) when we trim old states +OPTION(mon_osd_cache_size, OPT_INT, 10) // the size of osdmaps cache, not to rely on underlying store's cache + OPTION(mon_tick_interval, OPT_INT, 5) OPTION(mon_subscribe_interval, OPT_DOUBLE, 300) OPTION(mon_delta_reset_interval, OPT_DOUBLE, 10) // seconds of inactivity before we reset the pg delta to 0 @@ -172,7 +174,8 @@ OPTION(mon_pg_warn_min_pool_objects, OPT_INT, 1000) // do not warn on pools bel OPTION(mon_cache_target_full_warn_ratio, OPT_FLOAT, .66) // position between pool cache_target_full and max where we start warning OPTION(mon_osd_full_ratio, OPT_FLOAT, .95) // what % full makes an OSD "full" OPTION(mon_osd_nearfull_ratio, OPT_FLOAT, .85) // what % full makes an OSD near full -OPTION(mon_globalid_prealloc, OPT_INT, 100) // how many globalids to prealloc +OPTION(mon_allow_pool_delete, OPT_BOOL, true) // allow pool deletion +OPTION(mon_globalid_prealloc, OPT_INT, 10000) // how many globalids to prealloc OPTION(mon_osd_report_timeout, OPT_INT, 900) // grace period before declaring unresponsive OSDs dead OPTION(mon_force_standby_active, OPT_BOOL, true) // should mons force standby-replay mds to be active OPTION(mon_warn_on_old_mons, OPT_BOOL, true) // should mons set health to WARN if part of quorum is old? @@ -452,6 +455,7 @@ OPTION(osd_tier_default_cache_mode, OPT_STR, "writeback") OPTION(osd_tier_default_cache_hit_set_count, OPT_INT, 4) OPTION(osd_tier_default_cache_hit_set_period, OPT_INT, 1200) OPTION(osd_tier_default_cache_hit_set_type, OPT_STR, "bloom") +OPTION(osd_tier_default_cache_min_read_recency_for_promote, OPT_INT, 1) // number of recent HitSets the object must appear in to be promoted (on read) OPTION(osd_map_dedup, OPT_BOOL, true) OPTION(osd_map_max_advance, OPT_INT, 200) // make this < cache_size! @@ -475,14 +479,21 @@ OPTION(osd_recover_clone_overlap_limit, OPT_INT, 10) OPTION(osd_backfill_scan_min, OPT_INT, 64) OPTION(osd_backfill_scan_max, OPT_INT, 512) OPTION(osd_op_thread_timeout, OPT_INT, 15) +OPTION(osd_op_thread_suicide_timeout, OPT_INT, 150) OPTION(osd_recovery_thread_timeout, OPT_INT, 30) +OPTION(osd_recovery_thread_suicide_timeout, OPT_INT, 300) OPTION(osd_snap_trim_thread_timeout, OPT_INT, 60*60*1) +OPTION(osd_snap_trim_thread_suicide_timeout, OPT_INT, 60*60*10) OPTION(osd_snap_trim_sleep, OPT_FLOAT, 0) OPTION(osd_scrub_thread_timeout, OPT_INT, 60) +OPTION(osd_scrub_thread_suicide_timeout, OPT_INT, 60) OPTION(osd_scrub_finalize_thread_timeout, OPT_INT, 60*10) +OPTION(osd_scrub_finalize_thread_suicide_timeout, OPT_INT, 60*10*10) OPTION(osd_scrub_invalid_stats, OPT_BOOL, true) OPTION(osd_remove_thread_timeout, OPT_INT, 60*60) +OPTION(osd_remove_thread_suicide_timeout, OPT_INT, 10*60*60) OPTION(osd_command_thread_timeout, OPT_INT, 10*60) +OPTION(osd_command_thread_suicide_timeout, OPT_INT, 15*60) OPTION(osd_age, OPT_FLOAT, .8) OPTION(osd_age_time, OPT_INT, 0) OPTION(osd_heartbeat_addr, OPT_ADDR, entity_addr_t()) @@ -570,6 +581,11 @@ OPTION(osd_leveldb_log, OPT_STR, "") // enable OSD leveldb log file // determines whether PGLog::check() compares written out log to stored log OPTION(osd_debug_pg_log_writeout, OPT_BOOL, false) +// default timeout while caling WaitInterval on an empty queue +OPTION(threadpool_default_timeout, OPT_INT, 60) +// default wait time for an empty queue before pinging the hb timeout +OPTION(threadpool_empty_queue_max_wait, OPT_INT, 2) + OPTION(leveldb_write_buffer_size, OPT_U64, 8 *1024*1024) // leveldb write buffer size OPTION(leveldb_cache_size, OPT_U64, 128 *1024*1024) // leveldb cache size OPTION(leveldb_block_size, OPT_U64, 0) // leveldb block size @@ -722,6 +738,9 @@ OPTION(journal_ignore_corruption, OPT_BOOL, false) // assume journal is not corr OPTION(rados_mon_op_timeout, OPT_DOUBLE, 0) // how many seconds to wait for a response from the monitor before returning an error from a rados operation. 0 means on limit. OPTION(rados_osd_op_timeout, OPT_DOUBLE, 0) // how many seconds to wait for a response from osds before returning an error from a rados operation. 0 means no limit. +OPTION(rbd_op_threads, OPT_INT, 1) +OPTION(rbd_op_thread_timeout, OPT_INT, 60) +OPTION(rbd_non_blocking_aio, OPT_BOOL, true) // process AIO ops from a worker thread to prevent blocking OPTION(rbd_cache, OPT_BOOL, false) // whether to enable caching (writeback unless rbd_cache_max_dirty is 0) OPTION(rbd_cache_writethrough_until_flush, OPT_BOOL, false) // whether to make writeback caching writethrough until flush is called, to be sure the user of librbd will send flushs so that writeback is safe OPTION(rbd_cache_size, OPT_LONGLONG, 32<<20) // cache size in bytes @@ -779,6 +798,7 @@ OPTION(rgw_swift_url_prefix, OPT_STR, "swift") // entry point for which a url is OPTION(rgw_swift_auth_url, OPT_STR, "") // default URL to go and verify tokens for v1 auth (if not using internal swift auth) OPTION(rgw_swift_auth_entry, OPT_STR, "auth") // entry point for which a url is considered a swift auth url OPTION(rgw_swift_tenant_name, OPT_STR, "") // tenant name to use for swift access +OPTION(rgw_swift_enforce_content_length, OPT_BOOL, false) // enforce generation of Content-Length even in cost of performance or scalability OPTION(rgw_keystone_url, OPT_STR, "") // url for keystone server OPTION(rgw_keystone_admin_token, OPT_STR, "") // keystone admin token (shared secret) OPTION(rgw_keystone_admin_user, OPT_STR, "") // keystone admin user name diff --git a/ceph/src/common/histogram.h b/ceph/src/common/histogram.h index bdbd75ca..520b516e 100644 --- a/ceph/src/common/histogram.h +++ b/ceph/src/common/histogram.h @@ -74,6 +74,10 @@ public: return b; } + bool operator==(const pow2_hist_t &r) const { + return h == r.h; + } + /// get a value's position in the histogram. /// /// positions are represented as values in the range [0..1000000] diff --git a/ceph/src/common/hobject.cc b/ceph/src/common/hobject.cc index 28cb86a5..e4190864 100644 --- a/ceph/src/common/hobject.cc +++ b/ceph/src/common/hobject.cc @@ -235,6 +235,20 @@ void ghobject_t::decode(bufferlist::iterator& bl) DECODE_FINISH(bl); } +void ghobject_t::decode(json_spirit::Value& v) +{ + hobj.decode(v); + using namespace json_spirit; + Object& o = v.get_obj(); + for (Object::size_type i=0; imax_buckets; i++) { @@ -179,6 +185,22 @@ bool CrushWrapper::_search_item_exists(int item) const return false; } +bool CrushWrapper::_bucket_is_in_use(CephContext *cct, int item) +{ + for (unsigned i = 0; i < crush->max_rules; ++i) { + crush_rule *r = crush->rules[i]; + if (!r) + continue; + for (unsigned j = 0; j < r->len; ++j) { + if (r->steps[j].op == CRUSH_RULE_TAKE && + r->steps[j].arg1 == item) { + return true; + } + } + } + return false; +} + int CrushWrapper::_remove_item_under(CephContext *cct, int item, int ancestor, bool unlink_only) { ldout(cct, 5) << "_remove_item_under " << item << " under " << ancestor @@ -214,6 +236,11 @@ int CrushWrapper::remove_item_under(CephContext *cct, int item, int ancestor, bo { ldout(cct, 5) << "remove_item_under " << item << " under " << ancestor << (unlink_only ? " unlink_only":"") << dendl; + + if (!unlink_only && _bucket_is_in_use(cct, item)) { + return -EBUSY; + } + int ret = _remove_item_under(cct, item, ancestor, unlink_only); if (ret < 0) return ret; @@ -831,15 +858,17 @@ int CrushWrapper::add_simple_ruleset(string name, string root_name, } int steps = 3; if (mode == "indep") - steps = 4; + steps = 5; int min_rep = mode == "firstn" ? 1 : 3; int max_rep = mode == "firstn" ? 10 : 20; //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") + if (mode == "indep") { crush_rule_set_step(rule, step++, CRUSH_RULE_SET_CHOOSELEAF_TRIES, 5, 0); + crush_rule_set_step(rule, step++, CRUSH_RULE_SET_CHOOSE_TRIES, 100, 0); + } crush_rule_set_step(rule, step++, CRUSH_RULE_TAKE, root, 0); if (type) crush_rule_set_step(rule, step++, diff --git a/ceph/src/crush/CrushWrapper.h b/ceph/src/crush/CrushWrapper.h index 9fac2fe4..8e285976 100644 --- a/ceph/src/crush/CrushWrapper.h +++ b/ceph/src/crush/CrushWrapper.h @@ -518,6 +518,7 @@ public: private: bool _maybe_remove_last_instance(CephContext *cct, int id, bool unlink_only); int _remove_item_under(CephContext *cct, int id, int ancestor, bool unlink_only); + bool _bucket_is_in_use(CephContext *cct, int id); public: int remove_item_under(CephContext *cct, int id, int ancestor, bool unlink_only); 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/config.guess b/ceph/src/gtest/build-aux/config.guess index d622a44e..b79252d6 100755 --- a/ceph/src/gtest/build-aux/config.guess +++ b/ceph/src/gtest/build-aux/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/src/gtest/build-aux/depcomp b/ceph/src/gtest/build-aux/depcomp index bd0ac089..4ebd5b3a 100755 --- a/ceph/src/gtest/build-aux/depcomp +++ b/ceph/src/gtest/build-aux/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/src/gtest/build-aux/install-sh b/ceph/src/gtest/build-aux/install-sh index a9244eb0..377bb868 100755 --- a/ceph/src/gtest/build-aux/install-sh +++ b/ceph/src/gtest/build-aux/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/src/gtest/build-aux/ltmain.sh b/ceph/src/gtest/build-aux/ltmain.sh index c2852d85..a356acaf 100644 --- a/ceph/src/gtest/build-aux/ltmain.sh +++ b/ceph/src/gtest/build-aux/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/src/gtest/build-aux/missing b/ceph/src/gtest/build-aux/missing index 86a8fc31..db98974f 100755 --- a/ceph/src/gtest/build-aux/missing +++ b/ceph/src/gtest/build-aux/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/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..ee0620a5 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 @@ -5011,7 +5196,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -5246,7 +5432,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 +5472,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 @@ -5412,10 +5598,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5454,7 +5636,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5592,7 +5774,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 +5814,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 +5918,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 +5962,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 +6087,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 +6127,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 +6186,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 +6226,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 @@ -6537,7 +6719,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6553,9 +6735,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6574,7 +6766,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6694,7 +6889,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 +6929,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 +7009,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 +7049,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 +7101,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 +7141,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 +7193,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 +7233,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 +7285,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 +7325,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 +7377,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 +7417,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 @@ -8392,7 +8587,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10562,17 +10757,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10689,7 +10873,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12512,9 +12696,6 @@ fi ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes @@ -12676,7 +12857,7 @@ fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -13536,7 +13717,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -14408,17 +14589,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -14535,7 +14705,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -14963,7 +15133,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 +15334,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 +15489,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 +15852,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 +16186,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 +16255,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 +16286,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 +16352,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 +16446,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 +17457,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 +17470,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 +17504,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/gtest/m4/libtool.m4 b/ceph/src/gtest/m4/libtool.m4 index 828104cf..d7c043f4 100644 --- a/ceph/src/gtest/m4/libtool.m4 +++ b/ceph/src/gtest/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,9 +1324,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1688,7 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2512,17 +2526,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2642,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3255,10 +3258,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3296,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4048,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4347,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6240,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +6401,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff --git a/ceph/src/include/interval_set.h b/ceph/src/include/interval_set.h index 7affb87a..9a7d2f2e 100644 --- a/ceph/src/include/interval_set.h +++ b/ceph/src/include/interval_set.h @@ -371,6 +371,7 @@ class interval_set { void erase(iterator &i) { _size -= i.get_len(); + assert(_size >= 0); m.erase(i._iter); } diff --git a/ceph/src/init-radosgw b/ceph/src/init-radosgw index c38ddad6..7af51efd 100644 --- a/ceph/src/init-radosgw +++ b/ceph/src/init-radosgw @@ -35,7 +35,7 @@ done PREFIX='client.radosgw.' # user to run radosgw as (it not specified in ceph.conf) -DEFAULT_USER='www-data' +DEFAULT_USER='root' RADOSGW=`which radosgw` if [ ! -x "$RADOSGW" ]; then @@ -52,12 +52,6 @@ case "$1" in continue fi - # is the socket defined? if it's not, this instance shouldn't run as a daemon. - rgw_socket=`$RADOSGW -n $name --show-config-value rgw_socket_path` - if [ -z "$rgw_socket" ]; then - continue - fi - # mapped to this host? host=`ceph-conf -n $name host` hostname=`hostname -s` @@ -72,8 +66,10 @@ case "$1" in fi log_file=`$RADOSGW -n $name --show-config-value log_file` - if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then - touch "$log_file" + if [ -n "$log_file" ]; then + if [ ! -e "$log_file" ]; then + touch "$log_file" + fi chown $user $log_file fi @@ -91,7 +87,15 @@ case "$1" in $0 start ;; stop) - start-stop-daemon --stop -x $RADOSGW --oknodo + timeout=0 + for name in `ceph-conf --list-sections $PREFIX`; + do + t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs` + if [ $t -gt $timeout ]; then timeout=$t; fi + done + + if [ $timeout -gt 0 ]; then TIMEOUT="-R $timeout"; fi + start-stop-daemon --stop -x $RADOSGW --oknodo $TIMEOUT ;; status) daemon_is_running $RADOSGW diff --git a/ceph/src/init-radosgw.sysv b/ceph/src/init-radosgw.sysv index 2486539a..1bb8a89d 100644 --- a/ceph/src/init-radosgw.sysv +++ b/ceph/src/init-radosgw.sysv @@ -37,7 +37,7 @@ PREFIX='client.radosgw.' # user to run radosgw as (it not specified in ceph.conf) #DEFAULT_USER='www-data' -DEFAULT_USER='apache' +DEFAULT_USER='root' RADOSGW=`which radosgw` if [ ! -x "$RADOSGW" ]; then @@ -59,12 +59,6 @@ case "$1" in continue fi - # is the socket defined? if it's not, this instance shouldn't run as a daemon. - rgw_socket=`$RADOSGW -n $name --show-config-value rgw_socket_path` - if [ -z "$rgw_socket" ]; then - continue - fi - # mapped to this host? host=`ceph-conf -n $name host` hostname=`hostname -s` @@ -79,8 +73,10 @@ case "$1" in fi log_file=`$RADOSGW -n $name --show-config-value log_file` - if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then - touch "$log_file" + if [ -n "$log_file" ]; then + if [ ! -e "$log_file" ]; then + touch "$log_file" + fi chown $user $log_file fi @@ -105,8 +101,19 @@ case "$1" in ;; stop) #start-stop-daemon --stop -x $RADOSGW --oknodo + timeout=0 + for name in `ceph-conf --list-sections $PREFIX`; + do + t=`$RADOSGW -n $name --show-config-value rgw_exit_timeout_secs` + if [ $t -gt $timeout ]; then timeout=$t; fi + done + killproc $RADOSGW echo "Stopping radosgw instance(s)..." + while pidof $RADOSGW >/dev/null && [ $timeout -gt 0 ] ; do + sleep 1 + timeout=$(($timeout - 1)) + done ;; status) daemon_is_running $RADOSGW 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/json_spirit/json_spirit_reader_template.h b/ceph/src/json_spirit/json_spirit_reader_template.h index f87b5933..c50f885e 100644 --- a/ceph/src/json_spirit/json_spirit_reader_template.h +++ b/ceph/src/json_spirit/json_spirit_reader_template.h @@ -13,6 +13,8 @@ #include "json_spirit_value.h" #include "json_spirit_error_position.h" +#include "common/utf8.h" + #define BOOST_SPIRIT_THREADSAFE // uncomment for multithreaded use, requires linking to boost.thread #include @@ -71,18 +73,30 @@ namespace json_spirit return ( hex_to_num( c1 ) << 4 ) + hex_to_num( c2 ); } - template< class Char_type, class Iter_type > - Char_type unicode_str_to_char( Iter_type& begin ) + template< class String_type, class Iter_type > + String_type unicode_str_to_utf8( Iter_type& begin ); + + template<> + std::string unicode_str_to_utf8( std::string::const_iterator & begin ) { + typedef std::string::value_type Char_type; + const Char_type c1( *( ++begin ) ); const Char_type c2( *( ++begin ) ); const Char_type c3( *( ++begin ) ); const Char_type c4( *( ++begin ) ); - return ( hex_to_num( c1 ) << 12 ) + - ( hex_to_num( c2 ) << 8 ) + - ( hex_to_num( c3 ) << 4 ) + - hex_to_num( c4 ); + unsigned long uc = ( hex_to_num( c1 ) << 12 ) + + ( hex_to_num( c2 ) << 8 ) + + ( hex_to_num( c3 ) << 4 ) + + hex_to_num( c4 ); + + unsigned char buf[7]; // MAX_UTF8_SZ is 6 (see src/common/utf8.c) + int r = encode_utf8(uc, buf); + if (r >= 0) { + return std::string(reinterpret_cast(buf), r); + } + return std::string("_"); } template< class String_type > @@ -116,7 +130,7 @@ namespace json_spirit { if( end - begin >= 5 ) // expecting "uHHHH..." { - s += unicode_str_to_char< Char_type >( begin ); + s += unicode_str_to_utf8< String_type >( begin ); } break; } @@ -178,11 +192,15 @@ namespace json_spirit return get_str_< std::string >( begin, end ); } +// Need this guard else it tries to instantiate unicode_str_to_utf8 with a +// std::wstring, which isn't presently implemented +#if defined( JSON_SPIRIT_WMVALUE_ENABLED ) && !defined( BOOST_NO_STD_WSTRING ) inline std::wstring get_str( std::wstring::const_iterator begin, std::wstring::const_iterator end ) { return get_str_< std::wstring >( begin, end ); } - +#endif + template< class String_type, class Iter_type > String_type get_str( Iter_type begin, Iter_type end ) { diff --git a/ceph/src/libcephfs.cc b/ceph/src/libcephfs.cc index 88e86ba8..a8a32f48 100644 --- a/ceph/src/libcephfs.cc +++ b/ceph/src/libcephfs.cc @@ -34,9 +34,8 @@ struct ceph_mount_info { public: - ceph_mount_info(uint64_t msgr_nonce_, CephContext *cct_) - : msgr_nonce(msgr_nonce_), - mounted(false), + ceph_mount_info(CephContext *cct_) + : mounted(false), inited(false), client(NULL), monclient(NULL), @@ -80,7 +79,7 @@ public: goto fail; //network connection - messenger = Messenger::create(cct, entity_name_t::CLIENT(), "client", msgr_nonce); + messenger = Messenger::create_client_messenger(cct, "client"); //at last the client ret = -1002; @@ -215,7 +214,6 @@ public: } private: - uint64_t msgr_nonce; bool mounted; bool inited; Client *client; @@ -242,14 +240,7 @@ extern "C" const char *ceph_version(int *pmajor, int *pminor, int *ppatch) extern "C" int ceph_create_with_context(struct ceph_mount_info **cmount, CephContext *cct) { - uint64_t nonce = 0; - - // 6 bytes of random and 2 bytes of pid - get_random_bytes((char*)&nonce, sizeof(nonce)); - nonce &= ~0xffff; - nonce |= (uint64_t)getpid(); - - *cmount = new struct ceph_mount_info(nonce, cct); + *cmount = new struct ceph_mount_info(cct); return 0; } diff --git a/ceph/src/librados/IoCtxImpl.cc b/ceph/src/librados/IoCtxImpl.cc index 6fc22ade..887b390e 100644 --- a/ceph/src/librados/IoCtxImpl.cc +++ b/ceph/src/librados/IoCtxImpl.cc @@ -815,7 +815,7 @@ int librados::IoCtxImpl::hit_set_list(uint32_t hash, AioCompletionImpl *c, ::ObjectOperation rd; rd.hit_set_ls(pls, NULL); object_locator_t oloc(poolid); - objecter->pg_read(hash, oloc, rd, NULL, 0, onack, NULL); + objecter->pg_read(hash, oloc, rd, NULL, 0, onack, NULL, NULL); return 0; } @@ -831,7 +831,7 @@ int librados::IoCtxImpl::hit_set_get(uint32_t hash, AioCompletionImpl *c, ::ObjectOperation rd; rd.hit_set_get(utime_t(stamp, 0), pbl, 0); object_locator_t oloc(poolid); - objecter->pg_read(hash, oloc, rd, NULL, 0, onack, NULL); + objecter->pg_read(hash, oloc, rd, NULL, 0, onack, NULL, NULL); return 0; } diff --git a/ceph/src/librados/RadosClient.cc b/ceph/src/librados/RadosClient.cc index 9330e653..572aa252 100644 --- a/ceph/src/librados/RadosClient.cc +++ b/ceph/src/librados/RadosClient.cc @@ -30,7 +30,7 @@ #include "messages/MWatchNotify.h" #include "messages/MLog.h" -#include "msg/SimpleMessenger.h" +#include "msg/Messenger.h" // needed for static_cast #include "messages/PaxosServiceMessage.h" @@ -52,8 +52,6 @@ #undef dout_prefix #define dout_prefix *_dout << "librados: " -static atomic_t rados_instance; - bool librados::RadosClient::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer, bool force_new) { @@ -206,7 +204,6 @@ int librados::RadosClient::connect() common_init_finish(cct); int err; - uint64_t nonce; // already connected? if (state == CONNECTING) @@ -221,8 +218,7 @@ int librados::RadosClient::connect() goto out; err = -ENOMEM; - nonce = getpid() + (1000000 * (uint64_t)rados_instance.inc()); - messenger = new SimpleMessenger(cct, entity_name_t::CLIENT(-1), "radosclient", nonce); + messenger = Messenger::create_client_messenger(cct, "radosclient"); if (!messenger) goto out; @@ -236,7 +232,7 @@ int librados::RadosClient::connect() ldout(cct, 1) << "starting objecter" << dendl; err = -ENOMEM; - objecter = new Objecter(cct, messenger, &monclient, &osdmap, lock, timer, + objecter = new (std::nothrow) Objecter(cct, messenger, &monclient, &osdmap, lock, timer, cct->_conf->rados_mon_op_timeout, cct->_conf->rados_osd_op_timeout); if (!objecter) @@ -287,8 +283,19 @@ int librados::RadosClient::connect() err = 0; out: - if (err) + if (err) { state = DISCONNECTED; + + if (objecter) { + delete objecter; + objecter = NULL; + } + if (messenger) { + delete messenger; + messenger = NULL; + } + } + return err; } @@ -434,6 +441,10 @@ int librados::RadosClient::wait_for_osdmap() { assert(lock.is_locked()); + if (state != CONNECTED) { + return -ENOTCONN; + } + utime_t timeout; if (cct->_conf->rados_mon_op_timeout > 0) timeout.set_from_double(cct->_conf->rados_mon_op_timeout); diff --git a/ceph/src/librados/RadosClient.h b/ceph/src/librados/RadosClient.h index e608ced8..3e12b55e 100644 --- a/ceph/src/librados/RadosClient.h +++ b/ceph/src/librados/RadosClient.h @@ -33,7 +33,7 @@ struct md_config_t; class Message; class MWatchNotify; class MLog; -class SimpleMessenger; +class Messenger; class librados::RadosClient : public Dispatcher { @@ -49,7 +49,7 @@ private: OSDMap osdmap; MonClient monclient; - SimpleMessenger *messenger; + Messenger *messenger; uint64_t instance_id; diff --git a/ceph/src/librados/librados.cc b/ceph/src/librados/librados.cc index 26b94bd5..9a6e9f4c 100644 --- a/ceph/src/librados/librados.cc +++ b/ceph/src/librados/librados.cc @@ -3309,7 +3309,7 @@ extern "C" int rados_write_op_operate(rados_write_op_t write_op, object_t obj(oid); ::ObjectOperation *oo = (::ObjectOperation *) write_op; librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; - return ctx->operate(obj, oo, mtime, flags); + return ctx->operate(obj, oo, mtime, translate_flags(flags)); } extern "C" int rados_aio_write_op_operate(rados_write_op_t write_op, @@ -3323,7 +3323,7 @@ extern "C" int rados_aio_write_op_operate(rados_write_op_t write_op, ::ObjectOperation *oo = (::ObjectOperation *) write_op; librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; librados::AioCompletionImpl *c = (librados::AioCompletionImpl*)completion; - return ctx->aio_operate(obj, oo, c, ctx->snapc, flags); + return ctx->aio_operate(obj, oo, c, ctx->snapc, translate_flags(flags)); } extern "C" rados_read_op_t rados_create_read_op() @@ -3596,7 +3596,8 @@ extern "C" int rados_read_op_operate(rados_read_op_t read_op, { object_t obj(oid); librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; - return ctx->operate_read(obj, (::ObjectOperation *)read_op, NULL, flags); + return ctx->operate_read(obj, (::ObjectOperation *)read_op, NULL, + translate_flags(flags)); } extern "C" int rados_aio_read_op_operate(rados_read_op_t read_op, @@ -3609,5 +3610,5 @@ extern "C" int rados_aio_read_op_operate(rados_read_op_t read_op, librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; librados::AioCompletionImpl *c = (librados::AioCompletionImpl*)completion; return ctx->aio_operate_read(obj, (::ObjectOperation *)read_op, - c, flags, NULL); + c, translate_flags(flags), NULL); } diff --git a/ceph/src/librbd/AioCompletion.cc b/ceph/src/librbd/AioCompletion.cc index 86b5b504..e818674b 100644 --- a/ceph/src/librbd/AioCompletion.cc +++ b/ceph/src/librbd/AioCompletion.cc @@ -5,6 +5,7 @@ #include "common/ceph_context.h" #include "common/dout.h" +#include "common/errno.h" #include "librbd/AioRequest.h" #include "librbd/internal.h" @@ -25,7 +26,7 @@ namespace librbd { building = false; if (!pending_count) { finalize(cct, rval); - complete(); + complete(cct); } lock.Unlock(); } @@ -54,6 +55,49 @@ namespace librbd { } } + void AioCompletion::complete(CephContext *cct) { + utime_t elapsed; + assert(lock.is_locked()); + elapsed = ceph_clock_now(cct) - start_time; + switch (aio_type) { + case AIO_TYPE_READ: + ictx->perfcounter->tinc(l_librbd_aio_rd_latency, elapsed); break; + case AIO_TYPE_WRITE: + ictx->perfcounter->tinc(l_librbd_aio_wr_latency, elapsed); break; + case AIO_TYPE_DISCARD: + ictx->perfcounter->tinc(l_librbd_aio_discard_latency, elapsed); break; + case AIO_TYPE_FLUSH: + ictx->perfcounter->tinc(l_librbd_aio_flush_latency, elapsed); break; + default: + lderr(cct) << "completed invalid aio_type: " << aio_type << dendl; + break; + } + + if (ictx != NULL) { + Mutex::Locker l(ictx->aio_lock); + assert(ictx->pending_aio != 0); + --ictx->pending_aio; + ictx->pending_aio_cond.Signal(); + } + + if (complete_cb) { + complete_cb(rbd_comp, complete_arg); + } + done = true; + cond.Signal(); + } + + void AioCompletion::fail(CephContext *cct, int r) + { + lderr(cct) << "AioCompletion::fail() " << this << ": " << cpp_strerror(r) + << dendl; + lock.Lock(); + assert(pending_count == 0); + rval = r; + complete(cct); + put_unlock(); + } + void AioCompletion::complete_request(CephContext *cct, ssize_t r) { ldout(cct, 20) << "AioCompletion::complete_request() " @@ -70,7 +114,7 @@ namespace librbd { int count = --pending_count; if (!count && !building) { finalize(cct, rval); - complete(); + complete(cct); } put_unlock(); } diff --git a/ceph/src/librbd/AioCompletion.h b/ceph/src/librbd/AioCompletion.h index e28cd6a0..4dbad521 100644 --- a/ceph/src/librbd/AioCompletion.h +++ b/ceph/src/librbd/AioCompletion.h @@ -101,37 +101,8 @@ namespace librbd { start_time = ceph_clock_now(ictx->cct); } - void complete() { - utime_t elapsed; - assert(lock.is_locked()); - elapsed = ceph_clock_now(ictx->cct) - start_time; - switch (aio_type) { - case AIO_TYPE_READ: - ictx->perfcounter->tinc(l_librbd_aio_rd_latency, elapsed); break; - case AIO_TYPE_WRITE: - ictx->perfcounter->tinc(l_librbd_aio_wr_latency, elapsed); break; - case AIO_TYPE_DISCARD: - ictx->perfcounter->tinc(l_librbd_aio_discard_latency, elapsed); break; - case AIO_TYPE_FLUSH: - ictx->perfcounter->tinc(l_librbd_aio_flush_latency, elapsed); break; - default: - lderr(ictx->cct) << "completed invalid aio_type: " << aio_type << dendl; - break; - } - - { - Mutex::Locker l(ictx->aio_lock); - assert(ictx->pending_aio != 0); - --ictx->pending_aio; - ictx->pending_aio_cond.Signal(); - } - - if (complete_cb) { - complete_cb(rbd_comp, complete_arg); - } - done = true; - cond.Signal(); - } + void complete(CephContext *cct); + void fail(CephContext *cct, int r); void set_complete_cb(void *cb_arg, callback_t cb) { complete_cb = cb; diff --git a/ceph/src/librbd/AioRequest.cc b/ceph/src/librbd/AioRequest.cc index 5cf9a11d..dee6eba1 100644 --- a/ceph/src/librbd/AioRequest.cc +++ b/ceph/src/librbd/AioRequest.cc @@ -85,8 +85,9 @@ namespace librbd { return true; } - int AioRead::send() { - ldout(m_ictx->cct, 20) << "send " << this << " " << m_oid << " " << m_object_off << "~" << m_object_len << dendl; + void AioRead::send() { + ldout(m_ictx->cct, 20) << "send " << this << " " << m_oid << " " + << m_object_off << "~" << m_object_len << dendl; librados::AioCompletion *rados_completion = librados::Rados::aio_create_completion(this, rados_req_cb, NULL); @@ -99,10 +100,11 @@ namespace librbd { } else { op.read(m_object_off, m_object_len, &m_read_data, NULL); } + r = m_ioctx->aio_operate(m_oid, rados_completion, &op, flags, NULL); + assert(r == 0); rados_completion->release(); - return r; } /** write **/ @@ -224,16 +226,17 @@ namespace librbd { return finished; } - int AbstractWrite::send() { - ldout(m_ictx->cct, 20) << "send " << this << " " << m_oid << " " << m_object_off << "~" << m_object_len << dendl; + void AbstractWrite::send() { + ldout(m_ictx->cct, 20) << "send " << this << " " << m_oid << " " + << m_object_off << "~" << m_object_len << dendl; librados::AioCompletion *rados_completion = librados::Rados::aio_create_completion(this, NULL, rados_req_cb); int r; assert(m_write.size()); r = m_ioctx->aio_operate(m_oid, rados_completion, &m_write, m_snap_seq, m_snaps); + assert(r == 0); rados_completion->release(); - return r; } void AbstractWrite::send_copyup() { diff --git a/ceph/src/librbd/AioRequest.h b/ceph/src/librbd/AioRequest.h index d6103f9a..882b5359 100644 --- a/ceph/src/librbd/AioRequest.h +++ b/ceph/src/librbd/AioRequest.h @@ -43,7 +43,7 @@ namespace librbd { } virtual bool should_complete(int r) = 0; - virtual int send() = 0; + virtual void send() = 0; protected: void read_from_parent(vector >& image_extents); @@ -73,7 +73,7 @@ namespace librbd { } virtual ~AioRead() {} virtual bool should_complete(int r); - virtual int send(); + virtual void send(); ceph::bufferlist &data() { return m_read_data; @@ -100,7 +100,7 @@ namespace librbd { bool hide_enoent); virtual ~AbstractWrite() {} virtual bool should_complete(int r); - virtual int send(); + virtual void send(); void guard_write(); bool has_parent() const { diff --git a/ceph/src/librbd/ImageCtx.cc b/ceph/src/librbd/ImageCtx.cc index 8fb8e371..ce403a7b 100644 --- a/ceph/src/librbd/ImageCtx.cc +++ b/ceph/src/librbd/ImageCtx.cc @@ -6,6 +6,7 @@ #include "common/dout.h" #include "common/errno.h" #include "common/perf_counters.h" +#include "common/WorkQueue.h" #include "librbd/internal.h" #include "librbd/WatchCtx.h" @@ -27,6 +28,23 @@ using librados::snap_t; using librados::IoCtx; namespace librbd { + +namespace { + +class ThreadPoolSingleton : public ThreadPool { +public: + ThreadPoolSingleton(CephContext *cct) + : ThreadPool(cct, "librbd::thread_pool", cct->_conf->rbd_op_threads, + "rbd_op_threads") { + start(); + } + virtual ~ThreadPoolSingleton() { + stop(); + } +}; + +} // anonymous namespace + ImageCtx::ImageCtx(const string &image_name, const string &image_id, const char *snap, IoCtx& p, bool ro) : cct((CephContext*)p.cct()), @@ -53,7 +71,7 @@ namespace librbd { id(image_id), parent(NULL), stripe_unit(0), stripe_count(0), object_cacher(NULL), writeback_handler(NULL), object_set(NULL), - pending_aio(0) + pending_aio(0), aio_work_queue(NULL) { md_ctx.dup(p); data_ctx.dup(p); @@ -98,6 +116,13 @@ namespace librbd { object_set->return_enoent = true; object_cacher->start(); } + + ThreadPoolSingleton *thread_pool_singleton; + cct->lookup_or_create_singleton_object( + thread_pool_singleton, "librbd::thread_pool"); + aio_work_queue = new ContextWQ("librbd::aio_work_queue", + cct->_conf->rbd_op_thread_timeout, + thread_pool_singleton); } ImageCtx::~ImageCtx() { @@ -115,6 +140,8 @@ namespace librbd { object_set = NULL; } delete[] format_string; + + delete aio_work_queue; } int ImageCtx::init() { @@ -189,10 +216,9 @@ namespace librbd { if (object_cacher) { uint64_t obj = cct->_conf->rbd_cache_max_dirty_object; if (!obj) { - obj = cct->_conf->rbd_cache_size / (1ull << order); - obj = obj * 4 + 10; + obj = MIN(2000, MAX(10, cct->_conf->rbd_cache_size / 100 / sizeof(ObjectCacher::Object))); } - ldout(cct, 10) << " cache bytes " << cct->_conf->rbd_cache_size << " order " << (int)order + ldout(cct, 10) << " cache bytes " << cct->_conf->rbd_cache_size << " -> about " << obj << " objects" << dendl; object_cacher->set_max_objects(obj); } @@ -603,9 +629,7 @@ namespace librbd { void ImageCtx::clear_nonexistence_cache() { if (!object_cacher) return; - cache_lock.Lock(); object_cacher->clear_nonexistence(object_set); - cache_lock.Unlock(); } int ImageCtx::register_watch() { diff --git a/ceph/src/librbd/ImageCtx.h b/ceph/src/librbd/ImageCtx.h index 5a0d6375..406192b5 100644 --- a/ceph/src/librbd/ImageCtx.h +++ b/ceph/src/librbd/ImageCtx.h @@ -26,6 +26,7 @@ #include "librbd/parent_types.h" class CephContext; +class ContextWQ; class PerfCounters; namespace librbd { @@ -95,6 +96,8 @@ namespace librbd { Cond pending_aio_cond; uint64_t pending_aio; + ContextWQ *aio_work_queue; + /** * Either image_name or image_id must be set. * If id is not known, pass the empty std::string, diff --git a/ceph/src/librbd/internal.cc b/ceph/src/librbd/internal.cc index 598d515c..9ed7bd97 100644 --- a/ceph/src/librbd/internal.cc +++ b/ceph/src/librbd/internal.cc @@ -9,6 +9,7 @@ #include "common/dout.h" #include "common/errno.h" #include "common/Throttle.h" +#include "common/WorkQueue.h" #include "cls/lock/cls_lock_client.h" #include "include/stringify.h" @@ -531,8 +532,11 @@ namespace librbd { (scan_for_parents(ictx, our_pspec, snap_id) == -ENOENT)) { r = cls_client::remove_child(&ictx->md_ctx, RBD_CHILDREN, our_pspec, ictx->id); - if (r < 0) + if (r < 0 && r != -ENOENT) { + lderr(ictx->cct) << "snap_remove: failed to deregister from parent " + "image" << dendl; return r; + } } } @@ -1286,11 +1290,13 @@ reprotect_and_return_err: return r; } + ictx->parent->cache_lock.Lock(); ictx->parent->snap_lock.get_write(); r = ictx->parent->get_snap_name(parent_snap_id, &ictx->parent->snap_name); if (r < 0) { lderr(ictx->cct) << "parent snapshot does not exist" << dendl; ictx->parent->snap_lock.put_write(); + ictx->parent->cache_lock.Unlock(); close_image(ictx->parent); ictx->parent = NULL; return r; @@ -1304,12 +1310,14 @@ reprotect_and_return_err: << ictx->parent->snap_name << dendl; ictx->parent->parent_lock.put_write(); ictx->parent->snap_lock.put_write(); + ictx->parent->cache_lock.Unlock(); close_image(ictx->parent); ictx->parent = NULL; return r; } ictx->parent->parent_lock.put_write(); ictx->parent->snap_lock.put_write(); + ictx->parent->cache_lock.Unlock(); return 0; } @@ -1323,6 +1331,9 @@ reprotect_and_return_err: RWLock::RLocker l(ictx->snap_lock); RWLock::RLocker l2(ictx->parent_lock); + if (ictx->parent == NULL) { + return -ENOENT; + } parent_spec parent_spec; @@ -1410,7 +1421,6 @@ reprotect_and_return_err: close_image(ictx); return -EBUSY; } - assert(watchers.size() == 1); ictx->md_lock.get_read(); trim_image(ictx, 0, prog_ctx); @@ -1707,10 +1717,11 @@ reprotect_and_return_err: vector snap_parents; vector snap_protection; { - RWLock::WLocker l(ictx->snap_lock); + Mutex::Locker cache_locker(ictx->cache_lock); + RWLock::WLocker snap_locker(ictx->snap_lock); { - int r; - RWLock::WLocker l2(ictx->parent_lock); + int r; + RWLock::WLocker parent_locker(ictx->parent_lock); ictx->lockers.clear(); if (ictx->old_format) { r = read_header(ictx->md_ctx, ictx->header_oid, &ictx->header, NULL); @@ -1836,7 +1847,7 @@ reprotect_and_return_err: } ictx->data_ctx.selfmanaged_snap_set_write_ctx(ictx->snapc.seq, ictx->snaps); - } // release snap_lock + } // release snap_lock and cache_lock if (new_snap) { _flush(ictx); @@ -2002,13 +2013,7 @@ reprotect_and_return_err: Context *ctx = new C_CopyWrite(m_throttle, m_bl); AioCompletion *comp = aio_create_completion_internal(ctx, rbd_ctx_cb); - r = aio_write(m_dest, m_offset, m_bl->length(), m_bl->c_str(), comp); - if (r < 0) { - ctx->complete(r); - comp->release(); - lderr(m_dest->cct) << "error writing to destination image at offset " - << m_offset << ": " << cpp_strerror(r) << dendl; - } + aio_write(m_dest, m_offset, m_bl->length(), m_bl->c_str(), comp); } private: SimpleThrottle *m_throttle; @@ -2041,20 +2046,15 @@ reprotect_and_return_err: SimpleThrottle throttle(cct->_conf->rbd_concurrent_management_ops, false); uint64_t period = src->get_stripe_period(); for (uint64_t offset = 0; offset < src_size; offset += period) { + if (throttle.pending_error()) { + return throttle.wait_for_ret(); + } + uint64_t len = min(period, src_size - offset); bufferlist *bl = new bufferlist(); Context *ctx = new C_CopyRead(&throttle, dest, offset, bl); AioCompletion *comp = aio_create_completion_internal(ctx, rbd_ctx_cb); - r = aio_read(src, offset, len, NULL, bl, comp); - if (r < 0) { - ctx->complete(r); - comp->release(); - throttle.wait_for_ret(); - lderr(cct) << "could not read from source image from " - << offset << " to " << offset + len << ": " - << cpp_strerror(r) << dendl; - return r; - } + aio_read(src, offset, len, NULL, bl, comp); prog_ctx.update_progress(offset, src_size); } @@ -2068,8 +2068,9 @@ reprotect_and_return_err: int _snap_set(ImageCtx *ictx, const char *snap_name) { - RWLock::WLocker l1(ictx->snap_lock); - RWLock::WLocker l2(ictx->parent_lock); + Mutex::Locker cache_locker(ictx->cache_lock); + RWLock::WLocker snap_locker(ictx->snap_lock); + RWLock::WLocker parent_locker(ictx->parent_lock); int r; if ((snap_name != NULL) && (strlen(snap_name) != 0)) { r = ictx->snap_set(snap_name); @@ -2139,6 +2140,9 @@ reprotect_and_return_err: void close_image(ImageCtx *ictx) { ldout(ictx->cct, 20) << "close_image " << ictx << dendl; + + ictx->aio_work_queue->drain(); + if (ictx->object_cacher) { ictx->shutdown_cache(); // implicitly flushes } else { @@ -2209,6 +2213,10 @@ reprotect_and_return_err: SimpleThrottle throttle(cct->_conf->rbd_concurrent_management_ops, false); for (uint64_t ono = 0; ono < overlap_objects; ono++) { + if (throttle.pending_error()) { + return throttle.wait_for_ret(); + } + { RWLock::RLocker l(ictx->parent_lock); // stop early if the parent went away - it just means @@ -2232,12 +2240,7 @@ reprotect_and_return_err: Context *comp = new C_SimpleThrottle(&throttle); AioWrite *req = new AioWrite(ictx, oid, ono, 0, objectx, object_overlap, bl, snapc, CEPH_NOSNAP, comp); - r = req->send(); - if (r < 0) { - lderr(cct) << "failed to flatten object " << oid << dendl; - goto err; - } - + req->send(); prog_ctx.update_progress(ono, overlap_objects); } @@ -2427,12 +2430,7 @@ reprotect_and_return_err: Context *ctx = new C_SafeCond(&mylock, &cond, &done, &ret); AioCompletion *c = aio_create_completion_internal(ctx, rbd_ctx_cb); - r = aio_read(ictx, off, read_len, NULL, &bl, c); - if (r < 0) { - c->release(); - delete ctx; - return r; - } + aio_read(ictx, off, read_len, NULL, &bl, c); mylock.Lock(); while (!done) @@ -2662,12 +2660,7 @@ reprotect_and_return_err: Context *ctx = new C_SafeCond(&mylock, &cond, &done, &ret); AioCompletion *c = aio_create_completion_internal(ctx, rbd_ctx_cb); - int r = aio_read(ictx, image_extents, buf, pbl, c); - if (r < 0) { - c->release(); - delete ctx; - return r; - } + aio_read(ictx, image_extents, buf, pbl, c); mylock.Lock(); while (!done) @@ -2696,12 +2689,7 @@ reprotect_and_return_err: Context *ctx = new C_SafeCond(&mylock, &cond, &done, &ret); AioCompletion *c = aio_create_completion_internal(ctx, rbd_ctx_cb); - r = aio_write(ictx, off, mylen, buf, c); - if (r < 0) { - c->release(); - delete ctx; - return r; - } + aio_write(ictx, off, mylen, buf, c); mylock.Lock(); while (!done) @@ -2732,12 +2720,7 @@ reprotect_and_return_err: Context *ctx = new C_SafeCond(&mylock, &cond, &done, &ret); AioCompletion *c = aio_create_completion_internal(ctx, rbd_ctx_cb); - int r = aio_discard(ictx, off, len, c); - if (r < 0) { - c->release(); - delete ctx; - return r; - } + aio_discard(ictx, off, len, c); mylock.Lock(); while (!done) @@ -2855,18 +2838,20 @@ reprotect_and_return_err: return 0; } - int aio_flush(ImageCtx *ictx, AioCompletion *c) + void aio_flush(ImageCtx *ictx, AioCompletion *c) { CephContext *cct = ictx->cct; ldout(cct, 20) << "aio_flush " << ictx << " completion " << c << dendl; + c->get(); int r = ictx_check(ictx); - if (r < 0) - return r; + if (r < 0) { + c->fail(cct, r); + return; + } ictx->user_flushed(); - c->get(); c->add_request(); c->init_time(ictx, AIO_TYPE_FLUSH); C_AioWrite *req_comp = new C_AioWrite(cct, c); @@ -2881,8 +2866,6 @@ reprotect_and_return_err: c->finish_adding_requests(cct); c->put(); ictx->perfcounter->inc(l_librbd_aio_flush); - - return 0; } int flush(ImageCtx *ictx) @@ -2930,21 +2913,26 @@ reprotect_and_return_err: return ictx->invalidate_cache(); } - int aio_write(ImageCtx *ictx, uint64_t off, size_t len, const char *buf, - AioCompletion *c) + void aio_write(ImageCtx *ictx, uint64_t off, size_t len, const char *buf, + AioCompletion *c) { CephContext *cct = ictx->cct; ldout(cct, 20) << "aio_write " << ictx << " off = " << off << " len = " << len << " buf = " << (void*)buf << dendl; + c->get(); int r = ictx_check(ictx); - if (r < 0) - return r; + if (r < 0) { + c->fail(cct, r); + return; + } uint64_t mylen = len; r = clip_io(ictx, off, &mylen); - if (r < 0) - return r; + if (r < 0) { + c->fail(cct, r); + return; + } ictx->snap_lock.get_read(); snapid_t snap_id = ictx->snap_id; @@ -2955,8 +2943,10 @@ reprotect_and_return_err: ictx->parent_lock.put_read(); ictx->snap_lock.put_read(); - if (snap_id != CEPH_NOSNAP || ictx->read_only) - return -EROFS; + if (snap_id != CEPH_NOSNAP || ictx->read_only) { + c->fail(cct, -EROFS); + return; + } ldout(cct, 20) << " parent overlap " << overlap << dendl; @@ -2967,7 +2957,6 @@ reprotect_and_return_err: &ictx->layout, off, mylen, 0, extents); } - c->get(); c->init_time(ictx, AIO_TYPE_WRITE); for (vector::iterator p = extents.begin(); p != extents.end(); ++p) { ldout(cct, 20) << " oid " << p->oid << " " << p->offset << "~" << p->length @@ -2996,35 +2985,35 @@ reprotect_and_return_err: objectx, object_overlap, bl, snapc, snap_id, req_comp); c->add_request(); - r = req->send(); - if (r < 0) - goto done; + req->send(); } } - done: + c->finish_adding_requests(ictx->cct); c->put(); ictx->perfcounter->inc(l_librbd_aio_wr); ictx->perfcounter->inc(l_librbd_aio_wr_bytes, mylen); - - /* FIXME: cleanup all the allocated stuff */ - return r; } - int aio_discard(ImageCtx *ictx, uint64_t off, uint64_t len, AioCompletion *c) + void aio_discard(ImageCtx *ictx, uint64_t off, uint64_t len, AioCompletion *c) { CephContext *cct = ictx->cct; ldout(cct, 20) << "aio_discard " << ictx << " off = " << off << " len = " << len << dendl; + c->get(); int r = ictx_check(ictx); - if (r < 0) - return r; + if (r < 0) { + c->fail(cct, r); + return; + } r = clip_io(ictx, off, &len); - if (r < 0) - return r; + if (r < 0) { + c->fail(cct, r); + return; + } // TODO: check for snap ictx->snap_lock.get_read(); @@ -3036,8 +3025,10 @@ reprotect_and_return_err: ictx->parent_lock.put_read(); ictx->snap_lock.put_read(); - if (snap_id != CEPH_NOSNAP || ictx->read_only) - return -EROFS; + if (snap_id != CEPH_NOSNAP || ictx->read_only) { + c->fail(cct, -EROFS); + return; + } // map vector extents; @@ -3046,7 +3037,6 @@ reprotect_and_return_err: &ictx->layout, off, len, 0, extents); } - c->get(); c->init_time(ictx, AIO_TYPE_DISCARD); for (vector::iterator p = extents.begin(); p != extents.end(); ++p) { ldout(cct, 20) << " oid " << p->oid << " " << p->offset << "~" << p->length @@ -3077,12 +3067,10 @@ reprotect_and_return_err: snapc, snap_id, req_comp); } - r = req->send(); - if (r < 0) - goto done; + req->send(); } + r = 0; - done: if (ictx->object_cacher) { Mutex::Locker l(ictx->cache_lock); ictx->object_cacher->discard_set(ictx->object_set, extents); @@ -3093,9 +3081,6 @@ reprotect_and_return_err: ictx->perfcounter->inc(l_librbd_aio_discard); ictx->perfcounter->inc(l_librbd_aio_discard_bytes, len); - - /* FIXME: cleanup all the allocated stuff */ - return r; } void rbd_req_cb(completion_t cb, void *arg) @@ -3105,23 +3090,27 @@ reprotect_and_return_err: req->complete(comp->get_return_value()); } - int aio_read(ImageCtx *ictx, uint64_t off, size_t len, + void aio_read(ImageCtx *ictx, uint64_t off, size_t len, char *buf, bufferlist *bl, AioCompletion *c) { vector > image_extents(1); image_extents[0] = make_pair(off, len); - return aio_read(ictx, image_extents, buf, bl, c); + aio_read(ictx, image_extents, buf, bl, c); } - int aio_read(ImageCtx *ictx, const vector >& image_extents, - char *buf, bufferlist *pbl, AioCompletion *c) + void aio_read(ImageCtx *ictx, const vector >& image_extents, + char *buf, bufferlist *pbl, AioCompletion *c) { - ldout(ictx->cct, 20) << "aio_read " << ictx << " completion " << c << " " << image_extents << dendl; + CephContext *cct = ictx->cct; + ldout(cct, 20) << "aio_read " << ictx << " completion " << c << " " << image_extents << dendl; + c->get(); int r = ictx_check(ictx); - if (r < 0) - return r; + if (r < 0) { + c->fail(cct, r); + return; + } ictx->snap_lock.get_read(); snap_t snap_id = ictx->snap_id; @@ -3136,8 +3125,10 @@ reprotect_and_return_err: ++p) { uint64_t len = p->second; r = clip_io(ictx, p->first, &len); - if (r < 0) - return r; + if (r < 0) { + c->fail(cct, r); + return; + } if (len == 0) continue; @@ -3146,13 +3137,10 @@ reprotect_and_return_err: buffer_ofs += len; } - int64_t ret; - c->read_buf = buf; c->read_buf_len = buffer_ofs; c->read_bl = pbl; - c->get(); c->init_time(ictx, AIO_TYPE_READ); for (map >::iterator p = object_extents.begin(); p != object_extents.end(); ++p) { for (vector::iterator q = p->second.begin(); q != p->second.end(); ++q) { @@ -3173,25 +3161,16 @@ reprotect_and_return_err: q->length, q->offset, cache_comp); } else { - r = req->send(); - if (r < 0 && r == -ENOENT) - r = 0; - if (r < 0) { - ret = r; - goto done; - } + req->send(); } } } - ret = buffer_ofs; - done: + c->finish_adding_requests(ictx->cct); c->put(); ictx->perfcounter->inc(l_librbd_aio_rd); ictx->perfcounter->inc(l_librbd_aio_rd_bytes, buffer_ofs); - - return ret; } AioCompletion *aio_create_completion() { diff --git a/ceph/src/librbd/internal.h b/ceph/src/librbd/internal.h index 1e9fd9a6..7712a394 100644 --- a/ceph/src/librbd/internal.h +++ b/ceph/src/librbd/internal.h @@ -179,14 +179,15 @@ namespace librbd { char *buf, bufferlist *pbl); ssize_t write(ImageCtx *ictx, uint64_t off, size_t len, const char *buf); int discard(ImageCtx *ictx, uint64_t off, uint64_t len); - int aio_write(ImageCtx *ictx, uint64_t off, size_t len, const char *buf, - AioCompletion *c); - int aio_discard(ImageCtx *ictx, uint64_t off, uint64_t len, AioCompletion *c); - int aio_read(ImageCtx *ictx, uint64_t off, size_t len, - char *buf, bufferlist *pbl, AioCompletion *c); - int aio_read(ImageCtx *ictx, const vector >& image_extents, - char *buf, bufferlist *pbl, AioCompletion *c); - int aio_flush(ImageCtx *ictx, AioCompletion *c); + + void aio_write(ImageCtx *ictx, uint64_t off, size_t len, const char *buf, + AioCompletion *c); + void aio_discard(ImageCtx *ictx, uint64_t off, uint64_t len, AioCompletion *c); + void aio_read(ImageCtx *ictx, uint64_t off, size_t len, + char *buf, bufferlist *pbl, AioCompletion *c); + void aio_read(ImageCtx *ictx, const vector >& image_extents, + char *buf, bufferlist *pbl, AioCompletion *c); + void aio_flush(ImageCtx *ictx, AioCompletion *c); int flush(ImageCtx *ictx); int _flush(ImageCtx *ictx); int invalidate_cache(ImageCtx *ictx); diff --git a/ceph/src/librbd/librbd.cc b/ceph/src/librbd/librbd.cc index 658f24b8..244a5a05 100644 --- a/ceph/src/librbd/librbd.cc +++ b/ceph/src/librbd/librbd.cc @@ -20,6 +20,7 @@ #include "common/errno.h" #include "common/snap_types.h" #include "common/perf_counters.h" +#include "common/WorkQueue.h" #include "include/Context.h" #include "include/rbd/librbd.hpp" #include "osdc/ObjectCacher.h" @@ -45,6 +46,117 @@ using ceph::bufferlist; using librados::snap_t; using librados::IoCtx; +namespace { + +class C_AioReadWQ : public Context { +public: + C_AioReadWQ(librbd::ImageCtx *ictx, uint64_t off, size_t len, + char *buf, bufferlist *pbl, librbd::AioCompletion *c) + : m_ictx(ictx), m_off(off), m_len(len), m_buf(buf), m_pbl(pbl), m_comp(c) { + } +protected: + virtual void finish(int r) { + librbd::aio_read(m_ictx, m_off, m_len, m_buf, m_pbl, m_comp); + } +private: + librbd::ImageCtx *m_ictx; + uint64_t m_off; + uint64_t m_len; + char *m_buf; + bufferlist *m_pbl; + librbd::AioCompletion *m_comp; +}; + +class C_AioWriteWQ : public Context { +public: + C_AioWriteWQ(librbd::ImageCtx *ictx, uint64_t off, size_t len, + const char *buf, librbd::AioCompletion *c) + : m_ictx(ictx), m_off(off), m_len(len), m_buf(buf), m_comp(c) { + } +protected: + virtual void finish(int r) { + librbd::aio_write(m_ictx, m_off, m_len, m_buf, m_comp); + } +private: + librbd::ImageCtx *m_ictx; + uint64_t m_off; + uint64_t m_len; + const char *m_buf; + librbd::AioCompletion *m_comp; +}; + +class C_AioDiscardWQ : public Context { +public: + C_AioDiscardWQ(librbd::ImageCtx *ictx, uint64_t off, uint64_t len, + librbd::AioCompletion *c) + : m_ictx(ictx), m_off(off), m_len(len), m_comp(c) { + } +protected: + virtual void finish(int r) { + librbd::aio_discard(m_ictx, m_off, m_len, m_comp); + } +private: + librbd::ImageCtx *m_ictx; + uint64_t m_off; + uint64_t m_len; + librbd::AioCompletion *m_comp; +}; + +class C_AioFlushWQ : public Context { +public: + C_AioFlushWQ(librbd::ImageCtx *ictx, librbd::AioCompletion *c) + : m_ictx(ictx), m_comp(c) { + } +protected: + virtual void finish(int r) { + librbd::aio_flush(m_ictx, m_comp); + } +private: + librbd::ImageCtx *m_ictx; + librbd::AioCompletion *m_comp; +}; + +void submit_aio_read(librbd::ImageCtx *ictx, uint64_t off, size_t len, + char *buf, bufferlist *pbl, librbd::AioCompletion *c) { + if (ictx->cct->_conf->rbd_non_blocking_aio) { + ictx->aio_work_queue->queue(new C_AioReadWQ(ictx, off, len, buf, pbl, c)); + } else { + librbd::aio_read(ictx, off, len, buf, pbl, c); + } +} + +void submit_aio_write(librbd::ImageCtx *ictx, uint64_t off, size_t len, + const char *buf, librbd::AioCompletion *c) { + if (ictx->cct->_conf->rbd_non_blocking_aio) { + ictx->aio_work_queue->queue(new C_AioWriteWQ(ictx, off, len, buf, c)); + } else { + librbd::aio_write(ictx, off, len, buf, c); + } +} + +void submit_aio_discard(librbd::ImageCtx *ictx, uint64_t off, uint64_t len, + librbd::AioCompletion *c) { + if (ictx->cct->_conf->rbd_non_blocking_aio) { + ictx->aio_work_queue->queue(new C_AioDiscardWQ(ictx, off, len, c)); + } else { + librbd::aio_discard(ictx, off, len, c); + } +} + +void submit_aio_flush(librbd::ImageCtx *ictx, librbd::AioCompletion *c) { + if (ictx->cct->_conf->rbd_non_blocking_aio) { + ictx->aio_work_queue->queue(new C_AioFlushWQ(ictx, c)); + } else { + librbd::aio_flush(ictx, c); + } +} + +librbd::AioCompletion* get_aio_completion(librbd::RBD::AioCompletion *comp) { + return reinterpret_cast(comp->pc); +} + +} // anonymous namespace + namespace librbd { ProgressContext::~ProgressContext() { @@ -483,14 +595,15 @@ namespace librbd { ImageCtx *ictx = (ImageCtx *)ctx; if (bl.length() < len) return -EINVAL; - return librbd::aio_write(ictx, off, len, bl.c_str(), - (librbd::AioCompletion *)c->pc); + submit_aio_write(ictx, off, len, bl.c_str(), get_aio_completion(c)); + return 0; } int Image::aio_discard(uint64_t off, uint64_t len, RBD::AioCompletion *c) { ImageCtx *ictx = (ImageCtx *)ctx; - return librbd::aio_discard(ictx, off, len, (librbd::AioCompletion *)c->pc); + submit_aio_discard(ictx, off, len, get_aio_completion(c)); + return 0; } int Image::aio_read(uint64_t off, size_t len, bufferlist& bl, @@ -499,7 +612,8 @@ namespace librbd { ImageCtx *ictx = (ImageCtx *)ctx; ldout(ictx->cct, 10) << "Image::aio_read() buf=" << (void *)bl.c_str() << "~" << (void *)(bl.c_str() + len - 1) << dendl; - return librbd::aio_read(ictx, off, len, NULL, &bl, (librbd::AioCompletion *)c->pc); + submit_aio_read(ictx, off, len, NULL, &bl, get_aio_completion(c)); + return 0; } int Image::flush() @@ -511,7 +625,8 @@ namespace librbd { int Image::aio_flush(RBD::AioCompletion *c) { ImageCtx *ictx = (ImageCtx *)ctx; - return librbd::aio_flush(ictx, (librbd::AioCompletion *)c->pc); + submit_aio_flush(ictx, get_aio_completion(c)); + return 0; } int Image::invalidate_cache() @@ -1102,8 +1217,8 @@ extern "C" int rbd_aio_write(rbd_image_t image, uint64_t off, size_t len, { librbd::ImageCtx *ictx = (librbd::ImageCtx *)image; librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c; - return librbd::aio_write(ictx, off, len, buf, - (librbd::AioCompletion *)comp->pc); + submit_aio_write(ictx, off, len, buf, get_aio_completion(comp)); + return 0; } extern "C" int rbd_aio_discard(rbd_image_t image, uint64_t off, uint64_t len, @@ -1111,7 +1226,8 @@ extern "C" int rbd_aio_discard(rbd_image_t image, uint64_t off, uint64_t len, { librbd::ImageCtx *ictx = (librbd::ImageCtx *)image; librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c; - return librbd::aio_discard(ictx, off, len, (librbd::AioCompletion *)comp->pc); + submit_aio_discard(ictx, off, len, get_aio_completion(comp)); + return 0; } extern "C" int rbd_aio_read(rbd_image_t image, uint64_t off, size_t len, @@ -1119,8 +1235,8 @@ extern "C" int rbd_aio_read(rbd_image_t image, uint64_t off, size_t len, { librbd::ImageCtx *ictx = (librbd::ImageCtx *)image; librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c; - return librbd::aio_read(ictx, off, len, buf, NULL, - (librbd::AioCompletion *)comp->pc); + submit_aio_read(ictx, off, len, buf, NULL, get_aio_completion(comp)); + return 0; } extern "C" int rbd_flush(rbd_image_t image) @@ -1133,7 +1249,8 @@ extern "C" int rbd_aio_flush(rbd_image_t image, rbd_completion_t c) { librbd::ImageCtx *ictx = (librbd::ImageCtx *)image; librbd::RBD::AioCompletion *comp = (librbd::RBD::AioCompletion *)c; - return librbd::aio_flush(ictx, (librbd::AioCompletion *)comp->pc); + submit_aio_flush(ictx, get_aio_completion(comp)); + return 0; } extern "C" int rbd_invalidate_cache(rbd_image_t image) diff --git a/ceph/src/log/Log.cc b/ceph/src/log/Log.cc index 37bb4ef6..392b2c03 100644 --- a/ceph/src/log/Log.cc +++ b/ceph/src/log/Log.cc @@ -112,6 +112,7 @@ void Log::set_log_file(string fn) void Log::reopen_log_file() { + pthread_mutex_lock(&m_flush_mutex); if (m_fd >= 0) VOID_TEMP_FAILURE_RETRY(::close(m_fd)); if (m_log_file.length()) { @@ -119,6 +120,7 @@ void Log::reopen_log_file() } else { m_fd = -1; } + pthread_mutex_unlock(&m_flush_mutex); } void Log::set_syslog_level(int log, int crash) diff --git a/ceph/src/mds/MDS.cc b/ceph/src/mds/MDS.cc index 4509cea2..71b48d6b 100644 --- a/ceph/src/mds/MDS.cc +++ b/ceph/src/mds/MDS.cc @@ -692,19 +692,26 @@ void MDS::handle_mds_beacon(MMDSBeacon *m) // update lab if (beacon_seq_stamp.count(seq)) { - assert(beacon_seq_stamp[seq] > beacon_last_acked_stamp); - beacon_last_acked_stamp = beacon_seq_stamp[seq]; utime_t now = ceph_clock_now(g_ceph_context); - utime_t rtt = now - beacon_last_acked_stamp; + if (beacon_seq_stamp[seq] > beacon_last_acked_stamp) { + beacon_last_acked_stamp = beacon_seq_stamp[seq]; + utime_t rtt = now - beacon_last_acked_stamp; - dout(10) << "handle_mds_beacon " << ceph_mds_state_name(m->get_state()) - << " seq " << m->get_seq() - << " rtt " << rtt << dendl; + dout(10) << "handle_mds_beacon " << ceph_mds_state_name(m->get_state()) + << " seq " << m->get_seq() << " rtt " << rtt << dendl; - if (was_laggy && rtt < g_conf->mds_beacon_grace) { - dout(0) << "handle_mds_beacon no longer laggy" << dendl; - was_laggy = false; - laggy_until = now; + if (was_laggy && rtt < g_conf->mds_beacon_grace) { + dout(0) << "handle_mds_beacon no longer laggy" << dendl; + was_laggy = false; + laggy_until = now; + } + } else { + // Mark myself laggy if system clock goes backwards. Hopping + // later beacons will clear it. + dout(1) << "handle_mds_beacon system clock goes backwards, " + << "mark myself laggy" << dendl; + beacon_last_acked_stamp = now - utime_t(g_conf->mds_beacon_grace + 1, 0); + was_laggy = true; } // clean up seq_stamp map diff --git a/ceph/src/mds/MDSUtility.cc b/ceph/src/mds/MDSUtility.cc index 09be280f..65cf5c61 100644 --- a/ceph/src/mds/MDSUtility.cc +++ b/ceph/src/mds/MDSUtility.cc @@ -25,7 +25,7 @@ MDSUtility::MDSUtility() : waiting_for_mds_map(NULL) { monc = new MonClient(g_ceph_context); - messenger = Messenger::create(g_ceph_context, entity_name_t::CLIENT(), "mds", getpid()); + messenger = Messenger::create_client_messenger(g_ceph_context, "mds"); mdsmap = new MDSMap(); osdmap = new OSDMap(); objecter = new Objecter(g_ceph_context, messenger, monc, osdmap, lock, timer, 0, 0); diff --git a/ceph/src/messages/MOSDBoot.h b/ceph/src/messages/MOSDBoot.h index bfe77757..e59b03cf 100644 --- a/ceph/src/messages/MOSDBoot.h +++ b/ceph/src/messages/MOSDBoot.h @@ -22,7 +22,7 @@ class MOSDBoot : public PaxosServiceMessage { - static const int HEAD_VERSION = 5; + static const int HEAD_VERSION = 6; static const int COMPAT_VERSION = 2; public: @@ -31,21 +31,24 @@ class MOSDBoot : public PaxosServiceMessage { entity_addr_t cluster_addr; epoch_t boot_epoch; // last epoch this daemon was added to the map (if any) map metadata; ///< misc metadata about this osd + uint64_t osd_features; MOSDBoot() : PaxosServiceMessage(MSG_OSD_BOOT, 0, HEAD_VERSION, COMPAT_VERSION), - boot_epoch(0) + boot_epoch(0), osd_features(0) { } MOSDBoot(OSDSuperblock& s, epoch_t be, const entity_addr_t& hb_back_addr_ref, const entity_addr_t& hb_front_addr_ref, - const entity_addr_t& cluster_addr_ref) + const entity_addr_t& cluster_addr_ref, + uint64_t feat) : PaxosServiceMessage(MSG_OSD_BOOT, s.current_epoch, HEAD_VERSION, COMPAT_VERSION), sb(s), hb_back_addr(hb_back_addr_ref), hb_front_addr(hb_front_addr_ref), cluster_addr(cluster_addr_ref), - boot_epoch(be) + boot_epoch(be), + osd_features(feat) { } private: @@ -54,7 +57,9 @@ private: public: const char *get_type_name() const { return "osd_boot"; } void print(ostream& out) const { - out << "osd_boot(osd." << sb.whoami << " booted " << boot_epoch << " v" << version << ")"; + out << "osd_boot(osd." << sb.whoami << " booted " << boot_epoch + << " features " << osd_features + << " v" << version << ")"; } void encode_payload(uint64_t features) { @@ -65,6 +70,7 @@ public: ::encode(boot_epoch, payload); ::encode(hb_front_addr, payload); ::encode(metadata, payload); + ::encode(osd_features, payload); } void decode_payload() { bufferlist::iterator p = payload.begin(); @@ -79,6 +85,10 @@ public: ::decode(hb_front_addr, p); if (header.version >= 5) ::decode(metadata, p); + if (header.version >= 6) + ::decode(osd_features, p); + else + osd_features = 0; } }; diff --git a/ceph/src/messages/MWatchNotify.h b/ceph/src/messages/MWatchNotify.h index 66632f72..bc6bacb7 100644 --- a/ceph/src/messages/MWatchNotify.h +++ b/ceph/src/messages/MWatchNotify.h @@ -20,16 +20,27 @@ class MWatchNotify : public Message { + static const int HEAD_VERSION = 2; + static const int COMPAT_VERSION = 1; + public: - uint64_t cookie; - uint64_t ver; - uint64_t notify_id; - uint8_t opcode; - bufferlist bl; + uint64_t cookie; ///< client unique id for this watch or notify + uint64_t ver; ///< unused + uint64_t notify_id; ///< osd unique id for a notify notification + uint8_t opcode; ///< always WATCH_NOTIFY + bufferlist bl; ///< notify payload (osd->client) + int32_t return_code; ///< notify result (osd->client) - MWatchNotify() : Message(CEPH_MSG_WATCH_NOTIFY) { } - MWatchNotify(uint64_t c, uint64_t v, uint64_t i, uint8_t o, bufferlist b) : Message(CEPH_MSG_WATCH_NOTIFY), - cookie(c), ver(v), notify_id(i), opcode(o), bl(b) { } + MWatchNotify() + : Message(CEPH_MSG_WATCH_NOTIFY, HEAD_VERSION, COMPAT_VERSION) { } + MWatchNotify(uint64_t c, uint64_t v, uint64_t i, uint8_t o, bufferlist b) + : Message(CEPH_MSG_WATCH_NOTIFY, HEAD_VERSION, COMPAT_VERSION), + cookie(c), + ver(v), + notify_id(i), + opcode(o), + bl(b), + return_code(0) { } private: ~MWatchNotify() {} @@ -44,6 +55,10 @@ public: ::decode(notify_id, p); if (msg_ver >= 1) ::decode(bl, p); + if (header.version >= 2) + ::decode(return_code, p); + else + return_code = 0; } void encode_payload(uint64_t features) { uint8_t msg_ver = 1; @@ -53,11 +68,12 @@ public: ::encode(ver, payload); ::encode(notify_id, payload); ::encode(bl, payload); + ::encode(return_code, payload); } const char *get_type_name() const { return "watch-notify"; } void print(ostream& out) const { - out << "watch-notify(c=" << cookie << " v=" << ver << " i=" << notify_id << " opcode=" << (int)opcode << ")"; + out << "watch-notify(c=" << cookie << " v=" << ver << " i=" << notify_id << " opcode=" << (int)opcode << " r = " << return_code << ")"; } }; diff --git a/ceph/src/mon/AuthMonitor.cc b/ceph/src/mon/AuthMonitor.cc index 359c2e10..9e074e2c 100644 --- a/ceph/src/mon/AuthMonitor.cc +++ b/ceph/src/mon/AuthMonitor.cc @@ -339,7 +339,8 @@ uint64_t AuthMonitor::assign_global_id(MAuth *m, bool should_increase_max) // bump the max? while (mon->is_leader() && - next_global_id >= max_global_id - g_conf->mon_globalid_prealloc / 2) { + (max_global_id < g_conf->mon_globalid_prealloc || + next_global_id >= max_global_id - g_conf->mon_globalid_prealloc / 2)) { increase_max_global_id(); } diff --git a/ceph/src/mon/Elector.cc b/ceph/src/mon/Elector.cc index 2ee10f7b..debe58c5 100644 --- a/ceph/src/mon/Elector.cc +++ b/ceph/src/mon/Elector.cc @@ -78,8 +78,15 @@ void Elector::start() init(); // start by trying to elect me - if (epoch % 2 == 0) + if (epoch % 2 == 0) { bump_epoch(epoch+1); // odd == election cycle + } else { + // do a trivial db write just to ensure it is writeable. + MonitorDBStore::Transaction t; + t.put(Monitor::MONITOR_NAME, "election_writeable_test", rand()); + int r = mon->store->apply_transaction(t); + assert(r >= 0); + } start_stamp = ceph_clock_now(g_ceph_context); electing_me = true; acked_me[mon->rank] = CEPH_FEATURES_ALL; diff --git a/ceph/src/mon/MDSMonitor.cc b/ceph/src/mon/MDSMonitor.cc index 12755b7c..b05b8e8e 100644 --- a/ceph/src/mon/MDSMonitor.cc +++ b/ceph/src/mon/MDSMonitor.cc @@ -208,17 +208,16 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) // check privileges, ignore if fails MonSession *session = m->get_session(); - if (!session) - goto out; + assert(session); if (!session->is_capable("mds", MON_CAP_X)) { dout(0) << "preprocess_beacon got MMDSBeacon from entity with insufficient privileges " << session->caps << dendl; - goto out; + goto ignore; } if (m->get_fsid() != mon->monmap->fsid) { dout(0) << "preprocess_beacon on fsid " << m->get_fsid() << " != " << mon->monmap->fsid << dendl; - goto out; + goto ignore; } dout(12) << "preprocess_beacon " << *m @@ -229,13 +228,13 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) // make sure the address has a port if (m->get_orig_source_addr().get_port() == 0) { dout(1) << " ignoring boot message without a port" << dendl; - goto out; + goto ignore; } // check compat if (!m->get_compat().writeable(mdsmap.compat)) { dout(1) << " mds " << m->get_source_inst() << " can't write to mdsmap " << mdsmap.compat << dendl; - goto out; + goto ignore; } // fw to leader? @@ -244,7 +243,7 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) if (pending_mdsmap.test_flag(CEPH_MDSMAP_DOWN)) { dout(7) << " mdsmap DOWN flag set, ignoring mds " << m->get_source_inst() << " beacon" << dendl; - goto out; + goto ignore; } // booted, but not in map? @@ -252,7 +251,8 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) if (state != MDSMap::STATE_BOOT) { dout(7) << "mds_beacon " << *m << " is not in mdsmap" << dendl; mon->send_reply(m, new MMDSMap(mon->monmap->fsid, &mdsmap)); - goto out; + m->put(); + return true; } else { return false; // not booted yet. } @@ -262,13 +262,13 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) // old seq? if (info.state_seq > seq) { dout(7) << "mds_beacon " << *m << " has old seq, ignoring" << dendl; - goto out; + goto ignore; } if (mdsmap.get_epoch() != m->get_last_epoch_seen()) { dout(10) << "mds_beacon " << *m << " ignoring requested state, because mds hasn't seen latest map" << dendl; - goto ignore; + goto reply; } if (info.laggy()) { @@ -277,17 +277,17 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) } if (state == MDSMap::STATE_BOOT) { // ignore, already booted. - goto out; + goto ignore; } // is there a state change here? - if (info.state != state) { + if (info.state != state) { // legal state change? if ((info.state == MDSMap::STATE_STANDBY || info.state == MDSMap::STATE_STANDBY_REPLAY || info.state == MDSMap::STATE_ONESHOT_REPLAY) && state > 0) { dout(10) << "mds_beacon mds can't activate itself (" << ceph_mds_state_name(info.state) << " -> " << ceph_mds_state_name(state) << ")" << dendl; - goto ignore; + goto reply; } if (info.state == MDSMap::STATE_STANDBY && @@ -299,21 +299,24 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) dout(10) << "mds_beacon can't standby-replay mds." << m->get_standby_for_rank() << " at this time (cluster degraded, or mds not active)" << dendl; dout(10) << "pending_mdsmap.is_degraded()==" << pending_mdsmap.is_degraded() << " rank state: " << ceph_mds_state_name(pending_mdsmap.get_state(m->get_standby_for_rank())) << dendl; - goto ignore; + goto reply; } _note_beacon(m); return false; // need to update map } - ignore: + reply: // note time and reply _note_beacon(m); mon->send_reply(m, new MMDSBeacon(mon->monmap->fsid, m->get_global_id(), m->get_name(), mdsmap.get_epoch(), state, seq)); - - // done - out: + m->put(); + return true; + + ignore: + // I won't reply this beacon, drop it. + mon->no_reply(m); m->put(); return true; } @@ -525,8 +528,14 @@ void MDSMonitor::_updated(MMDSBeacon *m) if (m->get_state() == MDSMap::STATE_STOPPED) { // send the map manually (they're out of the map, so they won't get it automatic) mon->send_reply(m, new MMDSMap(mon->monmap->fsid, &mdsmap)); + } else { + mon->send_reply(m, new MMDSBeacon(mon->monmap->fsid, + m->get_global_id(), + m->get_name(), + mdsmap.get_epoch(), + m->get_state(), + m->get_seq())); } - m->put(); } diff --git a/ceph/src/mon/MDSMonitor.h b/ceph/src/mon/MDSMonitor.h index 901e93e3..230f0ac9 100644 --- a/ceph/src/mon/MDSMonitor.h +++ b/ceph/src/mon/MDSMonitor.h @@ -56,10 +56,12 @@ class MDSMonitor : public PaxosService { void finish(int r) { if (r >= 0) mm->_updated(m); // success - else if (r == -ECANCELED) + else if (r == -ECANCELED) { + mm->mon->no_reply(m); m->put(); - else + } else { mm->dispatch((PaxosServiceMessage*)m); // try again + } } }; diff --git a/ceph/src/mon/MonCap.cc b/ceph/src/mon/MonCap.cc index e8d3f7e8..78b21f47 100644 --- a/ceph/src/mon/MonCap.cc +++ b/ceph/src/mon/MonCap.cc @@ -114,7 +114,7 @@ BOOST_FUSION_ADAPT_STRUCT(StringConstraint, // -void MonCapGrant::expand_profile(entity_name_t name) const +void MonCapGrant::expand_profile(EntityName name) const { // only generate this list once if (!profile_grants.empty()) @@ -177,7 +177,7 @@ void MonCapGrant::expand_profile(entity_name_t name) const } mon_rwxa_t MonCapGrant::get_allowed(CephContext *cct, - entity_name_t name, + EntityName name, const std::string& s, const std::string& c, const map& c_args) const { @@ -243,7 +243,7 @@ void MonCap::set_allow_all() } bool MonCap::is_capable(CephContext *cct, - entity_name_t name, + EntityName name, const string& service, const string& command, const map& command_args, bool op_may_read, bool op_may_write, bool op_may_exec) const diff --git a/ceph/src/mon/MonCap.h b/ceph/src/mon/MonCap.h index 3e4eda8e..7dba641e 100644 --- a/ceph/src/mon/MonCap.h +++ b/ceph/src/mon/MonCap.h @@ -8,7 +8,7 @@ using std::ostream; #include "include/types.h" -#include "msg/msg_types.h" +#include "common/entity_name.h" class CephContext; @@ -76,7 +76,7 @@ struct MonCapGrant { // needed by expand_profile() (via is_match()) and cached here. mutable list profile_grants; - void expand_profile(entity_name_t name) const; + void expand_profile(EntityName name) const; MonCapGrant() : allow(0) {} MonCapGrant(mon_rwxa_t a) : allow(a) {} @@ -97,7 +97,7 @@ struct MonCapGrant { * @return bits we allow */ mon_rwxa_t get_allowed(CephContext *cct, - entity_name_t name, + EntityName name, const std::string& service, const std::string& command, const map& command_args) const; @@ -143,7 +143,7 @@ struct MonCap { * @return true if the operation is allowed, false otherwise */ bool is_capable(CephContext *cct, - entity_name_t name, + EntityName name, const string& service, const string& command, const map& command_args, bool op_may_read, bool op_may_write, bool op_may_exec) const; diff --git a/ceph/src/mon/MonClient.cc b/ceph/src/mon/MonClient.cc index 3a6dda46..0272dfdd 100644 --- a/ceph/src/mon/MonClient.cc +++ b/ceph/src/mon/MonClient.cc @@ -12,7 +12,7 @@ * */ -#include "msg/SimpleMessenger.h" +#include "msg/Messenger.h" #include "messages/MMonGetMap.h" #include "messages/MMonGetVersion.h" #include "messages/MMonGetVersionReply.h" @@ -114,11 +114,9 @@ int MonClient::get_monmap_privately() Mutex::Locker l(monc_lock); bool temp_msgr = false; - SimpleMessenger* smessenger = NULL; + Messenger* smessenger = NULL; if (!messenger) { - messenger = smessenger = new SimpleMessenger(cct, - entity_name_t::CLIENT(-1), - "temp_mon_client", getpid()); + messenger = smessenger = Messenger::create_client_messenger(cct, "temp_mon_client"); messenger->add_dispatcher_head(this); smessenger->start(); temp_msgr = true; @@ -213,9 +211,7 @@ int MonClient::ping_monitor(const string &mon_id, string *result_reply) MonClientPinger *pinger = new MonClientPinger(cct, result_reply); - Messenger *smsgr = new SimpleMessenger(cct, - entity_name_t::CLIENT(-1), - "temp_ping_client", getpid()); + Messenger *smsgr = Messenger::create_client_messenger(cct, "temp_ping_client"); smsgr->add_dispatcher_head(pinger); smsgr->start(); diff --git a/ceph/src/mon/MonCommands.h b/ceph/src/mon/MonCommands.h index 461b3f29..d0908cba 100644 --- a/ceph/src/mon/MonCommands.h +++ b/ceph/src/mon/MonCommands.h @@ -564,11 +564,11 @@ COMMAND("osd pool rename " \ "rename to ", "osd", "rw", "cli,rest") COMMAND("osd pool get " \ "name=pool,type=CephPoolname " \ - "name=var,type=CephChoices,strings=size|min_size|crash_replay_interval|pg_num|pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|auid|target_max_objects|target_max_bytes|cache_target_dirty_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|erasure_code_profile", \ + "name=var,type=CephChoices,strings=size|min_size|crash_replay_interval|pg_num|pgp_num|crush_ruleset|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|auid|target_max_objects|target_max_bytes|cache_target_dirty_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|erasure_code_profile|min_read_recency_for_promote", \ "get pool parameter ", "osd", "r", "cli,rest") COMMAND("osd pool set " \ "name=pool,type=CephPoolname " \ - "name=var,type=CephChoices,strings=size|min_size|crash_replay_interval|pg_num|pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|debug_fake_ec_pool|target_max_bytes|target_max_objects|cache_target_dirty_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|auid " \ + "name=var,type=CephChoices,strings=size|min_size|crash_replay_interval|pg_num|pgp_num|crush_ruleset|hashpspool|hit_set_type|hit_set_period|hit_set_count|hit_set_fpp|debug_fake_ec_pool|target_max_bytes|target_max_objects|cache_target_dirty_ratio|cache_target_full_ratio|cache_min_flush_age|cache_min_evict_age|auid|min_read_recency_for_promote " \ "name=val,type=CephString " \ "name=force,type=CephChoices,strings=--yes-i-really-mean-it,req=false", \ "set pool parameter to ", "osd", "rw", "cli,rest") diff --git a/ceph/src/mon/Monitor.cc b/ceph/src/mon/Monitor.cc index ad35e5ed..339fd3e6 100644 --- a/ceph/src/mon/Monitor.cc +++ b/ceph/src/mon/Monitor.cc @@ -642,7 +642,7 @@ void Monitor::refresh_from_paxos(bool *need_bootstrap) paxos_service[i]->refresh(need_bootstrap); } for (int i = 0; i < PAXOS_NUM; ++i) { - paxos_service[i]->post_paxos_update(); + paxos_service[i]->post_refresh(); } } @@ -1925,30 +1925,6 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) health_monitor->get_health(f, summary, (detailbl ? &detail : NULL)); - if (f) - f->open_array_section("summary"); - stringstream ss; - health_status_t overall = HEALTH_OK; - if (!summary.empty()) { - ss << ' '; - while (!summary.empty()) { - if (overall > summary.front().first) - overall = summary.front().first; - ss << summary.front().second; - if (f) { - f->open_object_section("item"); - f->dump_stream("severity") << summary.front().first; - f->dump_string("summary", summary.front().second); - f->close_section(); - } - summary.pop_front(); - if (!summary.empty()) - ss << "; "; - } - } - if (f) - f->close_section(); - if (f) { f->open_object_section("timechecks"); f->dump_int("epoch", get_epoch()); @@ -1957,6 +1933,8 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) << ((timecheck_round%2) ? "on-going" : "finished"); } + stringstream ss; + health_status_t overall = HEALTH_OK; if (!timecheck_skews.empty()) { list warns; if (f) @@ -2003,6 +1981,7 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) if (!warns.empty()) ss << ","; } + summary.push_back(make_pair(HEALTH_WARN, "Monitor clock skew detected ")); } if (f) f->close_section(); @@ -2010,6 +1989,28 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) if (f) f->close_section(); + if (f) + f->open_array_section("summary"); + if (!summary.empty()) { + ss << ' '; + while (!summary.empty()) { + if (overall > summary.front().first) + overall = summary.front().first; + ss << summary.front().second; + if (f) { + f->open_object_section("item"); + f->dump_stream("severity") << summary.front().first; + f->dump_string("summary", summary.front().second); + f->close_section(); + } + summary.pop_front(); + if (!summary.empty()) + ss << "; "; + } + } + if (f) + f->close_section(); + stringstream fss; fss << overall; status = fss.str() + ss.str(); @@ -2126,7 +2127,7 @@ bool Monitor::_allowed_command(MonSession *s, string &module, string &prefix, bool cmd_w = (this_cmd->req_perms.find('w') != string::npos); bool cmd_x = (this_cmd->req_perms.find('x') != string::npos); - bool capable = s->caps.is_capable(g_ceph_context, s->inst.name, + bool capable = s->caps.is_capable(g_ceph_context, s->entity_name, module, prefix, param_str_map, cmd_r, cmd_w, cmd_x); @@ -2577,7 +2578,8 @@ void Monitor::forward_request_leader(PaxosServiceMessage *req) routed_requests[rr->tid] = rr; session->routed_request_tids.insert(rr->tid); - dout(10) << "forward_request " << rr->tid << " request " << *req << dendl; + dout(10) << "forward_request " << rr->tid << " request " << *req + << " features " << rr->con_features << dendl; MForward *forward = new MForward(rr->tid, req, rr->con_features, @@ -2869,7 +2871,6 @@ bool Monitor::_ms_dispatch(Message *m) ConnectionRef connection = m->get_connection(); MonSession *s = NULL; MonCap caps; - EntityName entity_name; bool src_is_mon; // regardless of who we are or who the sender is, the message must @@ -2935,12 +2936,11 @@ bool Monitor::_ms_dispatch(Message *m) dout(20) << "ms_dispatch existing session " << s << " for " << s->inst << dendl; } - if (s) { - if (s->auth_handler) { - entity_name = s->auth_handler->get_entity_name(); - } - dout(20) << " caps " << s->caps.get_str() << dendl; + assert(s); + if (s->auth_handler) { + s->entity_name = s->auth_handler->get_entity_name(); } + dout(20) << " caps " << s->caps.get_str() << dendl; if (is_synchronizing() && !src_is_mon) { waitlist_or_zap_client(m); @@ -2948,11 +2948,7 @@ bool Monitor::_ms_dispatch(Message *m) } ret = dispatch(s, m, src_is_mon); - - if (s) { - s->put(); - } - + s->put(); return ret; } @@ -3177,7 +3173,7 @@ void Monitor::timecheck_start_round() dout(10) << __func__ << " there's a timecheck going on" << dendl; utime_t curr_time = ceph_clock_now(g_ceph_context); double max = g_conf->mon_timecheck_interval*3; - if (curr_time - timecheck_round_start > max) { + if (curr_time - timecheck_round_start < max) { dout(10) << __func__ << " keep current round going" << dendl; goto out; } else { diff --git a/ceph/src/mon/MonitorDBStore.h b/ceph/src/mon/MonitorDBStore.h index 1576db77..f16770c2 100644 --- a/ceph/src/mon/MonitorDBStore.h +++ b/ceph/src/mon/MonitorDBStore.h @@ -283,6 +283,8 @@ class MonitorDBStore db->compact_range_async(compact.front().first, compact.front().second.first, compact.front().second.second); compact.pop_front(); } + } else { + assert(0 == "failed to write to db"); } return r; } @@ -390,11 +392,15 @@ class MonitorDBStore virtual pair get_next_key() { assert(iter->valid()); - pair r = iter->raw_key(); - do { - iter->next(); - } while (iter->valid() && sync_prefixes.count(iter->raw_key().first) == 0); - return r; + + for (; iter->valid(); iter->next()) { + pair r = iter->raw_key(); + if (sync_prefixes.count(r.first) > 0) { + iter->next(); + return r; + } + } + return pair(); } virtual bool _is_valid() { @@ -506,7 +512,8 @@ class MonitorDBStore for (iter = prefixes.begin(); iter != prefixes.end(); ++iter) { dbt->rmkeys_by_prefix((*iter)); } - db->submit_transaction_sync(dbt); + int r = db->submit_transaction_sync(dbt); + assert(r >= 0); } void init_options() { diff --git a/ceph/src/mon/MonitorStore.cc b/ceph/src/mon/MonitorStore.cc index db21a945..afaddab3 100644 --- a/ceph/src/mon/MonitorStore.cc +++ b/ceph/src/mon/MonitorStore.cc @@ -437,7 +437,13 @@ void MonitorStore::put_bl_sn_map(const char *a, derr << "failed to open " << dir << ": " << cpp_strerror(err) << dendl; assert(0 == "failed to open temp file"); } - sync_filesystem(dirfd); + + err = sync_filesystem(dirfd); + if (err < 0) { + derr << "sync_filesystem error " << cpp_strerror(err) << dendl; + assert(0 == "failed to sync_filesystem"); + } + close_err = TEMP_FAILURE_RETRY(::close(dirfd)); assert (0 == close_err); @@ -481,7 +487,13 @@ void MonitorStore::sync() << ": " << cpp_strerror(err) << dendl; assert(0 == "failed to open dir for syncing"); } - sync_filesystem(dirfd); + + int ret = sync_filesystem(dirfd); + if (ret < 0) { + derr << __func__ << " sync_filesystem error " << cpp_strerror(ret) << dendl; + assert(0 == "failed to sync_filesystem"); + } + int close_err = TEMP_FAILURE_RETRY(::close(dirfd)); assert (0 == close_err); } diff --git a/ceph/src/mon/OSDMonitor.cc b/ceph/src/mon/OSDMonitor.cc index da06b86b..599de08e 100644 --- a/ceph/src/mon/OSDMonitor.cc +++ b/ceph/src/mon/OSDMonitor.cc @@ -66,6 +66,12 @@ static ostream& _prefix(std::ostream *_dout, Monitor *mon, OSDMap& osdmap) { << ").osd e" << osdmap.get_epoch() << " "; } +OSDMonitor::OSDMonitor(Monitor *mn, Paxos *p, string service_name) + : PaxosService(mn, p, service_name), + inc_osd_cache(g_conf->mon_osd_cache_size), + full_osd_cache(g_conf->mon_osd_cache_size), + thrash_map(0), thrash_last_up_osd(-1) { } + bool OSDMonitor::_have_pending_crush() { return pending_inc.crush.length(); @@ -829,8 +835,9 @@ bool OSDMonitor::preprocess_failure(MOSDFailure *m) } // already reported? - if (osdmap.is_down(badboy)) { - dout(5) << "preprocess_failure dup: " << m->get_target() << ", from " << m->get_orig_source_inst() << dendl; + if (osdmap.is_down(badboy) || + osdmap.get_up_from(badboy) > m->get_epoch()) { + dout(5) << "preprocess_failure dup/old: " << m->get_target() << ", from " << m->get_orig_source_inst() << dendl; if (m->get_epoch() < osdmap.get_epoch()) send_incremental(m, m->get_epoch()+1); goto didit; @@ -1348,8 +1355,13 @@ bool OSDMonitor::prepare_boot(MOSDBoot *m) xi.laggy_probability * (1.0 - g_conf->mon_osd_laggy_weight); dout(10) << " laggy, now xi " << xi << dendl; } + // set features shared by the osd - xi.features = m->get_connection()->get_features(); + if (m->osd_features) + xi.features = m->osd_features; + else + xi.features = m->get_connection()->get_features(); + pending_inc.new_xinfo[from] = xi; // wait @@ -1688,10 +1700,13 @@ void OSDMonitor::send_incremental(PaxosServiceMessage *req, epoch_t first) osd = req->get_source().num(); map::iterator p = osd_epoch.find(osd); if (p != osd_epoch.end()) { - dout(10) << " osd." << osd << " should have epoch " << p->second << dendl; - first = p->second + 1; - if (first > osdmap.get_epoch()) - return; + if (first <= p->second) { + dout(10) << __func__ << " osd." << osd << " should already have epoch " + << p->second << dendl; + first = p->second + 1; + if (first > osdmap.get_epoch()) + return; + } } } @@ -1761,6 +1776,29 @@ void OSDMonitor::send_incremental(epoch_t first, entity_inst_t& dest, bool oneti } } +int OSDMonitor::get_version(version_t ver, bufferlist& bl) +{ + if (inc_osd_cache.lookup(ver, &bl)) { + return 0; + } + int ret = PaxosService::get_version(ver, bl); + if (!ret) { + inc_osd_cache.add(ver, bl); + } + return ret; +} + +int OSDMonitor::get_version_full(version_t ver, bufferlist& bl) +{ + if (full_osd_cache.lookup(ver, &bl)) { + return 0; + } + int ret = PaxosService::get_version_full(ver, bl); + if (!ret) { + full_osd_cache.add(ver, bl); + } + return ret; +} @@ -2297,6 +2335,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m) string format; cmd_getval(g_ceph_context, cmdmap, "format", format, string("json-pretty")); boost::scoped_ptr f(new_formatter(format)); + if (!f) + f.reset(new_formatter("json-pretty")); f->open_object_section("osd_location"); f->dump_int("osd", osd); @@ -2324,6 +2364,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m) string format; cmd_getval(g_ceph_context, cmdmap, "format", format, string("json-pretty")); boost::scoped_ptr f(new_formatter(format)); + if (!f) + f.reset(new_formatter("json-pretty")); f->open_object_section("osd_metadata"); r = dump_osd_metadata(osd, f.get(), &ss); if (r < 0) @@ -2468,8 +2510,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m) } else if (prefix == "osd crush get-tunable") { string tunable; cmd_getval(g_ceph_context, cmdmap, "tunable", tunable); - int value; - cmd_getval(g_ceph_context, cmdmap, "value", value); ostringstream rss; if (f) f->open_object_section("tunable"); @@ -2579,6 +2619,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m) f->dump_unsigned("cache_min_evict_age", p->cache_min_evict_age); } else if (var == "erasure_code_profile") { f->dump_string("erasure_code_profile", p->erasure_code_profile); + } else if (var == "min_read_recency_for_promote") { + f->dump_int("min_read_recency_for_promote", p->min_read_recency_for_promote); } f->close_section(); @@ -2628,6 +2670,8 @@ bool OSDMonitor::preprocess_command(MMonCommand *m) ss << "cache_min_evict_age: " << p->cache_min_evict_age; } else if (var == "erasure_code_profile") { ss << "erasure_code_profile: " << p->erasure_code_profile; + } else if (var == "min_read_recency_for_promote") { + ss << "min_read_recency_for_promote: " << p->min_read_recency_for_promote; } rdata.append(ss); @@ -3031,7 +3075,7 @@ void OSDMonitor::get_pools_health( } else if (warn_threshold > 0 && sum.num_bytes >= pool.quota_max_bytes*warn_threshold) { ss << "pool '" << pool_name - << "' has " << si_t(sum.num_bytes) << " objects" + << "' has " << si_t(sum.num_bytes) << " bytes" << " (max " << si_t(pool.quota_max_bytes) << ")"; status = HEALTH_WARN; } @@ -3744,6 +3788,12 @@ int OSDMonitor::prepare_command_pool_set(map &cmdmap, return -EINVAL; } p.cache_min_evict_age = n; + } else if (var == "min_read_recency_for_promote") { + if (interr.length()) { + ss << "error parsing integer value '" << val << "': " << interr; + return -EINVAL; + } + p.min_read_recency_for_promote = n; } else { ss << "unrecognized variable '" << var << "'"; return -EINVAL; @@ -4826,7 +4876,7 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m, } if (osdmap.exists(id)) { pending_inc.new_weight[id] = ww; - ss << "reweighted osd." << id << " to " << w << " (" << ios::hex << ww << ios::dec << ")"; + ss << "reweighted osd." << id << " to " << w << " (" << std::hex << ww << std::dec << ")"; getline(ss, rs); wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_last_committed() + 1)); @@ -5302,6 +5352,17 @@ done: err = -ENOTEMPTY; goto reply; } + if (tp->ec_pool()) { + ss << "tier pool '" << tierpoolstr + << "' is an ec pool, which cannot be a tier"; + err = -ENOTSUP; + goto reply; + } + if (!tp->removed_snaps.empty() || !tp->snaps.empty()) { + ss << "tier pool '" << tierpoolstr << "' has snapshot state; it cannot be added as a tier without breaking the pool"; + err = -ENOTEMPTY; + goto reply; + } // go pg_pool_t *np = pending_inc.get_new_pool(pool_id, p); pg_pool_t *ntp = pending_inc.get_new_pool(tierpool_id, tp); @@ -5629,6 +5690,7 @@ done: ntp->cache_mode = mode; ntp->hit_set_count = g_conf->osd_tier_default_cache_hit_set_count; ntp->hit_set_period = g_conf->osd_tier_default_cache_hit_set_period; + ntp->min_read_recency_for_promote = g_conf->osd_tier_default_cache_min_read_recency_for_promote; ntp->hit_set_params = hsp; ntp->target_max_bytes = size; ss << "pool '" << tierpoolstr << "' is now (or already was) a cache tier of '" << poolstr << "'"; @@ -5982,6 +6044,12 @@ int OSDMonitor::_check_remove_pool(int64_t pool, const pg_pool_t *p, } return -EBUSY; } + + if (!g_conf->mon_allow_pool_delete) { + *ss << "pool deletion is disabled; you must first set the mon_allow_pool_delete config option to true before you can destroy a pool"; + return -EPERM; + } + *ss << "pool '" << poolstr << "' removed"; return 0; } diff --git a/ceph/src/mon/OSDMonitor.h b/ceph/src/mon/OSDMonitor.h index fbce5fec..6428820d 100644 --- a/ceph/src/mon/OSDMonitor.h +++ b/ceph/src/mon/OSDMonitor.h @@ -26,6 +26,7 @@ using namespace std; #include "include/types.h" +#include "common/simple_cache.hpp" #include "msg/Messenger.h" #include "osd/OSDMap.h" @@ -139,6 +140,8 @@ private: * optimization to try to avoid sending the same inc maps twice. */ map osd_epoch; + SimpleLRU inc_osd_cache; + SimpleLRU full_osd_cache; void check_failures(utime_t now); bool check_failure(utime_t now, int target_osd, failure_info_t& fi); @@ -358,9 +361,7 @@ private: bool prepare_remove_snaps(struct MRemoveSnaps *m); public: - OSDMonitor(Monitor *mn, Paxos *p, string service_name) - : PaxosService(mn, p, service_name), - thrash_map(0), thrash_last_up_osd(-1) { } + OSDMonitor(Monitor *mn, Paxos *p, string service_name); void tick(); // check state, take actions @@ -384,6 +385,9 @@ private: send_incremental(m, start); } + int get_version(version_t ver, bufferlist& bl); + int get_version_full(version_t ver, bufferlist& bl); + epoch_t blacklist(const entity_addr_t& a, utime_t until); void dump_info(Formatter *f); diff --git a/ceph/src/mon/PGMonitor.cc b/ceph/src/mon/PGMonitor.cc index 364ad20c..c85d55b8 100644 --- a/ceph/src/mon/PGMonitor.cc +++ b/ceph/src/mon/PGMonitor.cc @@ -1000,8 +1000,8 @@ bool PGMonitor::register_new_pgs() ++p) { int64_t poolid = p->first; pg_pool_t &pool = p->second; - int ruleno = pool.get_crush_ruleset(); - if (!osdmap->crush->rule_exists(ruleno)) + int ruleno = osdmap->crush->find_rule(pool.get_crush_ruleset(), pool.get_type(), pool.get_size()); + if (ruleno < 0 || !osdmap->crush->rule_exists(ruleno)) continue; if (pool.get_last_change() <= pg_map.last_pg_scan || @@ -1234,7 +1234,10 @@ void PGMonitor::dump_object_stat_sum(TextTable &tbl, Formatter *f, } else { tbl << stringify(si_t(sum.num_bytes)); int64_t kb_used = SHIFT_ROUND_UP(sum.num_bytes, 10); - tbl << percentify(((float)kb_used / pg_map.osd_sum.kb)*100); + float used = 0.0; + if (pg_map.osd_sum.kb > 0) + used = (float)kb_used / pg_map.osd_sum.kb; + tbl << percentify(used*100); tbl << si_t(avail); tbl << sum.num_objects; if (verbose) { @@ -1255,6 +1258,11 @@ int64_t PGMonitor::get_rule_avail(OSDMap& osdmap, int ruleno) return 0; int64_t min = -1; for (map::iterator p = wm.begin(); p != wm.end(); ++p) { + if (pg_map.osd_stat[p->first].kb == 0) { + // osd must be out, hence its stats have been zeroed + // (unless we somehow managed to have a disk with size 0...) + continue; + } int64_t proj = (float)(pg_map.osd_stat[p->first].kb_avail * 1024ull) / (double)p->second; if (min < 0 || proj < min) @@ -1299,9 +1307,11 @@ void PGMonitor::dump_pool_stats(stringstream &ss, Formatter *f, bool verbose) int ruleno = osdmap.crush->find_rule(pool->get_crush_ruleset(), pool->get_type(), pool->get_size()); - uint64_t avail; + int64_t avail; if (avail_by_rule.count(ruleno) == 0) { avail = get_rule_avail(osdmap, ruleno); + if (avail < 0) + avail = 0; avail_by_rule[ruleno] = avail; } else { avail = avail_by_rule[ruleno]; @@ -1401,7 +1411,11 @@ void PGMonitor::dump_fs_stats(stringstream &ss, Formatter *f, bool verbose) tbl << stringify(si_t(pg_map.osd_sum.kb*1024)) << stringify(si_t(pg_map.osd_sum.kb_avail*1024)) << stringify(si_t(pg_map.osd_sum.kb_used*1024)); - tbl << percentify(((float)pg_map.osd_sum.kb_used / pg_map.osd_sum.kb)*100); + float used = 0.0; + if (pg_map.osd_sum.kb > 0) { + used = ((float)pg_map.osd_sum.kb_used / pg_map.osd_sum.kb); + } + tbl << percentify(used*100); if (verbose) { tbl << stringify(si_t(pg_map.pg_sum.stats.sum.num_objects)); } @@ -1977,7 +1991,7 @@ void PGMonitor::get_health(list >& summary, ((1000000 - p->second.cache_target_full_ratio_micro) * g_conf->mon_cache_target_full_warn_ratio); if (p->second.target_max_objects && (uint64_t)st.stats.sum.num_objects > - p->second.target_max_objects * ratio / 1000000) { + p->second.target_max_objects * (ratio / 1000000.0)) { nearfull = true; if (detail) { ostringstream ss; @@ -1989,7 +2003,7 @@ void PGMonitor::get_health(list >& summary, } } if (p->second.target_max_bytes && (uint64_t)st.stats.sum.num_bytes > - p->second.target_max_bytes * ratio / 1000000) { + p->second.target_max_bytes * (ratio / 1000000.0)) { nearfull = true; if (detail) { ostringstream ss; diff --git a/ceph/src/mon/PaxosService.cc b/ceph/src/mon/PaxosService.cc index 1b216898..7ba8e9ca 100644 --- a/ceph/src/mon/PaxosService.cc +++ b/ceph/src/mon/PaxosService.cc @@ -127,6 +127,16 @@ void PaxosService::refresh(bool *need_bootstrap) update_from_paxos(need_bootstrap); } +void PaxosService::post_refresh() +{ + dout(10) << __func__ << dendl; + + post_paxos_update(); + + if (mon->is_peon() && !waiting_for_finished_proposal.empty()) { + finish_contexts(g_ceph_context, waiting_for_finished_proposal, -EAGAIN); + } +} void PaxosService::remove_legacy_versions() { diff --git a/ceph/src/mon/PaxosService.h b/ceph/src/mon/PaxosService.h index 5321bebc..6affd5c7 100644 --- a/ceph/src/mon/PaxosService.h +++ b/ceph/src/mon/PaxosService.h @@ -322,6 +322,7 @@ public: bool dispatch(PaxosServiceMessage *m); void refresh(bool *need_bootstrap); + void post_refresh(); /** * @defgroup PaxosService_h_override_funcs Functions that should be @@ -857,7 +858,7 @@ public: * @param bl The bufferlist to be populated * @return 0 on success; <0 otherwise */ - int get_version(version_t ver, bufferlist& bl) { + virtual int get_version(version_t ver, bufferlist& bl) { return mon->store->get(get_service_name(), ver, bl); } /** @@ -867,7 +868,7 @@ public: * @param bl The bufferlist to be populated * @returns 0 on success; <0 otherwise */ - int get_version_full(version_t ver, bufferlist& bl) { + virtual int get_version_full(version_t ver, bufferlist& bl) { string key = mon->store->combine_strings(full_prefix_name, ver); return mon->store->get(get_service_name(), key, bl); } diff --git a/ceph/src/mon/Session.h b/ceph/src/mon/Session.h index a5f67d9e..cd31af4b 100644 --- a/ceph/src/mon/Session.h +++ b/ceph/src/mon/Session.h @@ -53,6 +53,7 @@ struct MonSession : public RefCountedObject { map sub_map; AuthServiceHandler *auth_handler; + EntityName entity_name; ConnectionRef proxy_con; uint64_t proxy_tid; @@ -75,7 +76,7 @@ struct MonSession : public RefCountedObject { bool is_capable(string service, int mask) { map args; return caps.is_capable(g_ceph_context, - inst.name, + entity_name, service, "", args, mask & MON_CAP_R, mask & MON_CAP_W, mask & MON_CAP_X); } diff --git a/ceph/src/mount/mtab.c b/ceph/src/mount/mtab.c index 9b2c9237..d17f7a55 100644 --- a/ceph/src/mount/mtab.c +++ b/ceph/src/mount/mtab.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,7 @@ setlkw_timeout (int sig) { #define _PATH_MOUNTED "/etc/mtab" #define _PATH_MOUNTED_LOCK "/etc/mtab~" +#define PROC_SUPER_MAGIC 0x9fa0 /* exit status - bits below are ORed */ #define EX_USAGE 1 /* incorrect invocation or permission */ @@ -245,11 +247,21 @@ lock_mtab (void) { static void update_mtab_entry(const char *spec, const char *node, const char *type, const char *opts, int flags, int freq, int pass) { - struct mntent mnt; + struct statfs buf; + int err = statfs(_PATH_MOUNTED, &buf); + if (err) { + printf("mount: can't statfs %s: %s", _PATH_MOUNTED, + strerror (err)); + return; + } + /* /etc/mtab is symbol link to /proc/self/mounts? */ + if (buf.f_type == PROC_SUPER_MAGIC) + return; if (!opts) opts = "rw"; + struct mntent mnt; mnt.mnt_fsname = strdup(spec); mnt.mnt_dir = canonicalize_path(node); mnt.mnt_type = strdup(type); diff --git a/ceph/src/msg/Messenger.cc b/ceph/src/msg/Messenger.cc index b80782de..5dc69a68 100644 --- a/ceph/src/msg/Messenger.cc +++ b/ceph/src/msg/Messenger.cc @@ -4,6 +4,13 @@ #include "SimpleMessenger.h" +Messenger *Messenger::create_client_messenger(CephContext *cct, string lname) +{ + uint64_t nonce = 0; + get_random_bytes((char*)&nonce, sizeof(nonce)); + return Messenger::create(cct, entity_name_t::CLIENT(), lname, nonce); +} + Messenger *Messenger::create(CephContext *cct, entity_name_t name, string lname, diff --git a/ceph/src/msg/Messenger.h b/ceph/src/msg/Messenger.h index 42feaf22..82ac8e64 100644 --- a/ceph/src/msg/Messenger.h +++ b/ceph/src/msg/Messenger.h @@ -147,6 +147,21 @@ public: string lname, uint64_t nonce); + /** + * create a new messenger + * + * Create a new messenger instance. + * Same as the above, but a slightly simpler interface for clients: + * - Generate a random nonce + * - use the default feature bits + * - get the messenger type from cct + * - use the client entity_type + * + * @param cct context + * @param lname logical name of the messenger in this process (e.g., "client") + */ + static Messenger *create_client_messenger(CephContext *cct, string lname); + /** * @defgroup Accessors * @{ diff --git a/ceph/src/msg/Pipe.cc b/ceph/src/msg/Pipe.cc index 54ce6799..665e72c4 100644 --- a/ceph/src/msg/Pipe.cc +++ b/ceph/src/msg/Pipe.cc @@ -549,7 +549,7 @@ int Pipe::accept() << " > " << existing->connect_seq << dendl; goto replace; } // existing - else if (policy.resetcheck && connect.connect_seq > 0) { + else if (connect.connect_seq > 0) { // we reset, and they are opening a new session ldout(msgr->cct,0) << "accept we reset (peer sent cseq " << connect.connect_seq << "), sending RESETSESSION" << dendl; msgr->lock.Unlock(); 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/DBObjectMap.cc b/ceph/src/os/DBObjectMap.cc index 5d2a2e61..0a258001 100644 --- a/ceph/src/os/DBObjectMap.cc +++ b/ceph/src/os/DBObjectMap.cc @@ -1042,6 +1042,8 @@ int DBObjectMap::upgrade() db->submit_transaction(t); } state.v = 1; + + Mutex::Locker l(header_lock); KeyValueDB::Transaction t = db->get_transaction(); write_state(t); db->submit_transaction_sync(t); @@ -1083,7 +1085,6 @@ int DBObjectMap::init(bool do_upgrade) int DBObjectMap::sync(const ghobject_t *oid, const SequencerPosition *spos) { KeyValueDB::Transaction t = db->get_transaction(); - write_state(t); if (oid) { assert(spos); Header header = lookup_map_header(*oid); @@ -1093,11 +1094,18 @@ int DBObjectMap::sync(const ghobject_t *oid, header->spos = *spos; set_map_header(*oid, *header, t); } + Mutex::Locker l(header_lock); + write_state(t); + return db->submit_transaction_sync(t); + } else { + Mutex::Locker l(header_lock); + write_state(t); + return db->submit_transaction_sync(t); } - return db->submit_transaction_sync(t); } int DBObjectMap::write_state(KeyValueDB::Transaction _t) { + assert(header_lock.is_locked_by_me()); dout(20) << "dbobjectmap: seq is " << state.seq << dendl; KeyValueDB::Transaction t = _t ? _t : db->get_transaction(); bufferlist bl; diff --git a/ceph/src/os/FileJournal.cc b/ceph/src/os/FileJournal.cc index f3f244a2..3d2fc8aa 100644 --- a/ceph/src/os/FileJournal.cc +++ b/ceph/src/os/FileJournal.cc @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -296,24 +297,28 @@ int FileJournal::_open_file(int64_t oldsize, blksize_t blksize, if (create && g_conf->journal_zero_on_create) { derr << "FileJournal::_open_file : zeroing journal" << dendl; uint64_t write_size = 1 << 20; - char *buf = new char[write_size]; + char *buf; + ret = ::posix_memalign((void **)&buf, block_size, write_size); + if (ret != 0) { + return ret; + } memset(static_cast(buf), 0, write_size); uint64_t i = 0; for (; (i + write_size) <= (unsigned)max_size; i += write_size) { ret = ::pwrite(fd, static_cast(buf), write_size, i); if (ret < 0) { - delete [] buf; + free(buf); return -errno; } } if (i < (unsigned)max_size) { ret = ::pwrite(fd, static_cast(buf), max_size - i, i); if (ret < 0) { - delete [] buf; + free(buf); return -errno; } } - delete [] buf; + free(buf); } @@ -1712,13 +1717,14 @@ bool FileJournal::read_entry( } FileJournal::read_entry_result FileJournal::do_read_entry( - off64_t pos, + off64_t init_pos, off64_t *next_pos, bufferlist *bl, uint64_t *seq, ostream *ss, entry_header_t *_h) { + off64_t cur_pos = init_pos; bufferlist _bl; if (!bl) bl = &_bl; @@ -1727,40 +1733,40 @@ FileJournal::read_entry_result FileJournal::do_read_entry( entry_header_t *h; bufferlist hbl; off64_t _next_pos; - wrap_read_bl(pos, sizeof(*h), &hbl, &_next_pos); + wrap_read_bl(cur_pos, sizeof(*h), &hbl, &_next_pos); h = (entry_header_t *)hbl.c_str(); - if (!h->check_magic(pos, header.get_fsid64())) { - dout(25) << "read_entry " << pos + if (!h->check_magic(cur_pos, header.get_fsid64())) { + dout(25) << "read_entry " << init_pos << " : bad header magic, end of journal" << dendl; if (ss) *ss << "bad header magic"; if (next_pos) - *next_pos = pos + (4<<10); // check 4k ahead + *next_pos = init_pos + (4<<10); // check 4k ahead return MAYBE_CORRUPT; } - pos = _next_pos; + cur_pos = _next_pos; // pad + body + pad if (h->pre_pad) - pos += h->pre_pad; + cur_pos += h->pre_pad; bl->clear(); - wrap_read_bl(pos, h->len, bl, &pos); + wrap_read_bl(cur_pos, h->len, bl, &cur_pos); if (h->post_pad) - pos += h->post_pad; + cur_pos += h->post_pad; // footer entry_header_t *f; bufferlist fbl; - wrap_read_bl(pos, sizeof(*f), &fbl, &pos); + wrap_read_bl(cur_pos, sizeof(*f), &fbl, &cur_pos); f = (entry_header_t *)fbl.c_str(); if (memcmp(f, h, sizeof(*f))) { if (ss) *ss << "bad footer magic, partial entry"; if (next_pos) - *next_pos = pos; + *next_pos = cur_pos; return MAYBE_CORRUPT; } @@ -1772,13 +1778,13 @@ FileJournal::read_entry_result FileJournal::do_read_entry( *ss << "header crc (" << h->crc32c << ") doesn't match body crc (" << actual_crc << ")"; if (next_pos) - *next_pos = pos; + *next_pos = cur_pos; return MAYBE_CORRUPT; } } // yay! - dout(2) << "read_entry " << pos << " : seq " << h->seq + dout(2) << "read_entry " << init_pos << " : seq " << h->seq << " " << h->len << " bytes" << dendl; @@ -1790,15 +1796,15 @@ FileJournal::read_entry_result FileJournal::do_read_entry( // bind by reference to (packed) h->seq journalq.push_back( pair(static_cast(h->seq), - static_cast(pos))); + static_cast(init_pos))); if (next_pos) - *next_pos = pos; + *next_pos = cur_pos; if (_h) *_h = *h; - assert(pos % header.alignment == 0); + assert(cur_pos % header.alignment == 0); return SUCCESS; } diff --git a/ceph/src/os/FileStore.cc b/ceph/src/os/FileStore.cc index 1b3dd5ec..a2528a5f 100644 --- a/ceph/src/os/FileStore.cc +++ b/ceph/src/os/FileStore.cc @@ -419,10 +419,11 @@ int FileStore::lfn_unlink(coll_t cid, const ghobject_t& o, return index->unlink(o); } -FileStore::FileStore(const std::string &base, const std::string &jdev, const char *name, bool do_update) : +FileStore::FileStore(const std::string &base, const std::string &jdev, osflagbits_t flags, const char *name, bool do_update) : JournalingObjectStore(base), internal_name(name), basedir(base), journalpath(jdev), + generic_flags(flags), blk_size(0), fsid_fd(-1), op_fd(-1), basedir_fd(-1), current_fd(-1), @@ -1122,7 +1123,7 @@ int FileStore::write_op_seq(int fd, uint64_t seq) return ret; } -int FileStore::mount() +int FileStore::mount() { int ret; char buf[PATH_MAX]; @@ -1350,7 +1351,7 @@ int FileStore::mount() ::unlink(nosnapfn); } - { + if (!(generic_flags & SKIP_MOUNT_OMAP)) { LevelDBStore *omap_store = new LevelDBStore(g_ceph_context, omap_dir); omap_store->init(); @@ -1462,24 +1463,26 @@ int FileStore::mount() wbthrottle.start(); sync_thread.create(); - ret = journal_replay(initial_op_seq); - if (ret < 0) { - derr << "mount failed to open journal " << journalpath << ": " << cpp_strerror(ret) << dendl; - if (ret == -ENOTTY) { - derr << "maybe journal is not pointing to a block device and its size " - << "wasn't configured?" << dendl; - } + if (!(generic_flags & SKIP_JOURNAL_REPLAY)) { + ret = journal_replay(initial_op_seq); + if (ret < 0) { + derr << "mount failed to open journal " << journalpath << ": " << cpp_strerror(ret) << dendl; + if (ret == -ENOTTY) { + derr << "maybe journal is not pointing to a block device and its size " + << "wasn't configured?" << dendl; + } - // stop sync thread - lock.Lock(); - stop = true; - sync_cond.Signal(); - lock.Unlock(); - sync_thread.join(); + // stop sync thread + lock.Lock(); + stop = true; + sync_cond.Signal(); + lock.Unlock(); + sync_thread.join(); - wbthrottle.stop(); + wbthrottle.stop(); - goto close_current_fd; + goto close_current_fd; + } } { @@ -1532,6 +1535,8 @@ int FileStore::umount() op_tp.stop(); journal_stop(); + if (!(generic_flags & SKIP_JOURNAL_REPLAY)) + journal_write_close(); op_finisher.stop(); ondisk_finisher.stop(); @@ -1896,7 +1901,11 @@ void FileStore::_set_global_replay_guard(coll_t cid, return; // sync all previous operations on this sequencer - sync_filesystem(basedir_fd); + int ret = sync_filesystem(basedir_fd); + if (ret < 0) { + derr << __func__ << " :sync_filesytem error " << cpp_strerror(ret) << dendl; + assert(0 == "_set_global_replay_guard failed"); + } char fn[PATH_MAX]; get_cdir(cid, fn, sizeof(fn)); diff --git a/ceph/src/os/FileStore.h b/ceph/src/os/FileStore.h index 3fcd89a2..b351efa2 100644 --- a/ceph/src/os/FileStore.h +++ b/ceph/src/os/FileStore.h @@ -126,6 +126,7 @@ public: private: string internal_name; ///< internal name, used to name the perfcounter instance string basedir, journalpath; + osflagbits_t generic_flags; std::string current_fn; std::string current_op_seq_fn; std::string omap_dir; @@ -405,7 +406,9 @@ public: bool force_clear_omap=false); public: - FileStore(const std::string &base, const std::string &jdev, const char *internal_name = "filestore", bool update_to=false); + FileStore(const std::string &base, const std::string &jdev, + osflagbits_t flags = 0, + const char *internal_name = "filestore", bool update_to=false); ~FileStore(); int _detect_fs(); diff --git a/ceph/src/os/JournalingObjectStore.cc b/ceph/src/os/JournalingObjectStore.cc index 7616fe23..9a55dc00 100644 --- a/ceph/src/os/JournalingObjectStore.cc +++ b/ceph/src/os/JournalingObjectStore.cc @@ -21,6 +21,11 @@ void JournalingObjectStore::journal_stop() { dout(10) << "journal_stop" << dendl; finisher.stop(); +} + +// A journal_replay() makes journal writeable, this closes that out. +void JournalingObjectStore::journal_write_close() +{ if (journal) { journal->close(); delete journal; diff --git a/ceph/src/os/JournalingObjectStore.h b/ceph/src/os/JournalingObjectStore.h index fb7f0eca..6a09c613 100644 --- a/ceph/src/os/JournalingObjectStore.h +++ b/ceph/src/os/JournalingObjectStore.h @@ -111,6 +111,7 @@ protected: protected: void journal_start(); void journal_stop(); + void journal_write_close(); int journal_replay(uint64_t fs_op_seq); void _op_journal_transactions(list& tls, uint64_t op, diff --git a/ceph/src/os/ObjectStore.cc b/ceph/src/os/ObjectStore.cc index afa90b16..2e26e39e 100644 --- a/ceph/src/os/ObjectStore.cc +++ b/ceph/src/os/ObjectStore.cc @@ -24,10 +24,11 @@ ObjectStore *ObjectStore::create(CephContext *cct, const string& type, const string& data, - const string& journal) + const string& journal, + osflagbits_t flags) { if (type == "filestore") { - return new FileStore(data, journal); + return new FileStore(data, journal, flags); } if (type == "memstore") { return new MemStore(cct, data); diff --git a/ceph/src/os/ObjectStore.h b/ceph/src/os/ObjectStore.h index a5f5fcb0..f0990964 100644 --- a/ceph/src/os/ObjectStore.h +++ b/ceph/src/os/ObjectStore.h @@ -80,6 +80,11 @@ static inline void encode(const map *attrset, bufferlist &bl) ::encode(*attrset, bl); } +// Flag bits +typedef uint32_t osflagbits_t; +const int SKIP_JOURNAL_REPLAY = 1 << 0; +const int SKIP_MOUNT_OMAP = 1 << 1; + class ObjectStore { protected: string path; @@ -93,11 +98,13 @@ public: * @param type type of store. This is a string from the configuration file. * @param data path (or other descriptor) for data * @param journal path (or other descriptor) for journal (optional) + * @param flags which filestores should check if applicable */ static ObjectStore *create(CephContext *cct, const string& type, const string& data, - const string& journal); + const string& journal, + osflagbits_t flag = 0); Logger *logger; @@ -511,7 +518,7 @@ public: int get_data_alignment() { if (!largest_data_len) return -1; - return (largest_data_off - get_data_offset()) & ~CEPH_PAGE_MASK; + return (0 - get_data_offset()) & ~CEPH_PAGE_MASK; } /// Is the Transaction empty (no operations) bool empty() { diff --git a/ceph/src/os/WBThrottle.cc b/ceph/src/os/WBThrottle.cc index 0354ceb8..62b2ddc7 100644 --- a/ceph/src/os/WBThrottle.cc +++ b/ceph/src/os/WBThrottle.cc @@ -246,6 +246,7 @@ void WBThrottle::clear_object(const ghobject_t &hoid) pending_wbs.erase(i); remove_object(hoid); + cond.Signal(); } void WBThrottle::throttle() diff --git a/ceph/src/os/chain_xattr.cc b/ceph/src/os/chain_xattr.cc index c020c9db..e90462af 100644 --- a/ceph/src/os/chain_xattr.cc +++ b/ceph/src/os/chain_xattr.cc @@ -138,6 +138,10 @@ int chain_getxattr(const char *fn, const char *name, void *val, size_t size) size -= chunk_size; r = sys_getxattr(fn, raw_name, (char *)val + pos, chunk_size); + if (i && r == -ENODATA) { + ret = pos; + break; + } if (r < 0) { ret = r; break; @@ -201,6 +205,10 @@ int chain_fgetxattr(int fd, const char *name, void *val, size_t size) size -= chunk_size; r = sys_fgetxattr(fd, raw_name, (char *)val + pos, chunk_size); + if (i && r == -ENODATA) { + ret = pos; + break; + } if (r < 0) { ret = r; break; diff --git a/ceph/src/osd/ECBackend.cc b/ceph/src/osd/ECBackend.cc index 39e3429e..5235d4d6 100644 --- a/ceph/src/osd/ECBackend.cc +++ b/ceph/src/osd/ECBackend.cc @@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs) lhs << "read_result_t(r=" << rhs.r << ", errors=" << rhs.errors; if (rhs.attrs) { - lhs << ", attrs=" << rhs.attrs; + lhs << ", attrs=" << rhs.attrs.get(); } else { lhs << ", noattrs"; } diff --git a/ceph/src/osd/OSD.cc b/ceph/src/osd/OSD.cc index 77ed17ae..0befa921 100644 --- a/ceph/src/osd/OSD.cc +++ b/ceph/src/osd/OSD.cc @@ -940,8 +940,16 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_, finished_lock("OSD::finished_lock"), op_tracker(cct, cct->_conf->osd_enable_op_tracker), test_ops_hook(NULL), - op_wq(this, cct->_conf->osd_op_thread_timeout, &op_tp), - peering_wq(this, cct->_conf->osd_op_thread_timeout, &op_tp), + op_wq( + this, + cct->_conf->osd_op_thread_timeout, + cct->_conf->osd_op_thread_suicide_timeout, + &op_tp), + peering_wq( + this, + cct->_conf->osd_op_thread_timeout, + cct->_conf->osd_op_thread_suicide_timeout, + &op_tp), map_lock("OSD::map_lock"), peer_map_epoch_lock("OSD::peer_map_epoch_lock"), debug_drop_pg_create_probability(cct->_conf->osd_debug_drop_pg_create_probability), @@ -953,15 +961,42 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_, pg_stat_queue_lock("OSD::pg_stat_queue_lock"), osd_stat_updated(false), pg_stat_tid(0), pg_stat_tid_flushed(0), - command_wq(this, cct->_conf->osd_command_thread_timeout, &command_tp), + command_wq( + this, + cct->_conf->osd_command_thread_timeout, + cct->_conf->osd_command_thread_suicide_timeout, + &command_tp), recovery_ops_active(0), - recovery_wq(this, cct->_conf->osd_recovery_thread_timeout, &recovery_tp), + recovery_wq( + this, + cct->_conf->osd_recovery_thread_timeout, + cct->_conf->osd_recovery_thread_suicide_timeout, + &recovery_tp), replay_queue_lock("OSD::replay_queue_lock"), - snap_trim_wq(this, cct->_conf->osd_snap_trim_thread_timeout, &disk_tp), - scrub_wq(this, cct->_conf->osd_scrub_thread_timeout, &disk_tp), - scrub_finalize_wq(cct->_conf->osd_scrub_finalize_thread_timeout, &op_tp), - rep_scrub_wq(this, cct->_conf->osd_scrub_thread_timeout, &disk_tp), - remove_wq(store, cct->_conf->osd_remove_thread_timeout, &disk_tp), + snap_trim_wq( + this, + cct->_conf->osd_snap_trim_thread_timeout, + cct->_conf->osd_snap_trim_thread_suicide_timeout, + &disk_tp), + scrub_wq( + this, + cct->_conf->osd_scrub_thread_timeout, + cct->_conf->osd_scrub_thread_suicide_timeout, + &disk_tp), + scrub_finalize_wq( + cct->_conf->osd_scrub_finalize_thread_timeout, + cct->_conf->osd_scrub_finalize_thread_suicide_timeout, + &op_tp), + rep_scrub_wq( + this, + cct->_conf->osd_scrub_thread_timeout, + cct->_conf->osd_scrub_thread_suicide_timeout, + &disk_tp), + remove_wq( + store, + cct->_conf->osd_remove_thread_timeout, + cct->_conf->osd_remove_thread_suicide_timeout, + &disk_tp), next_removal_seq(0), service(this) { @@ -2104,12 +2139,6 @@ void OSD::load_pgs() continue; } - if (!osdmap->have_pg_pool(pgid.pool())) { - dout(10) << __func__ << ": skipping PG " << pgid << " because we don't have pool " - << pgid.pool() << dendl; - continue; - } - if (pgid.preferred() >= 0) { dout(10) << __func__ << ": skipping localized PG " << pgid << dendl; // FIXME: delete it too, eventually @@ -2120,7 +2149,29 @@ void OSD::load_pgs() bufferlist bl; epoch_t map_epoch = PG::peek_map_epoch(store, coll_t(pgid), service.infos_oid, &bl); - PG *pg = _open_lock_pg(map_epoch == 0 ? osdmap : service.get_map(map_epoch), pgid); + PG *pg = NULL; + if (map_epoch > 0) { + OSDMapRef pgosdmap = service.try_get_map(map_epoch); + if (!pgosdmap) { + if (!osdmap->have_pg_pool(pgid.pool())) { + derr << __func__ << ": could not find map for epoch " << map_epoch + << " on pg " << pgid << ", but the pool is not present in the " + << "current map, so this is probably a result of bug 10617. " + << "Skipping the pg for now, you can use ceph_objectstore_tool " + << "to clean it up later." << dendl; + continue; + } else { + derr << __func__ << ": have pgid " << pgid << " at epoch " + << map_epoch << ", but missing map. Crashing." + << dendl; + assert(0 == "Missing map in load_pgs"); + } + } + pg = _open_lock_pg(pgosdmap, pgid); + } else { + pg = _open_lock_pg(osdmap, pgid); + } + // there can be no waiters here, so we don't call wake_pg_waiters // read pg state, log pg->read_state(store, bl); @@ -2208,7 +2259,7 @@ void OSD::build_past_intervals_parallel() { map pis; - // calculate untion of map range + // calculate junction of map range epoch_t end_epoch = superblock.oldest_map; epoch_t cur_epoch = superblock.newest_map; for (ceph::unordered_map::iterator i = pg_map.begin(); @@ -2217,7 +2268,7 @@ void OSD::build_past_intervals_parallel() PG *pg = i->second; epoch_t start, end; - if (!pg->_calc_past_interval_range(&start, &end)) + if (!pg->_calc_past_interval_range(&start, &end, superblock.oldest_map)) continue; dout(10) << pg->info.pgid << " needs " << start << "-" << end << dendl; @@ -2255,8 +2306,11 @@ void OSD::build_past_intervals_parallel() vector acting, up; int up_primary; int primary; + pg_t pgid = pg->info.pgid.pgid; + if (p.same_interval_since && last_map->get_pools().count(pgid.pool())) + pgid = pgid.get_ancestor(last_map->get_pg_num(pgid.pool())); cur_map->pg_to_up_acting_osds( - pg->info.pgid.pgid, &up, &up_primary, &acting, &primary); + pgid, &up, &up_primary, &acting, &primary); if (p.same_interval_since == 0) { dout(10) << __func__ << " epoch " << cur_epoch << " pg " << pg->info.pgid @@ -2283,7 +2337,7 @@ void OSD::build_past_intervals_parallel() pg->info.history.last_epoch_clean, cur_map, last_map, pg->info.pgid.pool(), - pg->info.pgid.pgid, + pgid, &pg->past_intervals, &debug); if (new_interval) { @@ -3752,7 +3806,9 @@ void OSD::_send_boot() dout(10) << " assuming hb_front_addr ip matches client_addr" << dendl; } - MOSDBoot *mboot = new MOSDBoot(superblock, boot_epoch, hb_back_addr, hb_front_addr, cluster_addr); + MOSDBoot *mboot = new MOSDBoot(superblock, boot_epoch, + hb_back_addr, hb_front_addr, cluster_addr, + CEPH_FEATURES_ALL); dout(10) << " client_addr " << client_messenger->get_myaddr() << ", cluster_addr " << cluster_addr << ", hb_back_addr " << hb_back_addr @@ -3930,8 +3986,8 @@ void OSDService::send_message_osd_cluster(int peer, Message *m, epoch_t from_epo return; } const entity_inst_t& peer_inst = next_osdmap->get_cluster_inst(peer); - Connection *peer_con = osd->cluster_messenger->get_connection(peer_inst).get(); - osd->_share_map_outgoing(peer, peer_con, next_osdmap); + ConnectionRef peer_con = osd->cluster_messenger->get_connection(peer_inst); + osd->_share_map_outgoing(peer, peer_con.get(), next_osdmap); osd->cluster_messenger->send_message(m, peer_inst); } @@ -5055,11 +5111,11 @@ void OSD::_dispatch(Message *m) case MSG_OSD_SCRUB: handle_scrub(static_cast(m)); - break; + break; case MSG_OSD_REP_SCRUB: handle_rep_scrub(static_cast(m)); - break; + break; // -- need OSDMap -- @@ -5085,7 +5141,21 @@ void OSD::_dispatch(Message *m) void OSD::handle_rep_scrub(MOSDRepScrub *m) { - dout(10) << "queueing MOSDRepScrub " << *m << dendl; + dout(10) << __func__ << " " << *m << dendl; + if (!require_self_aliveness(m, m->map_epoch)) { + m->put(); + return; + } + if (!require_osd_peer(m)) { + m->put(); + return; + } + if (osdmap->get_epoch() >= m->map_epoch && + !require_same_peer_instance(m, osdmap)) { + m->put(); + return; + } + rep_scrub_wq.queue(m); } @@ -6175,17 +6245,18 @@ bool OSD::require_mon_peer(Message *m) return true; } -bool OSD::require_osd_peer(OpRequestRef& op) +bool OSD::require_osd_peer(Message *m) { - if (!op->get_req()->get_connection()->peer_is_osd()) { - dout(0) << "require_osd_peer received from non-osd " << op->get_req()->get_connection()->get_peer_addr() - << " " << *op->get_req() << dendl; + if (!m->get_connection()->peer_is_osd()) { + dout(0) << "require_osd_peer received from non-osd " + << m->get_connection()->get_peer_addr() + << " " << *m << dendl; return false; } return true; } -bool OSD::require_self_aliveness(OpRequestRef& op, epoch_t epoch) +bool OSD::require_self_aliveness(Message *m, epoch_t epoch) { if (epoch < up_epoch) { dout(7) << "from pre-up epoch " << epoch << " < " << up_epoch << dendl; @@ -6193,16 +6264,15 @@ bool OSD::require_self_aliveness(OpRequestRef& op, epoch_t epoch) } if (!is_active()) { - dout(7) << "still in boot state, dropping message " << *op->get_req() << dendl; + dout(7) << "still in boot state, dropping message " << *m << dendl; return false; } return true; } -bool OSD::require_same_peer_instance(OpRequestRef& op, OSDMapRef& map) +bool OSD::require_same_peer_instance(Message *m, OSDMapRef& map) { - Message *m = op->get_req(); int from = m->get_source().num(); if (!map->have_inst(from) || @@ -6224,15 +6294,15 @@ bool OSD::require_same_peer_instance(OpRequestRef& op, OSDMapRef& map) return true; } -bool OSD::require_up_osd_peer(OpRequestRef& op, OSDMapRef& map, +bool OSD::require_up_osd_peer(Message *m, OSDMapRef& map, epoch_t their_epoch) { - if (!require_self_aliveness(op, their_epoch)) { + if (!require_self_aliveness(m, their_epoch)) { return false; - } else if (!require_osd_peer(op)) { + } else if (!require_osd_peer(m)) { return false; } else if (map->get_epoch() >= their_epoch && - !require_same_peer_instance(op, map)) { + !require_same_peer_instance(m, map)) { return false; } return true; @@ -6256,13 +6326,13 @@ bool OSD::require_same_or_newer_map(OpRequestRef& op, epoch_t epoch) return false; } - if (!require_self_aliveness(op, epoch)) { + if (!require_self_aliveness(op->get_req(), epoch)) { return false; } // ok, our map is same or newer.. do they still exist? if (m->get_connection()->get_messenger() == cluster_messenger && - !require_same_peer_instance(op, osdmap)) { + !require_same_peer_instance(op->get_req(), osdmap)) { return false; } @@ -6731,7 +6801,7 @@ void OSD::handle_pg_notify(OpRequestRef op) dout(7) << "handle_pg_notify from " << m->get_source() << dendl; int from = m->get_source().num(); - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; if (!require_same_or_newer_map(op, m->get_epoch())) return; @@ -6766,7 +6836,7 @@ void OSD::handle_pg_log(OpRequestRef op) assert(m->get_header().type == MSG_OSD_PG_LOG); dout(7) << "handle_pg_log " << *m << " from " << m->get_source() << dendl; - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; int from = m->get_source().num(); @@ -6795,7 +6865,7 @@ void OSD::handle_pg_info(OpRequestRef op) assert(m->get_header().type == MSG_OSD_PG_INFO); dout(7) << "handle_pg_info " << *m << " from " << m->get_source() << dendl; - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; int from = m->get_source().num(); @@ -6832,7 +6902,7 @@ void OSD::handle_pg_trim(OpRequestRef op) dout(7) << "handle_pg_trim " << *m << " from " << m->get_source() << dendl; - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; int from = m->get_source().num(); @@ -6888,7 +6958,7 @@ void OSD::handle_pg_scan(OpRequestRef op) assert(m->get_header().type == MSG_OSD_PG_SCAN); dout(10) << "handle_pg_scan " << *m << " from " << m->get_source() << dendl; - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; if (!require_same_or_newer_map(op, m->query_epoch)) return; @@ -6916,7 +6986,7 @@ void OSD::handle_pg_backfill(OpRequestRef op) assert(m->get_header().type == MSG_OSD_PG_BACKFILL); dout(10) << "handle_pg_backfill " << *m << " from " << m->get_source() << dendl; - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; if (!require_same_or_newer_map(op, m->query_epoch)) return; @@ -6943,7 +7013,7 @@ void OSD::handle_pg_backfill_reserve(OpRequestRef op) MBackfillReserve *m = static_cast(op->get_req()); assert(m->get_header().type == MSG_OSD_BACKFILL_RESERVE); - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; if (!require_same_or_newer_map(op, m->query_epoch)) return; @@ -6992,7 +7062,7 @@ void OSD::handle_pg_recovery_reserve(OpRequestRef op) MRecoveryReserve *m = static_cast(op->get_req()); assert(m->get_header().type == MSG_OSD_RECOVERY_RESERVE); - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; if (!require_same_or_newer_map(op, m->query_epoch)) return; @@ -7048,7 +7118,7 @@ void OSD::handle_pg_query(OpRequestRef op) MOSDPGQuery *m = (MOSDPGQuery*)op->get_req(); assert(m->get_header().type == MSG_OSD_PG_QUERY); - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; dout(7) << "handle_pg_query from " << m->get_source() << " epoch " << m->get_epoch() << dendl; @@ -7152,7 +7222,7 @@ void OSD::handle_pg_remove(OpRequestRef op) assert(m->get_header().type == MSG_OSD_PG_REMOVE); assert(osd_lock.is_locked()); - if (!require_osd_peer(op)) + if (!require_osd_peer(op->get_req())) return; dout(7) << "handle_pg_remove from " << m->get_source() << " on " @@ -7642,7 +7712,7 @@ void OSD::handle_replica_op(OpRequestRef op) return; } - if (!require_up_osd_peer(op, osdmap, m->map_epoch)) + if (!require_up_osd_peer(op->get_req(), osdmap, m->map_epoch)) return; // must be a rep op. diff --git a/ceph/src/osd/OSD.h b/ceph/src/osd/OSD.h index dea216d0..d06f0e7b 100644 --- a/ceph/src/osd/OSD.h +++ b/ceph/src/osd/OSD.h @@ -1147,9 +1147,9 @@ private: map > pg_for_processing; OSD *osd; PrioritizedQueue, entity_inst_t > pqueue; - OpWQ(OSD *o, time_t ti, ThreadPool *tp) + OpWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) : ThreadPool::WorkQueueVal, PGRef >( - "OSD::OpWQ", ti, ti*10, tp), + "OSD::OpWQ", ti, si, tp), qlock("OpWQ::qlock"), osd(o), pqueue(o->cct->_conf->osd_op_pq_max_tokens_per_priority, @@ -1211,9 +1211,9 @@ private: list peering_queue; OSD *osd; set in_use; - PeeringWQ(OSD *o, time_t ti, ThreadPool *tp) + PeeringWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) : ThreadPool::BatchWorkQueue( - "OSD::PeeringWQ", ti, ti*10, tp), osd(o) {} + "OSD::PeeringWQ", ti, si, tp), osd(o) {} void _dequeue(PG *pg) { for (list::iterator i = peering_queue.begin(); @@ -1554,19 +1554,19 @@ protected: void repeer(PG *pg, map< int, map >& query_map); bool require_mon_peer(Message *m); - bool require_osd_peer(OpRequestRef& op); + bool require_osd_peer(Message *m); /*** * Verifies that we were alive in the given epoch, and that * still are. */ - bool require_self_aliveness(OpRequestRef& op, epoch_t alive_since); + bool require_self_aliveness(Message *m, epoch_t alive_since); /** * Verifies that the OSD who sent the given op has the same * address as in the given map. * @pre op was sent by an OSD using the cluster messenger */ - bool require_same_peer_instance(OpRequestRef& op, OSDMapRef& map); - bool require_up_osd_peer(OpRequestRef& Op, OSDMapRef& map, + bool require_same_peer_instance(Message *m, OSDMapRef& map); + bool require_up_osd_peer(Message *m, OSDMapRef& map, epoch_t their_epoch); bool require_same_or_newer_map(OpRequestRef& op, epoch_t e); @@ -1599,8 +1599,8 @@ protected: list command_queue; struct CommandWQ : public ThreadPool::WorkQueue { OSD *osd; - CommandWQ(OSD *o, time_t ti, ThreadPool *tp) - : ThreadPool::WorkQueue("OSD::CommandWQ", ti, 0, tp), osd(o) {} + CommandWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) + : ThreadPool::WorkQueue("OSD::CommandWQ", ti, si, tp), osd(o) {} bool _empty() { return osd->command_queue.empty(); @@ -1653,8 +1653,8 @@ protected: struct RecoveryWQ : public ThreadPool::WorkQueue { OSD *osd; - RecoveryWQ(OSD *o, time_t ti, ThreadPool *tp) - : ThreadPool::WorkQueue("OSD::RecoveryWQ", ti, ti*10, tp), osd(o) {} + RecoveryWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) + : ThreadPool::WorkQueue("OSD::RecoveryWQ", ti, si, tp), osd(o) {} bool _empty() { return osd->recovery_queue.empty(); @@ -1711,8 +1711,8 @@ protected: struct SnapTrimWQ : public ThreadPool::WorkQueue { OSD *osd; - SnapTrimWQ(OSD *o, time_t ti, ThreadPool *tp) - : ThreadPool::WorkQueue("OSD::SnapTrimWQ", ti, 0, tp), osd(o) {} + SnapTrimWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) + : ThreadPool::WorkQueue("OSD::SnapTrimWQ", ti, si, tp), osd(o) {} bool _empty() { return osd->snap_trim_queue.empty(); @@ -1756,8 +1756,8 @@ protected: struct ScrubWQ : public ThreadPool::WorkQueue { OSD *osd; - ScrubWQ(OSD *o, time_t ti, ThreadPool *tp) - : ThreadPool::WorkQueue("OSD::ScrubWQ", ti, 0, tp), osd(o) {} + ScrubWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) + : ThreadPool::WorkQueue("OSD::ScrubWQ", ti, si, tp), osd(o) {} bool _empty() { return osd->scrub_queue.empty(); @@ -1802,8 +1802,8 @@ protected: xlist scrub_finalize_queue; public: - ScrubFinalizeWQ(time_t ti, ThreadPool *tp) - : ThreadPool::WorkQueue("OSD::ScrubFinalizeWQ", ti, ti*10, tp) {} + ScrubFinalizeWQ(time_t ti, time_t si, ThreadPool *tp) + : ThreadPool::WorkQueue("OSD::ScrubFinalizeWQ", ti, si, tp) {} bool _empty() { return scrub_finalize_queue.empty(); @@ -1847,8 +1847,8 @@ protected: list rep_scrub_queue; public: - RepScrubWQ(OSD *o, time_t ti, ThreadPool *tp) - : ThreadPool::WorkQueue("OSD::RepScrubWQ", ti, 0, tp), osd(o) {} + RepScrubWQ(OSD *o, time_t ti, time_t si, ThreadPool *tp) + : ThreadPool::WorkQueue("OSD::RepScrubWQ", ti, si, tp), osd(o) {} bool _empty() { return rep_scrub_queue.empty(); @@ -1901,9 +1901,9 @@ protected: public ThreadPool::WorkQueueVal > { ObjectStore *&store; list > remove_queue; - RemoveWQ(ObjectStore *&o, time_t ti, ThreadPool *tp) + RemoveWQ(ObjectStore *&o, time_t ti, time_t si, ThreadPool *tp) : ThreadPool::WorkQueueVal >( - "OSD::RemoveWQ", ti, 0, tp), + "OSD::RemoveWQ", ti, si, tp), store(o) {} bool _empty() { diff --git a/ceph/src/osd/OSDMap.cc b/ceph/src/osd/OSDMap.cc index 645a6f70..810c530e 100644 --- a/ceph/src/osd/OSDMap.cc +++ b/ceph/src/osd/OSDMap.cc @@ -1183,13 +1183,6 @@ int OSDMap::apply_incremental(const Incremental &inc) if (inc.new_pool_max != -1) pool_max = inc.new_pool_max; - for (set::const_iterator p = inc.old_pools.begin(); - p != inc.old_pools.end(); - ++p) { - pools.erase(*p); - name_pool.erase(pool_name[*p]); - pool_name.erase(*p); - } for (map::const_iterator p = inc.new_pools.begin(); p != inc.new_pools.end(); ++p) { @@ -1204,6 +1197,13 @@ int OSDMap::apply_incremental(const Incremental &inc) pool_name[p->first] = p->second; name_pool[p->second] = p->first; } + for (set::const_iterator p = inc.old_pools.begin(); + p != inc.old_pools.end(); + ++p) { + pools.erase(*p); + name_pool.erase(pool_name[*p]); + pool_name.erase(*p); + } for (map::const_iterator i = inc.new_weight.begin(); i != inc.new_weight.end(); @@ -1222,6 +1222,11 @@ int OSDMap::apply_incremental(const Incremental &inc) } // erasure_code_profiles + for (vector::const_iterator i = inc.old_erasure_code_profiles.begin(); + i != inc.old_erasure_code_profiles.end(); + ++i) + erasure_code_profiles.erase(*i); + for (map >::const_iterator i = inc.new_erasure_code_profiles.begin(); i != inc.new_erasure_code_profiles.end(); @@ -1229,11 +1234,6 @@ int OSDMap::apply_incremental(const Incremental &inc) set_erasure_code_profile(i->first, i->second); } - for (vector::const_iterator i = inc.old_erasure_code_profiles.begin(); - i != inc.old_erasure_code_profiles.end(); - i++) - erasure_code_profiles.erase(*i); - // up/down for (map::const_iterator i = inc.new_state.begin(); i != inc.new_state.end(); diff --git a/ceph/src/osd/PG.cc b/ceph/src/osd/PG.cc index ebc2020c..4b5ab6ca 100644 --- a/ceph/src/osd/PG.cc +++ b/ceph/src/osd/PG.cc @@ -603,7 +603,7 @@ bool PG::needs_backfill() const return ret; } -bool PG::_calc_past_interval_range(epoch_t *start, epoch_t *end) +bool PG::_calc_past_interval_range(epoch_t *start, epoch_t *end, epoch_t oldest_map) { *end = info.history.same_interval_since; @@ -620,7 +620,7 @@ bool PG::_calc_past_interval_range(epoch_t *start, epoch_t *end) *start = MAX(MAX(info.history.epoch_created, info.history.last_epoch_clean), - osd->get_superblock().oldest_map); + oldest_map); if (*start >= *end) { dout(10) << __func__ << " start epoch " << *start << " >= end epoch " << *end << ", nothing to do" << dendl; @@ -634,7 +634,8 @@ bool PG::_calc_past_interval_range(epoch_t *start, epoch_t *end) void PG::generate_past_intervals() { epoch_t cur_epoch, end_epoch; - if (!_calc_past_interval_range(&cur_epoch, &end_epoch)) { + if (!_calc_past_interval_range(&cur_epoch, &end_epoch, + osd->get_superblock().oldest_map)) { return; } @@ -659,8 +660,8 @@ void PG::generate_past_intervals() cur_map = osd->get_map(cur_epoch); pg_t pgid = get_pgid().pgid; - if (cur_map->get_pools().count(pgid.pool())) - pgid = pgid.get_ancestor(cur_map->get_pg_num(pgid.pool())); + if (last_map->get_pools().count(pgid.pool())) + pgid = pgid.get_ancestor(last_map->get_pg_num(pgid.pool())); cur_map->pg_to_up_acting_osds(pgid, &up, &up_primary, &acting, &primary); std::stringstream debug; @@ -762,6 +763,8 @@ bool PG::all_unfound_are_queried_or_lost(const OSDMapRef osdmap) const if (iter != peer_info.end() && (iter->second.is_empty() || iter->second.dne())) continue; + if (!osdmap->exists(peer->osd)) + continue; const osd_info_t &osd_info(osdmap->get_info(peer->osd)); if (osd_info.lost_at <= osd_info.up_from) { // If there is even one OSD in might_have_unfound that isn't lost, we @@ -849,8 +852,6 @@ void PG::clear_primary_state() osd->snap_trim_wq.dequeue(this); agent_clear(); - - osd->remove_want_pg_temp(info.pgid.pgid); } /** @@ -1660,7 +1661,7 @@ void PG::activate(ObjectStore::Transaction& t, } // degraded? - if (get_osdmap()->get_pg_size(info.pgid.pgid) > acting.size()) + if (get_osdmap()->get_pg_size(info.pgid.pgid) > actingset.size()) state_set(PG_STATE_DEGRADED); } @@ -1873,7 +1874,7 @@ void PG::mark_clean() { // only mark CLEAN if we have the desired number of replicas AND we // are not remapped. - if (acting.size() == get_osdmap()->get_pg_size(info.pgid.pgid) && + if (actingset.size() == get_osdmap()->get_pg_size(info.pgid.pgid) && up == acting) state_set(PG_STATE_CLEAN); @@ -2227,7 +2228,7 @@ void PG::_update_calc_stats() // the summation, not individual stat categories. uint64_t num_objects = info.stats.stats.sum.num_objects; - uint64_t degraded = 0; + int64_t degraded = 0; // if the actingbackfill set is smaller than we want, add in those missing replicas if (actingbackfill.size() < target) @@ -2249,7 +2250,9 @@ void PG::_update_calc_stats() degraded += peer_missing[*i].num_missing(); // not yet backfilled - degraded += num_objects - peer_info[*i].stats.stats.sum.num_objects; + int64_t diff = num_objects - peer_info[*i].stats.stats.sum.num_objects; + if (diff > 0) + degraded += diff; } info.stats.stats.sum.num_objects_degraded = degraded; info.stats.stats.sum.num_objects_unfound = get_num_unfound(); @@ -4790,12 +4793,6 @@ void PG::start_peering_interval( reg_next_scrub(); - // set CREATING bit until we have peered for the first time. - if (is_primary() && info.history.last_epoch_started == 0) - state_set(PG_STATE_CREATING); - else - state_clear(PG_STATE_CREATING); - // did acting, up, primary|acker change? if (!lastmap) { dout(10) << " no lastmap" << dendl; @@ -4860,8 +4857,10 @@ void PG::start_peering_interval( actingbackfill.clear(); // reset primary state? - if (was_old_primary || is_primary()) - clear_primary_state(); + if (was_old_primary || is_primary()) { + osd->remove_want_pg_temp(info.pgid.pgid); + } + clear_primary_state(); // pg->on_* @@ -5324,12 +5323,12 @@ void PG::handle_advance_map( << dendl; update_osdmap_ref(osdmap); pool.update(osdmap); - if (pool.info.last_change == osdmap_ref->get_epoch()) - on_pool_change(); AdvMap evt( osdmap, lastmap, newup, up_primary, newacting, acting_primary); recovery_state.handle_event(evt, rctx); + if (pool.info.last_change == osdmap_ref->get_epoch()) + on_pool_change(); } void PG::handle_activate_map(RecoveryCtx *rctx) @@ -5637,6 +5636,10 @@ PG::RecoveryState::Primary::Primary(my_context ctx) context< RecoveryMachine >().log_enter(state_name); PG *pg = context< RecoveryMachine >().pg; assert(pg->want_acting.empty()); + + // set CREATING bit until we have peered for the first time. + if (pg->info.history.last_epoch_started == 0) + pg->state_set(PG_STATE_CREATING); } boost::statechart::result PG::RecoveryState::Primary::react(const MNotifyRec& notevt) @@ -5669,6 +5672,8 @@ void PG::RecoveryState::Primary::exit() pg->want_acting.clear(); utime_t dur = ceph_clock_now(pg->cct) - enter_time; pg->osd->recoverystate_perf->tinc(rs_primary_latency, dur); + pg->clear_primary_state(); + pg->state_clear(PG_STATE_CREATING); } /*---------Peering--------*/ @@ -6400,13 +6405,11 @@ boost::statechart::result PG::RecoveryState::Active::react(const AdvMap& advmap) pg->dirty_big_info = true; } - for (vector::iterator p = pg->want_acting.begin(); - p != pg->want_acting.end(); ++p) { - if (!advmap.osdmap->is_up(*p)) { - assert((std::find(pg->acting.begin(), pg->acting.end(), *p) != - pg->acting.end()) || - (std::find(pg->up.begin(), pg->up.end(), *p) != - pg->up.end())); + for (size_t i = 0; i < pg->want_acting.size(); i++) { + int osd = pg->want_acting[i]; + if (!advmap.osdmap->is_up(osd)) { + pg_shard_t osd_with_shard(osd, shard_id_t(i)); + assert(pg->is_acting(osd_with_shard) || pg->is_up(osd_with_shard)); } } @@ -6414,7 +6417,7 @@ boost::statechart::result PG::RecoveryState::Active::react(const AdvMap& advmap) * this does not matter) */ if (advmap.lastmap->get_pg_size(pg->info.pgid.pgid) != pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid)) { - if (pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid) <= pg->acting.size()) + if (pg->get_osdmap()->get_pg_size(pg->info.pgid.pgid) <= pg->actingset.size()) pg->state_clear(PG_STATE_DEGRADED); else pg->state_set(PG_STATE_DEGRADED); diff --git a/ceph/src/osd/PG.h b/ceph/src/osd/PG.h index e3194779..57546b07 100644 --- a/ceph/src/osd/PG.h +++ b/ceph/src/osd/PG.h @@ -779,7 +779,7 @@ public: void mark_clean(); ///< mark an active pg clean - bool _calc_past_interval_range(epoch_t *start, epoch_t *end); + bool _calc_past_interval_range(epoch_t *start, epoch_t *end, epoch_t oldest_map); void generate_past_intervals(); void trim_past_intervals(); void build_prior(std::auto_ptr &prior_set); diff --git a/ceph/src/osd/PGLog.cc b/ceph/src/osd/PGLog.cc index 3f61346d..71526a50 100644 --- a/ceph/src/osd/PGLog.cc +++ b/ceph/src/osd/PGLog.cc @@ -185,6 +185,18 @@ void PGLog::proc_replica_log( dout(10) << "proc_replica_log for osd." << from << ": " << oinfo << " " << olog << " " << omissing << dendl; + if (olog.head < log.tail) { + dout(10) << __func__ << ": osd." << from << " does not overlap, not looking " + << "for divergent objects" << dendl; + return; + } + if (olog.head == log.head) { + dout(10) << __func__ << ": osd." << from << " same log head, not looking " + << "for divergent objects" << dendl; + return; + } + assert(olog.head >= log.tail); + /* basically what we're doing here is rewinding the remote log, dropping divergent entries, until we find something that matches @@ -202,48 +214,54 @@ void PGLog::proc_replica_log( << " have " << i->second.have << dendl; } - list::const_iterator fromiter = log.log.end(); - eversion_t lower_bound = log.tail; + list::const_reverse_iterator first_non_divergent = + log.log.rbegin(); while (1) { - if (fromiter == log.log.begin()) + if (first_non_divergent == log.log.rend()) break; - --fromiter; - if (fromiter->version <= olog.head) { - dout(20) << "merge_log cut point (usually last shared) is " - << *fromiter << dendl; - lower_bound = fromiter->version; - ++fromiter; + if (first_non_divergent->version <= olog.head) { + dout(20) << "merge_log point (usually last shared) is " + << *first_non_divergent << dendl; break; } + ++first_non_divergent; } + /* Because olog.head >= log.tail, we know that both pgs must at least have + * the event represented by log.tail. Thus, lower_bound >= log.tail. It's + * possible that olog/log contain no actual events between olog.head and + * log.tail, however, since they might have been split out. Thus, if + * we cannot find an event e such that log.tail <= e.version <= log.head, + * the last_update must actually be log.tail. + */ + eversion_t lu = + (first_non_divergent == log.log.rend() || + first_non_divergent->version < log.tail) ? + log.tail : + first_non_divergent->version; + list divergent; list::const_iterator pp = olog.log.end(); - eversion_t lu(oinfo.last_update); while (true) { - if (pp == olog.log.begin()) { - if (pp != olog.log.end()) // no last_update adjustment if we discard nothing! - lu = olog.tail; + if (pp == olog.log.begin()) break; - } + --pp; const pg_log_entry_t& oe = *pp; // don't continue past the tail of our log. if (oe.version <= log.tail) { - lu = oe.version; ++pp; break; } - if (oe.version <= lower_bound) { - lu = oe.version; + if (oe.version <= lu) { ++pp; break; } divergent.push_front(oe); - } + } IndexedLog folog; @@ -557,10 +575,10 @@ void PGLog::merge_log(ObjectStore::Transaction& t, // missing set, as that should already be consistent with our // current log. if (olog.tail < log.tail) { - mark_dirty_to(log.log.begin()->version); // last clean entry dout(10) << "merge_log extending tail to " << olog.tail << dendl; list::iterator from = olog.log.begin(); list::iterator to; + eversion_t last; for (to = from; to != olog.log.end(); ++to) { @@ -568,8 +586,10 @@ void PGLog::merge_log(ObjectStore::Transaction& t, break; log.index(*to); dout(15) << *to << dendl; + last = to->version; } - + mark_dirty_to(last); + // splice into our log. log.log.splice(log.log.begin(), olog.log, from, to); @@ -687,6 +707,32 @@ void PGLog::merge_log(ObjectStore::Transaction& t, } } +void PGLog::check() { + if (!pg_log_debug) + return; + if (log.log.size() != log_keys_debug.size()) { + derr << "log.log.size() != log_keys_debug.size()" << dendl; + derr << "actual log:" << dendl; + for (list::iterator i = log.log.begin(); + i != log.log.end(); + ++i) { + derr << " " << *i << dendl; + } + derr << "log_keys_debug:" << dendl; + for (set::const_iterator i = log_keys_debug.begin(); + i != log_keys_debug.end(); + ++i) { + derr << " " << *i << dendl; + } + } + assert(log.log.size() == log_keys_debug.size()); + for (list::iterator i = log.log.begin(); + i != log.log.end(); + ++i) { + assert(log_keys_debug.count(i->get_key_name())); + } +} + void PGLog::write_log( ObjectStore::Transaction& t, const hobject_t &log_oid) { @@ -765,7 +811,7 @@ void PGLog::_write_log( map keys; for (list::iterator p = log.log.begin(); - p != log.log.end() && p->version < dirty_to; + p != log.log.end() && p->version <= dirty_to; ++p) { bufferlist bl(sizeof(*p) * 2); p->encode_with_checksum(bl); @@ -796,6 +842,7 @@ void PGLog::_write_log( ::encode(divergent_priors, keys["divergent_priors"]); } ::encode(log.can_rollback_to, keys["can_rollback_to"]); + ::encode(log.rollback_info_trimmed_to, keys["rollback_info_trimmed_to"]); t.omap_rmkeys(coll_t::META_COLL, log_oid, to_remove); t.omap_setkeys(coll_t::META_COLL, log_oid, keys); @@ -820,8 +867,11 @@ bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid, rewrite_log = true; } else { log.tail = info.log_tail; + // will get overridden below if it had been recorded log.can_rollback_to = info.last_update; + log.rollback_info_trimmed_to = eversion_t(); + ObjectMap::ObjectMapIterator p = store->get_omap_iterator(coll_t::META_COLL, log_oid); if (p) for (p->seek_to_first(); p->valid() ; p->next()) { bufferlist bl = p->value();//Copy bufferlist before creating iterator @@ -833,6 +883,10 @@ bool PGLog::read_log(ObjectStore *store, coll_t coll, hobject_t log_oid, bufferlist bl = p->value(); bufferlist::iterator bp = bl.begin(); ::decode(log.can_rollback_to, bp); + } else if (p->key() == "rollback_info_trimmed_to") { + bufferlist bl = p->value(); + bufferlist::iterator bp = bl.begin(); + ::decode(log.rollback_info_trimmed_to, bp); } else { pg_log_entry_t e; e.decode_with_checksum(bp); diff --git a/ceph/src/osd/PGLog.h b/ceph/src/osd/PGLog.h index 1744cc8f..508b295f 100644 --- a/ceph/src/osd/PGLog.h +++ b/ceph/src/osd/PGLog.h @@ -212,9 +212,9 @@ protected: /// Log is clean on [dirty_to, dirty_from) bool touched_log; - eversion_t dirty_to; ///< must clear/writeout all keys up to dirty_to - eversion_t dirty_from; ///< must clear/writeout all keys past dirty_from - eversion_t writeout_from; ///< must writout keys past writeout_from + eversion_t dirty_to; ///< must clear/writeout all keys <= dirty_to + eversion_t dirty_from; ///< must clear/writeout all keys >= dirty_from + eversion_t writeout_from; ///< must writout keys >= writeout_from set trimmed; ///< must clear keys in trimmed bool dirty_divergent_priors; CephContext *cct; @@ -267,17 +267,8 @@ protected: i != log_keys_debug->end() && *i < ub; log_keys_debug->erase(i++)); } - void check() { - if (!pg_log_debug) - return; - assert(log.log.size() == log_keys_debug.size()); - for (list::iterator i = log.log.begin(); - i != log.log.end(); - ++i) { - assert(log_keys_debug.count(i->get_key_name())); - } - } + void check(); void undirty() { dirty_to = eversion_t(); dirty_from = eversion_t::max(); @@ -406,6 +397,19 @@ public: missing.split_into(child_pgid, split_bits, &(opg_log->missing)); opg_log->mark_dirty_to(eversion_t::max()); mark_dirty_to(eversion_t::max()); + + unsigned mask = ~((~0)<::iterator i = divergent_priors.begin(); + i != divergent_priors.end(); + ) { + if ((i->second.hash & mask) == child_pgid.m_seed) { + opg_log->add_divergent_prior(i->first, i->second); + divergent_priors.erase(i++); + dirty_divergent_priors = true; + } else { + ++i; + } + } } void recover_got(hobject_t oid, eversion_t v, pg_info_t &info) { diff --git a/ceph/src/osd/ReplicatedPG.cc b/ceph/src/osd/ReplicatedPG.cc index f1911c13..750638a8 100644 --- a/ceph/src/osd/ReplicatedPG.cc +++ b/ceph/src/osd/ReplicatedPG.cc @@ -1353,7 +1353,10 @@ void ReplicatedPG::do_op(OpRequestRef op) } } + bool in_hit_set = false; if (hit_set) { + if (missing_oid != hobject_t() && hit_set->contains(missing_oid)) + in_hit_set = true; hit_set->insert(oid); if (hit_set->is_full() || hit_set_start_stamp + pool.info.hit_set_period <= m->get_recv_stamp()) { @@ -1366,7 +1369,7 @@ void ReplicatedPG::do_op(OpRequestRef op) } if ((m->get_flags() & CEPH_OSD_FLAG_IGNORE_CACHE) == 0 && - maybe_handle_cache(op, write_ordered, obc, r, missing_oid, false)) + maybe_handle_cache(op, write_ordered, obc, r, missing_oid, false, in_hit_set)) return; if (r) { @@ -1535,6 +1538,10 @@ void ReplicatedPG::do_op(OpRequestRef op) return; } + if (m->get_flags() & CEPH_OSD_FLAG_IGNORE_CACHE) { + ctx->ignore_cache = true; + } + if ((op->may_read()) && (obc->obs.oi.is_lost())) { // This object is lost. Reading from it returns an error. dout(20) << __func__ << ": object " << obc->obs.oi.soid @@ -1561,7 +1568,8 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op, bool write_ordered, ObjectContextRef obc, int r, const hobject_t& missing_oid, - bool must_promote) + bool must_promote, + bool in_hit_set) { if (obc) dout(25) << __func__ << " " << obc->obs.oi << " " @@ -1606,7 +1614,43 @@ bool ReplicatedPG::maybe_handle_cache(OpRequestRef op, if (!must_promote && can_skip_promote(op, obc)) { return false; } - promote_object(op, obc, missing_oid); + if (op->may_write() || write_ordered || must_promote || !hit_set) { + promote_object(op, obc, missing_oid); + } else { + switch (pool.info.min_read_recency_for_promote) { + case 0: + promote_object(op, obc, missing_oid); + break; + case 1: + // Check if in the current hit set + if (in_hit_set) { + promote_object(op, obc, missing_oid); + } else { + do_cache_redirect(op, obc); + } + break; + default: + if (in_hit_set) { + promote_object(op, obc, missing_oid); + } else { + // Check if in other hit sets + map::iterator itor; + bool in_other_hit_sets = false; + for (itor = agent_state->hit_set_map.begin(); itor != agent_state->hit_set_map.end(); itor++) { + if (itor->second->contains(missing_oid)) { + in_other_hit_sets = true; + break; + } + } + if (in_other_hit_sets) { + promote_object(op, obc, missing_oid); + } else { + do_cache_redirect(op, obc); + } + } + break; + } + } return true; case pg_pool_t::CACHEMODE_FORWARD: @@ -1697,6 +1741,19 @@ void ReplicatedPG::promote_object(OpRequestRef op, ObjectContextRef obc, obc = get_object_context(missing_oid, true); } dout(10) << __func__ << " " << obc->obs.oi.soid << dendl; + if (scrubber.write_blocked_by_scrub(obc->obs.oi.soid)) { + dout(10) << __func__ << " " << obc->obs.oi.soid + << " blocked by scrub" << dendl; + if (op) { + waiting_for_active.push_back(op); + dout(10) << __func__ << " " << obc->obs.oi.soid + << " placing op in waiting_for_active" << dendl; + } else { + dout(10) << __func__ << " " << obc->obs.oi.soid + << " no op, dropping on the floor" << dendl; + } + return; + } PromoteCallback *cb = new PromoteCallback(op, obc, this); object_locator_t oloc(m->get_object_locator()); @@ -3688,6 +3745,10 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) } if (!obs.exists) { + if (pool.info.require_rollback() && op.extent.offset) { + result = -EOPNOTSUPP; + break; + } ctx->mod_desc.create(); } else if (op.extent.offset == oi.size) { ctx->mod_desc.append(oi.size); @@ -3935,7 +3996,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& ops) // Cannot delete an object with watchers result = -EBUSY; } else { - result = _delete_oid(ctx, false); + result = _delete_oid(ctx, ctx->ignore_cache); } break; @@ -5052,7 +5113,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx) for (list::iterator p = ctx->notify_acks.begin(); p != ctx->notify_acks.end(); ++p) { - dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl; + if (p->watch_cookie) + dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl; + else + dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl; for (map, WatchRef>::iterator i = ctx->obc->watchers.begin(); i != ctx->obc->watchers.end(); @@ -5134,6 +5198,7 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc dout(20) << __func__ << " " << soid << " " << ctx << " op " << pg_log_entry_t::get_op_name(log_op_type) << dendl; + utime_t now = ceph_clock_now(cct); // snapset bufferlist bss; @@ -5195,6 +5260,7 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc ctx->snapset_obc->obs.oi.version = ctx->at_version; ctx->snapset_obc->obs.oi.last_reqid = ctx->reqid; ctx->snapset_obc->obs.oi.mtime = ctx->mtime; + ctx->snapset_obc->obs.oi.local_mtime = now; bufferlist bv(sizeof(ctx->new_obs.oi)); ::encode(ctx->snapset_obc->obs.oi, bv); @@ -5235,6 +5301,7 @@ void ReplicatedPG::finish_ctx(OpContext *ctx, int log_op_type, bool maintain_ssc if (ctx->mtime != utime_t()) { ctx->new_obs.oi.mtime = ctx->mtime; dout(10) << " set mtime to " << ctx->new_obs.oi.mtime << dendl; + ctx->new_obs.oi.local_mtime = now; } else { dout(10) << " mtime unchanged at " << ctx->new_obs.oi.mtime << dendl; } @@ -6027,6 +6094,10 @@ void ReplicatedPG::finish_promote(int r, OpRequestRef op, simple_repop_submit(repop); osd->logger->inc(l_osd_tier_promote); + + assert(agent_state); + if (agent_state->is_idle()) + agent_choose_mode(); } void ReplicatedPG::cancel_copy(CopyOpRef cop, bool requeue) @@ -6395,6 +6466,19 @@ int ReplicatedPG::try_flush_mark_clean(FlushOpRef fop) return -EBUSY; } + if (!fop->blocking && scrubber.write_blocked_by_scrub(oid)) { + if (fop->op) { + dout(10) << __func__ << " blocked by scrub" << dendl; + requeue_op(fop->op); + requeue_ops(fop->dup_ops); + return -EAGAIN; // will retry + } else { + osd->logger->inc(l_osd_tier_try_flush_fail); + cancel_flush(fop, false); + return -ECANCELED; + } + } + // successfully flushed; can we clear the dirty bit? // try to take the lock manually, since we don't // have a ctx yet. @@ -6460,15 +6544,15 @@ void ReplicatedPG::cancel_flush(FlushOpRef fop, bool requeue) osd->objecter->op_cancel(fop->objecter_tid, -ECANCELED); fop->objecter_tid = 0; } + if (fop->blocking) { + fop->obc->stop_block(); + kick_object_context_blocked(fop->obc); + } if (requeue) { if (fop->op) requeue_op(fop->op); requeue_ops(fop->dup_ops); } - if (fop->blocking) { - fop->obc->stop_block(); - kick_object_context_blocked(fop->obc); - } if (fop->on_flush) { Context *on_flush = fop->on_flush; fop->on_flush = NULL; @@ -8616,8 +8700,19 @@ int ReplicatedBackend::build_push_op(const ObjectRecoveryInfo &recovery_info, dout(10) << " extent " << p.get_start() << "~" << p.get_len() << " is actually " << p.get_start() << "~" << bit.length() << dendl; - p.set_len(bit.length()); + interval_set::iterator save = p++; + if (bit.length() == 0) + out_op->data_included.erase(save); //Remove this empty interval + else + save.set_len(bit.length()); + // Remove any other intervals present + while (p != out_op->data_included.end()) { + interval_set::iterator save = p++; + out_op->data_included.erase(save); + } new_progress.data_complete = true; + out_op->data.claim_append(bit); + break; } out_op->data.claim_append(bit); } @@ -9494,6 +9589,13 @@ void ReplicatedPG::on_change(ObjectStore::Transaction *t) else p->second.clear(); } + for (map >::iterator i = + callbacks_for_degraded_object.begin(); + i != callbacks_for_degraded_object.end(); + ) { + finish_degraded_object((i++)->first); + } + assert(callbacks_for_degraded_object.empty()); if (is_primary()) { requeue_ops(waiting_for_cache_not_full); @@ -9568,9 +9670,20 @@ void ReplicatedPG::_clear_recovery_state() void ReplicatedPG::cancel_pull(const hobject_t &soid) { + dout(20) << __func__ << ": soid" << dendl; assert(recovering.count(soid)); recovering.erase(soid); finish_recovery_op(soid); + if (waiting_for_degraded_object.count(soid)) { + dout(20) << " kicking degraded waiters on " << soid << dendl; + requeue_ops(waiting_for_degraded_object[soid]); + waiting_for_degraded_object.erase(soid); + } + if (waiting_for_unreadable_object.count(soid)) { + dout(20) << " kicking unreadable waiters on " << soid << dendl; + requeue_ops(waiting_for_unreadable_object[soid]); + waiting_for_unreadable_object.erase(soid); + } if (is_missing_object(soid)) pg_log.set_last_requested(0); // get recover_primary to start over } @@ -10222,7 +10335,8 @@ int ReplicatedPG::recover_backfill( for (set::iterator i = backfill_targets.begin(); i != backfill_targets.end(); ++i) { - peer_backfill_info[*i].trim_to(last_backfill_started); + peer_backfill_info[*i].trim_to( + MAX(peer_info[*i].last_backfill, last_backfill_started)); } backfill_info.trim_to(last_backfill_started); @@ -10642,6 +10756,14 @@ void ReplicatedPG::scan_range( } else { bufferlist bl; int r = pgbackend->objects_get_attr(*p, OI_ATTR, &bl); + + /* If the object does not exist here, it must have been removed + * between the collection_list_partial and here. This can happen + * for the first item in the range, which is usually last_backfill. + */ + if (r == -ENOENT) + continue; + assert(r >= 0); object_info_t oi(bl); bi->objects[*p] = oi.version; @@ -10888,8 +11010,10 @@ void ReplicatedPG::hit_set_persist() info.hit_set.current_info.end = now; dout(20) << __func__ << " archive " << oid << dendl; - if (agent_state) + if (agent_state) { agent_state->add_hit_set(info.hit_set.current_info.begin, hit_set); + hit_set_in_memory_trim(); + } // hold a ref until it is flushed to disk hit_set_flushing[info.hit_set.current_info.begin] = hit_set; @@ -11025,8 +11149,6 @@ void ReplicatedPG::hit_set_trim(RepGather *repop, unsigned max) repop->ctx->op_t->remove(oid); repop->ctx->log.back().mod_desc.mark_unrollbackable(); } - if (agent_state) - agent_state->remove_oldest_hit_set(); updated_hit_set_hist.history.pop_front(); ObjectContextRef obc = get_object_context(oid, false); @@ -11037,6 +11159,19 @@ void ReplicatedPG::hit_set_trim(RepGather *repop, unsigned max) } } +void ReplicatedPG::hit_set_in_memory_trim() +{ + unsigned max = pool.info.hit_set_count; + unsigned max_in_memory = pool.info.min_read_recency_for_promote > 0 ? pool.info.min_read_recency_for_promote - 1 : 0; + + if (max_in_memory > max) { + max_in_memory = max; + } + while (agent_state->hit_set_map.size() > max_in_memory) { + agent_state->remove_oldest_hit_set(); + } +} + // ======================================= // cache agent @@ -11229,6 +11364,9 @@ bool ReplicatedPG::agent_work(int start_max) else agent_state->position = next; + // Discard old in memory HitSets + hit_set_in_memory_trim(); + if (need_delay) { assert(agent_state->delaying == false); agent_delay(); @@ -11243,7 +11381,6 @@ bool ReplicatedPG::agent_work(int start_max) void ReplicatedPG::agent_load_hit_sets() { if (agent_state->evict_mode == TierAgentState::EVICT_MODE_IDLE) { - agent_state->discard_hit_sets(); return; } @@ -11314,7 +11451,14 @@ bool ReplicatedPG::agent_maybe_flush(ObjectContextRef& obc) } utime_t now = ceph_clock_now(NULL); - if (obc->obs.oi.mtime + utime_t(pool.info.cache_min_flush_age, 0) > now) { + utime_t ob_local_mtime; + if (obc->obs.oi.local_mtime != utime_t()) { + ob_local_mtime = obc->obs.oi.local_mtime; + } else { + ob_local_mtime = obc->obs.oi.mtime; + } + bool evict_mode_full = (agent_state->evict_mode == TierAgentState::EVICT_MODE_FULL); + if (!evict_mode_full && (ob_local_mtime + utime_t(pool.info.cache_min_flush_age, 0) > now)) { dout(20) << __func__ << " skip (too young) " << obc->obs.oi << dendl; osd->logger->inc(l_osd_agent_skip); return false; @@ -11409,8 +11553,7 @@ bool ReplicatedPG::agent_maybe_evict(ObjectContextRef& obc) // FIXME: ignore temperature for now. - // KISS: if [lower,upper] spans our target effort, evict it. - if (atime_lower >= agent_state->evict_effort) + if (1000000 - atime_upper >= agent_state->evict_effort) return false; } @@ -11662,8 +11805,9 @@ void ReplicatedPG::agent_estimate_atime_temp(const hobject_t& oid, return; } time_t now = ceph_clock_now(NULL).sec(); - for (map::iterator p = agent_state->hit_set_map.begin(); - p != agent_state->hit_set_map.end(); + for (map::reverse_iterator p = + agent_state->hit_set_map.rbegin(); + p != agent_state->hit_set_map.rend(); ++p) { if (p->second->contains(oid)) { if (*atime < 0) diff --git a/ceph/src/osd/ReplicatedPG.h b/ceph/src/osd/ReplicatedPG.h index dc8ee625..c6de4005 100644 --- a/ceph/src/osd/ReplicatedPG.h +++ b/ceph/src/osd/ReplicatedPG.h @@ -439,6 +439,7 @@ public: bool user_modify; // user-visible modification bool undirty; // user explicitly un-dirtying this object bool cache_evict; ///< true if this is a cache eviction + bool ignore_cache; ///< true if IGNORE_CACHE flag is set // side effects list watch_connects; @@ -541,6 +542,7 @@ public: op(_op), reqid(_reqid), ops(_ops), obs(_obs), snapset(0), new_obs(_obs->oi, _obs->exists), modify(false), user_modify(false), undirty(false), cache_evict(false), + ignore_cache(false), bytes_written(0), bytes_read(0), user_at_version(0), current_osd_subop_num(0), op_t(NULL), @@ -800,6 +802,7 @@ protected: void hit_set_persist(); ///< persist hit info bool hit_set_apply_log(); ///< apply log entries to update in-memory HitSet void hit_set_trim(RepGather *repop, unsigned max); ///< discard old HitSets + void hit_set_in_memory_trim(); ///< discard old in memory HitSets hobject_t get_hit_set_current_object(utime_t stamp); hobject_t get_hit_set_archive_object(utime_t start, utime_t end); @@ -1054,13 +1057,17 @@ protected: bool write_ordered, ObjectContextRef obc, int r, const hobject_t& missing_oid, - bool must_promote); + bool must_promote, + bool in_hit_set = false); /** * This helper function tells the client to redirect their request elsewhere. */ void do_cache_redirect(OpRequestRef op, ObjectContextRef obc); /** - * This function starts up a copy from + * This function attempts to start a promote. Either it succeeds, + * or places op on a wait list. If op is null, failure means that + * this is a noop. If a future user wants to be able to distinguish + * these cases, a return value should be added. */ void promote_object(OpRequestRef op, ObjectContextRef obc, const hobject_t& missing_object); diff --git a/ceph/src/osd/osd_types.cc b/ceph/src/osd/osd_types.cc index d08e9b7d..5f4d660b 100644 --- a/ceph/src/osd/osd_types.cc +++ b/ceph/src/osd/osd_types.cc @@ -807,6 +807,7 @@ void pg_pool_t::dump(Formatter *f) const f->close_section(); // hit_set_params f->dump_unsigned("hit_set_period", hit_set_period); f->dump_unsigned("hit_set_count", hit_set_count); + f->dump_unsigned("min_read_recency_for_promote", min_read_recency_for_promote); f->dump_unsigned("stripe_width", get_stripe_width()); } @@ -1058,8 +1059,56 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const return; } - __u8 encode_compat = 5; - ENCODE_START(15, encode_compat, bl); + if ((features & CEPH_FEATURE_OSD_POOLRESEND) == 0) { + // we simply added last_force_op_resend here, which is a fully + // backward compatible change. however, encoding the same map + // differently between monitors triggers scrub noise (even though + // they are decodable without the feature), so let's be pendantic + // about it. + ENCODE_START(14, 5, bl); + ::encode(type, bl); + ::encode(size, bl); + ::encode(crush_ruleset, bl); + ::encode(object_hash, bl); + ::encode(pg_num, bl); + ::encode(pgp_num, bl); + __u32 lpg_num = 0, lpgp_num = 0; // tell old code that there are no localized pgs. + ::encode(lpg_num, bl); + ::encode(lpgp_num, bl); + ::encode(last_change, bl); + ::encode(snap_seq, bl); + ::encode(snap_epoch, bl); + ::encode(snaps, bl, features); + ::encode(removed_snaps, bl); + ::encode(auid, bl); + ::encode(flags, bl); + ::encode(crash_replay_interval, bl); + ::encode(min_size, bl); + ::encode(quota_max_bytes, bl); + ::encode(quota_max_objects, bl); + ::encode(tiers, bl); + ::encode(tier_of, bl); + __u8 c = cache_mode; + ::encode(c, bl); + ::encode(read_tier, bl); + ::encode(write_tier, bl); + ::encode(properties, bl); + ::encode(hit_set_params, bl); + ::encode(hit_set_period, bl); + ::encode(hit_set_count, bl); + ::encode(stripe_width, bl); + ::encode(target_max_bytes, bl); + ::encode(target_max_objects, bl); + ::encode(cache_target_dirty_ratio_micro, bl); + ::encode(cache_target_full_ratio_micro, bl); + ::encode(cache_min_flush_age, bl); + ::encode(cache_min_evict_age, bl); + ::encode(erasure_code_profile, bl); + ENCODE_FINISH(bl); + return; + } + + ENCODE_START(16, 5, bl); ::encode(type, bl); ::encode(size, bl); ::encode(crush_ruleset, bl); @@ -1099,12 +1148,13 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const ::encode(cache_min_evict_age, bl); ::encode(erasure_code_profile, bl); ::encode(last_force_op_resend, bl); + ::encode(min_read_recency_for_promote, bl); ENCODE_FINISH(bl); } void pg_pool_t::decode(bufferlist::iterator& bl) { - DECODE_START_LEGACY_COMPAT_LEN(15, 5, 5, bl); + DECODE_START_LEGACY_COMPAT_LEN(16, 5, 5, bl); ::decode(type, bl); ::decode(size, bl); ::decode(crush_ruleset, bl); @@ -1206,6 +1256,12 @@ void pg_pool_t::decode(bufferlist::iterator& bl) } else { last_force_op_resend = 0; } + if (struct_v >= 16) { + ::decode(min_read_recency_for_promote, bl); + } else { + pg_pool_t def; + min_read_recency_for_promote = def.min_read_recency_for_promote; + } DECODE_FINISH(bl); calc_pg_masks(); } @@ -1251,6 +1307,7 @@ void pg_pool_t::generate_test_instances(list& o) a.hit_set_params = HitSet::Params(new BloomHitSet::Params); a.hit_set_period = 3600; a.hit_set_count = 8; + a.min_read_recency_for_promote = 1; a.set_stripe_width(12345); a.target_max_bytes = 1238132132; a.target_max_objects = 1232132; @@ -1303,6 +1360,8 @@ ostream& operator<<(ostream& out, const pg_pool_t& p) << " " << p.hit_set_period << "s" << " x" << p.hit_set_count; } + if (p.min_read_recency_for_promote) + out << " min_read_recency_for_promote " << p.min_read_recency_for_promote; out << " stripe_width " << p.get_stripe_width(); return out; } @@ -2196,6 +2255,62 @@ void pg_interval_t::generate_test_instances(list& o) o.back()->maybe_went_rw = true; } +bool pg_interval_t::is_new_interval( + int old_acting_primary, + int new_acting_primary, + const vector &old_acting, + const vector &new_acting, + int old_up_primary, + int new_up_primary, + const vector &old_up, + const vector &new_up, + int old_size, + int new_size, + int old_min_size, + int new_min_size, + unsigned old_pg_num, + unsigned new_pg_num, + pg_t pgid) { + return old_acting_primary != new_acting_primary || + new_acting != old_acting || + old_up_primary != new_up_primary || + new_up != old_up || + old_min_size != new_min_size || + old_size != new_size || + pgid.is_split(old_pg_num, new_pg_num, 0); +} + +bool pg_interval_t::is_new_interval( + int old_acting_primary, + int new_acting_primary, + const vector &old_acting, + const vector &new_acting, + int old_up_primary, + int new_up_primary, + const vector &old_up, + const vector &new_up, + OSDMapRef osdmap, + OSDMapRef lastmap, + int64_t pool_id, + pg_t pgid) { + return !(lastmap->get_pools().count(pgid.pool())) || + is_new_interval(old_acting_primary, + new_acting_primary, + old_acting, + new_acting, + old_up_primary, + new_up_primary, + old_up, + new_up, + lastmap->get_pools().find(pgid.pool())->second.size, + osdmap->get_pools().find(pgid.pool())->second.size, + lastmap->get_pools().find(pgid.pool())->second.min_size, + osdmap->get_pools().find(pgid.pool())->second.min_size, + lastmap->get_pg_num(pgid.pool()), + osdmap->get_pg_num(pgid.pool()), + pgid); +} + bool pg_interval_t::check_new_interval( int old_acting_primary, int new_acting_primary, @@ -2218,15 +2333,19 @@ bool pg_interval_t::check_new_interval( // NOTE: a change in the up set primary triggers an interval // change, even though the interval members in the pg_interval_t // do not change. - if (old_acting_primary != new_acting_primary || - new_acting != old_acting || - old_up_primary != new_up_primary || - new_up != old_up || - (!(lastmap->get_pools().count(pool_id))) || - (lastmap->get_pools().find(pool_id)->second.min_size != - osdmap->get_pools().find(pool_id)->second.min_size) || - pgid.is_split(lastmap->get_pg_num(pgid.pool()), - osdmap->get_pg_num(pgid.pool()), 0)) { + if (is_new_interval( + old_acting_primary, + new_acting_primary, + old_acting, + new_acting, + old_up_primary, + new_up_primary, + old_up, + new_up, + osdmap, + lastmap, + pool_id, + pgid)) { pg_interval_t& i = (*past_intervals)[same_interval_since]; i.first = same_interval_since; i.last = osdmap->get_epoch() - 1; @@ -3613,6 +3732,7 @@ void object_info_t::copy_user_bits(const object_info_t& other) // these bits are copied from head->clone. size = other.size; mtime = other.mtime; + local_mtime = other.local_mtime; last_reqid = other.last_reqid; truncate_seq = other.truncate_seq; truncate_size = other.truncate_size; @@ -3644,7 +3764,7 @@ void object_info_t::encode(bufferlist& bl) const ++i) { old_watchers.insert(make_pair(i->first.second, i->second)); } - ENCODE_START(13, 8, bl); + ENCODE_START(14, 8, bl); ::encode(soid, bl); ::encode(myoloc, bl); //Retained for compatibility ::encode(category, bl); @@ -3669,6 +3789,7 @@ void object_info_t::encode(bufferlist& bl) const ::encode(watchers, bl); __u32 _flags = flags; ::encode(_flags, bl); + ::encode(local_mtime, bl); ENCODE_FINISH(bl); } @@ -3747,6 +3868,11 @@ void object_info_t::decode(bufferlist::iterator& bl) ::decode(_flags, bl); flags = (flag_t)_flags; } + if (struct_v >= 14) { + ::decode(local_mtime, bl); + } else { + local_mtime = utime_t(); + } DECODE_FINISH(bl); } @@ -3762,6 +3888,7 @@ void object_info_t::dump(Formatter *f) const f->dump_unsigned("user_version", user_version); f->dump_unsigned("size", size); f->dump_stream("mtime") << mtime; + f->dump_stream("local_mtime") << local_mtime; f->dump_unsigned("lost", (int)is_lost()); f->dump_unsigned("flags", (int)flags); f->dump_stream("wrlock_by") << wrlock_by; diff --git a/ceph/src/osd/osd_types.h b/ceph/src/osd/osd_types.h index 8e9cf6f5..56530399 100644 --- a/ceph/src/osd/osd_types.h +++ b/ceph/src/osd/osd_types.h @@ -654,6 +654,11 @@ struct objectstore_perf_stat_t { objectstore_perf_stat_t() : filestore_commit_latency(0), filestore_apply_latency(0) {} + bool operator==(const objectstore_perf_stat_t &r) const { + return filestore_commit_latency == r.filestore_commit_latency && + filestore_apply_latency == r.filestore_apply_latency; + } + void add(const objectstore_perf_stat_t &o) { filestore_commit_latency += o.filestore_commit_latency; filestore_apply_latency += o.filestore_apply_latency; @@ -717,7 +722,9 @@ inline bool operator==(const osd_stat_t& l, const osd_stat_t& r) { l.snap_trim_queue_len == r.snap_trim_queue_len && l.num_snap_trimming == r.num_snap_trimming && l.hb_in == r.hb_in && - l.hb_out == r.hb_out; + l.hb_out == r.hb_out && + l.op_queue_age_hist == r.op_queue_age_hist && + l.fs_perf_stat == r.fs_perf_stat; } inline bool operator!=(const osd_stat_t& l, const osd_stat_t& r) { return !(l == r); @@ -966,6 +973,7 @@ public: HitSet::Params hit_set_params; ///< The HitSet params to use on this pool uint32_t hit_set_period; ///< periodicity of HitSet segments (seconds) uint32_t hit_set_count; ///< number of periods to retain + uint32_t min_read_recency_for_promote; ///< minimum number of HitSet to check before promote uint32_t stripe_width; ///< erasure coded stripe size in bytes @@ -990,6 +998,7 @@ public: hit_set_params(), hit_set_period(0), hit_set_count(0), + min_read_recency_for_promote(0), stripe_width(0) { } @@ -1745,13 +1754,52 @@ struct pg_interval_t { void dump(Formatter *f) const; static void generate_test_instances(list& o); + /** + * Determines whether there is an interval change + */ + static bool is_new_interval( + int old_acting_primary, + int new_acting_primary, + const vector &old_acting, + const vector &new_acting, + int old_up_primary, + int new_up_primary, + const vector &old_up, + const vector &new_up, + int old_size, + int new_size, + int old_min_size, + int new_min_size, + unsigned old_pg_num, + unsigned new_pg_num, + pg_t pgid + ); + + /** + * Determines whether there is an interval change + */ + static bool is_new_interval( + int old_acting_primary, ///< [in] primary as of lastmap + int new_acting_primary, ///< [in] primary as of lastmap + const vector &old_acting, ///< [in] acting as of lastmap + const vector &new_acting, ///< [in] acting as of osdmap + int old_up_primary, ///< [in] up primary of lastmap + int new_up_primary, ///< [in] up primary of osdmap + const vector &old_up, ///< [in] up as of lastmap + const vector &new_up, ///< [in] up as of osdmap + ceph::shared_ptr osdmap, ///< [in] current map + ceph::shared_ptr lastmap, ///< [in] last map + int64_t poolid, ///< [in] pool for pg + pg_t pgid ///< [in] pgid for pg + ); + /** * Integrates a new map into *past_intervals, returns true * if an interval was closed out. */ static bool check_new_interval( int old_acting_primary, ///< [in] primary as of lastmap - int new_acting_primary, ///< [in] primary as of lastmap + int new_acting_primary, ///< [in] primary as of osdmap const vector &old_acting, ///< [in] acting as of lastmap const vector &new_acting, ///< [in] acting as of osdmap int old_up_primary, ///< [in] up primary of lastmap @@ -2614,6 +2662,7 @@ struct object_info_t { uint64_t size; utime_t mtime; + utime_t local_mtime; // local mtime // note: these are currently encoded into a total 16 bits; see // encode()/decode() for the weirdness. diff --git a/ceph/src/osdc/Objecter.cc b/ceph/src/osdc/Objecter.cc index 57954a59..9649e27a 100644 --- a/ceph/src/osdc/Objecter.cc +++ b/ceph/src/osdc/Objecter.cc @@ -607,7 +607,7 @@ void Objecter::handle_osd_map(MOSDMap *m) logger->inc(l_osdc_map_full); } else { - if (e && e > m->get_oldest()) { + if (e >= m->get_oldest()) { ldout(cct, 3) << "handle_osd_map requesting missing epoch " << osdmap->get_epoch()+1 << dendl; maybe_request_map(); break; @@ -1220,7 +1220,7 @@ public: } }; -ceph_tid_t Objecter::op_submit(Op *op) +ceph_tid_t Objecter::op_submit(Op *op, int *ctx_budget) { assert(client_lock.is_locked()); assert(initialized); @@ -1236,7 +1236,14 @@ ceph_tid_t Objecter::op_submit(Op *op) // throttle. before we look at any state, because // take_op_budget() may drop our lock while it blocks. - take_op_budget(op); + if (!op->ctx_budgeted || (ctx_budget && (*ctx_budget == -1))) { + int op_budget = take_op_budget(op); + // take and pass out the budget for the first OP + // in the context session + if (ctx_budget && (*ctx_budget == -1)) { + *ctx_budget = op_budget; + } + } return _op_submit(op); } @@ -1439,7 +1446,7 @@ int64_t Objecter::get_object_pg_hash_position(int64_t pool, const string& key, return p->raw_hash_to_pg(p->hash_key(key, ns)); } -int Objecter::calc_target(op_target_t *t, bool any_change) +int Objecter::calc_target(op_target_t *t, epoch_t *last_force_resend, bool any_change) { bool is_read = t->flags & CEPH_OSD_FLAG_READ; bool is_write = t->flags & CEPH_OSD_FLAG_WRITE; @@ -1447,9 +1454,15 @@ int Objecter::calc_target(op_target_t *t, bool any_change) const pg_pool_t *pi = osdmap->get_pg_pool(t->base_oloc.pool); bool force_resend = false; bool need_check_tiering = false; + if (pi && osdmap->get_epoch() == pi->last_force_op_resend) { - force_resend = true; + if (last_force_resend && *last_force_resend < pi->last_force_op_resend) { + *last_force_resend = pi->last_force_op_resend; + force_resend = true; + } else if (last_force_resend == 0) + force_resend = true; } + if (t->target_oid.name.empty() || force_resend) { t->target_oid = t->base_oid; need_check_tiering = true; @@ -1483,9 +1496,33 @@ int Objecter::calc_target(op_target_t *t, bool any_change) if (ret == -ENOENT) return RECALC_OP_TARGET_POOL_DNE; } - int primary; - vector acting; - osdmap->pg_to_acting_osds(pgid, &acting, &primary); + + int size = pi->size; + int min_size = pi->min_size; + unsigned pg_num = pi->get_pg_num(); + int up_primary, acting_primary; + vector up, acting; + osdmap->pg_to_up_acting_osds(pgid, &up, &up_primary, + &acting, &acting_primary); + unsigned prev_seed = ceph_stable_mod(pgid.ps(), t->pg_num, t->pg_num_mask); + if (any_change && pg_interval_t::is_new_interval( + t->acting_primary, + acting_primary, + t->acting, + acting, + t->up_primary, + up_primary, + t->up, + up, + t->size, + size, + t->min_size, + min_size, + t->pg_num, + pg_num, + pg_t(prev_seed, pgid.pool(), pgid.preferred()))) { + force_resend = true; + } bool need_resend = false; @@ -1497,15 +1534,22 @@ int Objecter::calc_target(op_target_t *t, bool any_change) if (t->pgid != pgid || is_pg_changed( - t->primary, t->acting, primary, acting, t->used_replica || any_change) || + t->acting_primary, t->acting, acting_primary, acting, + t->used_replica || any_change) || force_resend) { t->pgid = pgid; t->acting = acting; - t->primary = primary; - ldout(cct, 10) << __func__ << " pgid " << pgid - << " acting " << acting << dendl; + t->acting_primary = acting_primary; + t->up_primary = up_primary; + t->up = up; + t->size = size; + t->min_size = min_size; + t->pg_num = pg_num; + t->pg_num_mask = pi->get_pg_num_mask(); + ldout(cct, 10) << __func__ << " " + << " pgid " << pgid << " acting " << acting << dendl; t->used_replica = false; - if (primary == -1) { + if (acting_primary == -1) { t->osd = -1; } else { int osd; @@ -1541,7 +1585,7 @@ int Objecter::calc_target(op_target_t *t, bool any_change) assert(best >= 0); osd = acting[best]; } else { - osd = primary; + osd = acting_primary; } t->osd = osd; } @@ -1555,7 +1599,7 @@ int Objecter::calc_target(op_target_t *t, bool any_change) int Objecter::recalc_op_target(Op *op) { - int r = calc_target(&op->target); + int r = calc_target(&op->target, &op->last_force_resend); if (r == RECALC_OP_TARGET_NEED_RESEND) { OSDSession *s = NULL; if (op->target.osd >= 0) @@ -1576,7 +1620,7 @@ int Objecter::recalc_op_target(Op *op) bool Objecter::recalc_linger_op_target(LingerOp *linger_op) { - int r = calc_target(&linger_op->target, true); + int r = calc_target(&linger_op->target, &linger_op->last_force_resend, true); if (r == RECALC_OP_TARGET_NEED_RESEND) { ldout(cct, 10) << "recalc_linger_op_target tid " << linger_op->linger_id << " pgid " << linger_op->target.pgid @@ -1610,7 +1654,7 @@ void Objecter::finish_op(Op *op) ldout(cct, 15) << "finish_op " << op->tid << dendl; op->session_item.remove_myself(); - if (op->budgeted) + if (!op->ctx_budgeted && op->budgeted) put_op_budget(op); ops.erase(op->tid); @@ -1915,6 +1959,10 @@ void Objecter::list_objects(ListContext *list_context, Context *onfinish) } } if (list_context->at_end_of_pool) { + // release the listing context's budget once all + // OPs (in the session) are finished + put_list_context_budget(list_context); + onfinish->complete(0); return; } @@ -1943,7 +1991,7 @@ void Objecter::list_objects(ListContext *list_context, Context *onfinish) C_List *onack = new C_List(list_context, onfinish, this); object_locator_t oloc(list_context->pool_id, list_context->nspace); pg_read(list_context->current_pg, oloc, op, - &list_context->bl, 0, onack, &onack->epoch); + &list_context->bl, 0, onack, &onack->epoch, &list_context->ctx_budget); } void Objecter::_list_reply(ListContext *list_context, int r, @@ -1989,6 +2037,9 @@ void Objecter::_list_reply(ListContext *list_context, int r, } if (!list_context->list.empty()) { ldout(cct, 20) << " returning results so far" << dendl; + // release the listing context's budget once all + // OPs (in the session) are finished + put_list_context_budget(list_context); final_finish->complete(0); return; } @@ -1997,6 +2048,13 @@ void Objecter::_list_reply(ListContext *list_context, int r, list_objects(list_context, final_finish); } +void Objecter::put_list_context_budget(ListContext *list_context) { + if (list_context->ctx_budget >= 0) { + ldout(cct, 10) << " release listing context's budget " << list_context->ctx_budget << dendl; + put_op_budget_bytes(list_context->ctx_budget); + list_context->ctx_budget = -1; + } + } //snapshots diff --git a/ceph/src/osdc/Objecter.h b/ceph/src/osdc/Objecter.h index 2ede888a..b0739a10 100644 --- a/ceph/src/osdc/Objecter.h +++ b/ceph/src/osdc/Objecter.h @@ -1068,12 +1068,18 @@ public: object_t target_oid; object_locator_t target_oloc; - bool precalc_pgid; ///< true if we are directed at base_pgid, not base_oid - pg_t base_pgid; ///< explciti pg target, if any - - pg_t pgid; ///< last pg we mapped to - vector acting; ///< acting for last pg we mapped to - int primary; ///< primary for last pg we mapped to + bool precalc_pgid; ///< true if we are directed at base_pgid, not base_oid + pg_t base_pgid; ///< explciti pg target, if any + + pg_t pgid; ///< last pg we mapped to + unsigned pg_num; ///< last pg_num we mapped to + unsigned pg_num_mask; ///< last pg_num_mask we mapped to + vector up; ///< set of up osds for last pg we mapped to + vector acting; ///< set of acting osds for last pg we mapped to + int up_primary; ///< primary for last pg we mapped to based on the up set + int acting_primary; ///< primary for last pg we mapped to based on the acting set + int size; ///< the size of the pool when were were last mapped + int min_size; ///< the min size of the pool when were were last mapped bool used_replica; bool paused; @@ -1085,7 +1091,12 @@ public: base_oid(oid), base_oloc(oloc), precalc_pgid(false), - primary(-1), + pg_num(0), + pg_num_mask(0), + up_primary(-1), + acting_primary(-1), + size(-1), + min_size(-1), used_replica(false), paused(false), osd(-1) @@ -1133,6 +1144,13 @@ public: /// true if we should resend this message on failure bool should_resend; + epoch_t last_force_resend; + + /// true if the throttle budget is get/put on a series of OPs, instead of + /// per OP basis, when this flag is set, the budget is acquired before sending + /// the very first OP of the series and released upon receiving the last OP reply. + bool ctx_budgeted; + Op(const object_t& o, const object_locator_t& ol, vector& op, int f, Context *ac, Context *co, version_t *ov) : session(NULL), session_item(this), incarnation(0), @@ -1146,7 +1164,9 @@ public: objver(ov), reply_epoch(NULL), map_dne_bound(0), budgeted(false), - should_resend(true) { + should_resend(true), + last_force_resend(0), + ctx_budgeted(false) { ops.swap(op); /* initialize out_* to match op vector */ @@ -1249,11 +1269,24 @@ public: bufferlist extra_info; + // The budget associated with this context, once it is set (>= 0), + // the budget is not get/released on OP basis, instead the budget + // is acquired before sending the first OP and released upon receiving + // the last op reply. + int ctx_budget; + ListContext() : current_pg(0), current_pg_epoch(0), starting_pg_num(0), at_end_of_pool(false), at_end_of_pg(false), pool_id(0), - pool_snap_seq(0), max_entries(0) {} + pool_snap_seq(0), + max_entries(0), + nspace(), + bl(), + list(), + filter(), + extra_info(), + ctx_budget(-1) {} bool at_end() const { return at_end_of_pool; @@ -1372,6 +1405,7 @@ public: ceph_tid_t register_tid; epoch_t map_dne_bound; + epoch_t last_force_resend; LingerOp() : linger_id(0), target(object_t(), object_locator_t(), 0), @@ -1381,7 +1415,8 @@ public: on_reg_ack(NULL), on_reg_commit(NULL), session(NULL), session_item(this), register_tid(0), - map_dne_bound(0) {} + map_dne_bound(0), + last_force_resend(0) {} // no copy! const LingerOp &operator=(const LingerOp& r); @@ -1480,7 +1515,7 @@ public: bool osdmap_full_flag() const; bool target_should_be_paused(op_target_t *op); - int calc_target(op_target_t *t, bool any_change=false); + int calc_target(op_target_t *t, epoch_t *last_force_resend=0, bool any_change=false); int recalc_op_target(Op *op); bool recalc_linger_op_target(LingerOp *op); @@ -1517,7 +1552,7 @@ public: */ int calc_op_budget(Op *op); void throttle_op(Op *op, int op_size=0); - void take_op_budget(Op *op) { + int take_op_budget(Op *op) { int op_budget = calc_op_budget(op); if (keep_balanced_budget) { throttle_op(op, op_budget); @@ -1526,13 +1561,19 @@ public: op_throttle_ops.take(1); } op->budgeted = true; + return op_budget; + } + void put_op_budget_bytes(int op_budget) { + assert(op_budget >= 0); + op_throttle_bytes.put(op_budget); + op_throttle_ops.put(1); } void put_op_budget(Op *op) { assert(op->budgeted); int op_budget = calc_op_budget(op); - op_throttle_bytes.put(op_budget); - op_throttle_ops.put(1); + put_op_budget_bytes(op_budget); } + void put_list_context_budget(ListContext *list_context); Throttle op_throttle_bytes, op_throttle_ops; public: @@ -1603,7 +1644,7 @@ private: // public interface public: - ceph_tid_t op_submit(Op *op); + ceph_tid_t op_submit(Op *op, int *ctx_budget = NULL); bool is_active() { return !(ops.empty() && linger_ops.empty() && poolstat_ops.empty() && statfs_ops.empty()); } @@ -1707,7 +1748,8 @@ public: ObjectOperation& op, bufferlist *pbl, int flags, Context *onack, - epoch_t *reply_epoch) { + epoch_t *reply_epoch, + int *ctx_budget) { Op *o = new Op(object_t(), oloc, op.ops, flags | global_op_flags | CEPH_OSD_FLAG_READ, onack, NULL, NULL); @@ -1720,7 +1762,11 @@ public: o->out_handler.swap(op.out_handler); o->out_rval.swap(op.out_rval); o->reply_epoch = reply_epoch; - return op_submit(o); + if (ctx_budget) { + // budget is tracked by listing context + o->ctx_budgeted = true; + } + return op_submit(o, ctx_budget); } ceph_tid_t linger_mutate(const object_t& oid, const object_locator_t& oloc, ObjectOperation& op, diff --git a/ceph/src/pybind/rados.py b/ceph/src/pybind/rados.py index ec689193..e3f8435a 100644 --- a/ceph/src/pybind/rados.py +++ b/ceph/src/pybind/rados.py @@ -829,11 +829,14 @@ class Snap(object): class Completion(object): """completion object""" - def __init__(self, ioctx, rados_comp, oncomplete, onsafe): + def __init__(self, ioctx, rados_comp, oncomplete, onsafe, + complete_cb, safe_cb): self.rados_comp = rados_comp self.oncomplete = oncomplete self.onsafe = onsafe self.ioctx = ioctx + self.complete_cb = complete_cb + self.safe_cb = safe_cb def wait_for_safe(self): """ @@ -879,6 +882,8 @@ class Completion(object): run_in_thread(self.ioctx.librados.rados_aio_release, (self.rados_comp,)) +RADOS_CB = CFUNCTYPE(c_int, c_void_p, c_void_p) + class Ioctx(object): """rados.Ioctx object""" def __init__(self, name, librados, io): @@ -889,9 +894,6 @@ class Ioctx(object): self.locator_key = "" self.safe_cbs = {} self.complete_cbs = {} - RADOS_CB = CFUNCTYPE(c_int, c_void_p, c_void_p) - self.__aio_safe_cb_c = RADOS_CB(self.__aio_safe_cb) - self.__aio_complete_cb_c = RADOS_CB(self.__aio_complete_cb) self.lock = threading.Lock() def __enter__(self): @@ -944,16 +946,17 @@ class Ioctx(object): complete_cb = None safe_cb = None if oncomplete: - complete_cb = self.__aio_complete_cb_c + complete_cb = RADOS_CB(self.__aio_complete_cb) if onsafe: - safe_cb = self.__aio_safe_cb_c + safe_cb = RADOS_CB(self.__aio_safe_cb) ret = run_in_thread(self.librados.rados_aio_create_completion, (c_void_p(0), complete_cb, safe_cb, byref(completion))) if ret < 0: raise make_ex(ret, "error getting a completion") with self.lock: - completion_obj = Completion(self, completion, oncomplete, onsafe) + completion_obj = Completion(self, completion, oncomplete, onsafe, + complete_cb, safe_cb) if oncomplete: self.complete_cbs[completion.value] = completion_obj if onsafe: diff --git a/ceph/src/rgw/logrotate.conf b/ceph/src/rgw/logrotate.conf index ec47f008..7e527e85 100644 --- a/ceph/src/rgw/logrotate.conf +++ b/ceph/src/rgw/logrotate.conf @@ -7,7 +7,7 @@ if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then invoke-rc.d radosgw reload >/dev/null elif which service > /dev/null 2>&1 && [ -x `which service` ]; then - service radosgw reload >/dev/null + service ceph-radosgw reload >/dev/null fi # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then diff --git a/ceph/src/rgw/rgw_civetweb.cc b/ceph/src/rgw/rgw_civetweb.cc index b44a40c2..5c15bcfe 100644 --- a/ceph/src/rgw/rgw_civetweb.cc +++ b/ceph/src/rgw/rgw_civetweb.cc @@ -11,13 +11,18 @@ int RGWMongoose::write_data(const char *buf, int len) { if (!header_done) { header_data.append(buf, len); - return 0; + return len; } if (!sent_header) { data.append(buf, len); - return 0; + return len; + } + int r = mg_write(conn, buf, len); + if (r == 0) { + /* didn't send anything, error out */ + return -EIO; } - return mg_write(conn, buf, len); + return r; } RGWMongoose::RGWMongoose(mg_connection *_conn, int _port) : conn(_conn), port(_port), header_done(false), sent_header(false), has_content_length(false), @@ -145,6 +150,20 @@ int RGWMongoose::send_100_continue() return mg_write(conn, buf, sizeof(buf) - 1); } +static void dump_date_header(bufferlist &out) +{ + char timestr[TIME_BUF_SIZE]; + const time_t gtime = time(NULL); + struct tm result; + struct tm const * const tmp = gmtime_r(>ime, &result); + + if (tmp == NULL) + return; + + if (strftime(timestr, sizeof(timestr), "Date: %a, %d %b %Y %H:%M:%S %Z\r\n", tmp)) + out.append(timestr); +} + int RGWMongoose::complete_header() { header_done = true; @@ -153,6 +172,8 @@ int RGWMongoose::complete_header() return 0; } + dump_date_header(header_data); + if (explicit_keepalive) header_data.append("Connection: Keep-Alive\r\n"); diff --git a/ceph/src/rgw/rgw_civetweb.h b/ceph/src/rgw/rgw_civetweb.h index c1df9f08..f50d5d6f 100644 --- a/ceph/src/rgw/rgw_civetweb.h +++ b/ceph/src/rgw/rgw_civetweb.h @@ -1,5 +1,6 @@ #ifndef CEPH_RGW_MONGOOSE_H #define CEPH_RGW_MONGOOSE_H +#define TIME_BUF_SIZE 128 #include "rgw_client_io.h" diff --git a/ceph/src/rgw/rgw_client_io.cc b/ceph/src/rgw/rgw_client_io.cc index 193f44e9..32d99dcf 100644 --- a/ceph/src/rgw/rgw_client_io.cc +++ b/ceph/src/rgw/rgw_client_io.cc @@ -54,7 +54,12 @@ int RGWClientIO::write(const char *buf, int len) return ret; if (account) - bytes_sent += len; + bytes_sent += ret; + + if (ret < len) { + /* sent less than tried to send, error out */ + return -EIO; + } return 0; } diff --git a/ceph/src/rgw/rgw_common.h b/ceph/src/rgw/rgw_common.h index 432e82a3..62c35799 100644 --- a/ceph/src/rgw/rgw_common.h +++ b/ceph/src/rgw/rgw_common.h @@ -849,7 +849,7 @@ struct req_info { req_info(CephContext *cct, RGWEnv *_env); void rebuild_from(req_info& src); - void init_meta_info(bool *found_nad_meta); + void init_meta_info(bool *found_bad_meta); }; /** Store all the state necessary to complete and respond to an HTTP request*/ @@ -863,7 +863,7 @@ struct req_state { string decoded_uri; string relative_uri; const char *length; - uint64_t content_length; + int64_t content_length; map generic_attrs; struct rgw_err err; bool expect_cont; diff --git a/ceph/src/rgw/rgw_main.cc b/ceph/src/rgw/rgw_main.cc index fc40b649..1c8720c9 100644 --- a/ceph/src/rgw/rgw_main.cc +++ b/ceph/src/rgw/rgw_main.cc @@ -91,7 +91,7 @@ struct RGWRequest RGWOp *op; utime_t ts; - RGWRequest() : id(0), s(NULL), op(NULL) { + RGWRequest(uint64_t id) : id(id), s(NULL), op(NULL) { } virtual ~RGWRequest() {} @@ -152,6 +152,9 @@ public: struct RGWFCGXRequest : public RGWRequest { FCGX_Request fcgx; + + RGWFCGXRequest(uint64_t req_id) : RGWRequest(req_id) {} + }; struct RGWProcessEnv { @@ -222,8 +225,6 @@ protected: } } req_wq; - uint64_t max_req_id; - public: RGWProcess(CephContext *cct, RGWProcessEnv *pe, int num_threads, RGWFrontendConfig *_conf) : store(pe->store), olog(pe->olog), m_tp(cct, "RGWProcess::m_tp", num_threads), @@ -232,8 +233,7 @@ public: conf(_conf), sock_fd(-1), req_wq(this, g_conf->rgw_op_thread_timeout, - g_conf->rgw_op_thread_suicide_timeout, &m_tp), - max_req_id(0) {} + g_conf->rgw_op_thread_suicide_timeout, &m_tp) {} virtual ~RGWProcess() {} virtual void run() = 0; virtual void handle_request(RGWRequest *req) = 0; @@ -261,10 +261,17 @@ void RGWFCGXProcess::run() string socket_port; string socket_host; - conf->get_val("socket_path", g_conf->rgw_socket_path, &socket_path); + conf->get_val("socket_path", "", &socket_path); conf->get_val("socket_port", g_conf->rgw_port, &socket_port); conf->get_val("socket_host", g_conf->rgw_host, &socket_host); + if (socket_path.empty() && socket_port.empty() && socket_host.empty()) { + socket_path = g_conf->rgw_socket_path; + if (socket_path.empty()) { + dout(0) << "ERROR: no socket server point defined, cannot start fcgi frontend" << dendl; + return; + } + } if (!socket_path.empty()) { string path_str = socket_path; @@ -303,8 +310,7 @@ void RGWFCGXProcess::run() m_tp.start(); for (;;) { - RGWFCGXRequest *req = new RGWFCGXRequest; - req->id = ++max_req_id; + RGWFCGXRequest *req = new RGWFCGXRequest(store->get_new_req_id()); dout(10) << "allocated request req=" << hex << req << dec << dendl; FCGX_InitRequest(&req->fcgx, sock_fd, 0); req_throttle.get(1); @@ -330,8 +336,8 @@ struct RGWLoadGenRequest : public RGWRequest { atomic_t *fail_flag; - RGWLoadGenRequest(const string& _m, const string& _r, int _cl, - atomic_t *ff) : method(_m), resource(_r), content_length(_cl), fail_flag(ff) {} + RGWLoadGenRequest(uint64_t req_id, const string& _m, const string& _r, int _cl, + atomic_t *ff) : RGWRequest(req_id), method(_m), resource(_r), content_length(_cl), fail_flag(ff) {} }; class RGWLoadGenProcess : public RGWProcess { @@ -365,7 +371,7 @@ void RGWLoadGenProcess::run() int num_buckets; conf->get_val("num_buckets", 1, &num_buckets); - string buckets[num_buckets]; + vector buckets(num_buckets); atomic_t failed; @@ -432,8 +438,8 @@ done: void RGWLoadGenProcess::gen_request(const string& method, const string& resource, int content_length, atomic_t *fail_flag) { - RGWLoadGenRequest *req = new RGWLoadGenRequest(method, resource, content_length, fail_flag); - req->id = ++max_req_id; + RGWLoadGenRequest *req = new RGWLoadGenRequest(store->get_new_req_id(), method, resource, + content_length, fail_flag); dout(10) << "allocated request req=" << hex << req << dec << dendl; req_throttle.get(1); req_wq.queue(req); @@ -631,7 +637,7 @@ void RGWFCGXProcess::handle_request(RGWRequest *r) RGWFCGXRequest *req = static_cast(r); FCGX_Request *fcgx = &req->fcgx; RGWFCGX client_io(fcgx); - + int ret = process_request(store, rest, req, &client_io, olog); if (ret < 0) { @@ -687,7 +693,7 @@ static int civetweb_callback(struct mg_connection *conn) { RGWREST *rest = pe->rest; OpsLogSocket *olog = pe->olog; - RGWRequest *req = new RGWRequest; + RGWRequest *req = new RGWRequest(store->get_new_req_id()); RGWMongoose client_io(conn, pe->port); client_io.init(g_ceph_context); diff --git a/ceph/src/rgw/rgw_op.cc b/ceph/src/rgw/rgw_op.cc index 4cc12eab..804917ca 100644 --- a/ceph/src/rgw/rgw_op.cc +++ b/ceph/src/rgw/rgw_op.cc @@ -1627,6 +1627,12 @@ void RGWPutObj::execute() */ bool need_to_wait = (ofs == 0) && multipart; + bufferlist orig_data; + + if (need_to_wait) { + orig_data = data; + } + ret = put_data_and_throttle(processor, data, ofs, (need_calc_md5 ? &hash : NULL), need_to_wait); if (ret < 0) { if (!need_to_wait || ret != -EEXIST) { @@ -1636,6 +1642,9 @@ void RGWPutObj::execute() ldout(s->cct, 5) << "NOTICE: processor->throttle_data() returned -EEXIST, need to restart write" << dendl; + /* restore original data */ + data.swap(orig_data); + /* restart processing with different oid suffix */ dispose_processor(processor); @@ -1661,7 +1670,7 @@ void RGWPutObj::execute() ofs += len; } while (len > 0); - if (!chunked_upload && (uint64_t)ofs != s->content_length) { + if (!chunked_upload && ofs != s->content_length) { ret = -ERR_REQUEST_TIMEOUT; goto done; } @@ -1789,6 +1798,12 @@ void RGWPostObj::execute() goto done; } + ret = store->check_quota(s->bucket_owner.get_id(), s->bucket, + user_quota, bucket_quota, s->content_length); + if (ret < 0) { + goto done; + } + processor = select_processor(); ret = processor->prepare(store, s->obj_ctx, NULL); @@ -1824,6 +1839,12 @@ void RGWPostObj::execute() s->obj_size = ofs; + ret = store->check_quota(s->bucket_owner.get_id(), s->bucket, + user_quota, bucket_quota, s->obj_size); + if (ret < 0) { + goto done; + } + hash.Final(m); buf_to_hex(m, CEPH_CRYPTO_MD5_DIGESTSIZE, calc_md5); @@ -1895,11 +1916,24 @@ void RGWPutMetadata::execute() orig_attrs = s->bucket_attrs; } - /* only remove meta attrs */ for (iter = orig_attrs.begin(); iter != orig_attrs.end(); ++iter) { const string& name = iter->first; + /* check if the attr is user-defined metadata item */ if (name.compare(0, meta_prefix_len, meta_prefix) == 0) { - rmattrs[name] = iter->second; + if (!(s->object == NULL)) { + /* for the objects all existing meta attrs have to be removed */ + rmattrs[name] = iter->second; + } else { + /* for the buckets all existing meta attrs are preserved, + except those that are listed in rmattr_names. */ + if (rmattr_names.find(name) != rmattr_names.end()) { + map::iterator aiter = attrs.find(name); + if (aiter != attrs.end()) { + attrs.erase(aiter); + } + rmattrs[name] = iter->second; + } + } } else if (attrs.find(name) == attrs.end()) { attrs[name] = iter->second; } @@ -2048,6 +2082,7 @@ int RGWCopyObj::verify_permission() if (src_bucket_name.compare(dest_bucket_name) == 0) { /* will only happen if s->local_source */ dest_bucket_info = src_bucket_info; + dest_attrs = src_attrs; } else { ret = store->get_bucket_info(s->obj_ctx, dest_bucket_name, dest_bucket_info, NULL, &dest_attrs); if (ret < 0) diff --git a/ceph/src/rgw/rgw_op.h b/ceph/src/rgw/rgw_op.h index bd6f9640..98922f76 100644 --- a/ceph/src/rgw/rgw_op.h +++ b/ceph/src/rgw/rgw_op.h @@ -14,6 +14,7 @@ #include #include +#include #include #include "rgw_common.h" @@ -402,7 +403,7 @@ public: class RGWPutMetadata : public RGWOp { protected: int ret; - map attrs; + set rmattr_names; bool has_policy, has_cors; RGWAccessControlPolicy policy; RGWCORSConfiguration cors_config; diff --git a/ceph/src/rgw/rgw_rados.cc b/ceph/src/rgw/rgw_rados.cc index 52f8a701..482b6099 100644 --- a/ceph/src/rgw/rgw_rados.cc +++ b/ceph/src/rgw/rgw_rados.cc @@ -758,15 +758,24 @@ int RGWObjManifest::append(RGWObjManifest& m) next_rule.part_size = m.obj_size - next_rule.start_ofs; } - if (override_prefix != rule.override_prefix) { - append_rules(m, miter, &override_prefix); - break; + string rule_prefix = prefix; + if (!rule.override_prefix.empty()) { + rule_prefix = rule.override_prefix; + } + + string next_rule_prefix = m.prefix; + if (!next_rule.override_prefix.empty()) { + next_rule_prefix = next_rule.override_prefix; } if (rule.part_size != next_rule.part_size || rule.stripe_max_size != next_rule.stripe_max_size || - rule.override_prefix != next_rule.override_prefix) { - append_rules(m, miter, NULL); + rule_prefix != next_rule_prefix) { + if (next_rule_prefix != prefix) { + append_rules(m, miter, &next_rule_prefix); + } else { + append_rules(m, miter, NULL); + } break; } @@ -2417,6 +2426,7 @@ int RGWRados::create_bucket(RGWUserInfo& owner, rgw_bucket& bucket, ret = put_linked_bucket_info(info, exclusive, 0, pep_objv, &attrs, true); if (ret == -EEXIST) { /* we need to reread the info and return it, caller will have a use for it */ + RGWObjVersionTracker instance_ver = info.objv_tracker; info.objv_tracker.clear(); r = get_bucket_info(NULL, bucket.name, info, NULL, NULL); if (r < 0) { @@ -2432,7 +2442,7 @@ int RGWRados::create_bucket(RGWUserInfo& owner, rgw_bucket& bucket, /* remove bucket meta instance */ string entry; get_bucket_instance_entry(bucket, entry); - r = rgw_bucket_instance_remove_entry(this, entry, &info.objv_tracker); + r = rgw_bucket_instance_remove_entry(this, entry, &instance_ver); if (r < 0) return r; @@ -3523,6 +3533,31 @@ int RGWRados::copy_obj_data(void *ctx, return ret; } +/** + * Check to see if the bucket metadata could be synced + * bucket: the bucket to check + * Returns false is the bucket is not synced + */ +bool RGWRados::is_syncing_bucket_meta(rgw_bucket& bucket) +{ + /* region is not master region */ + if (!region.is_master) { + return false; + } + + /* single region and a single zone */ + if (region_map.regions.size() == 1 && region.zones.size() == 1) { + return false; + } + + /* zone is not master */ + if (region.master_zone.compare(zone_name) != 0) { + return false; + } + + return true; +} + /** * Delete a bucket. * bucket: the name of the bucket to delete @@ -3562,6 +3597,16 @@ int RGWRados::delete_bucket(rgw_bucket& bucket, RGWObjVersionTracker& objv_track if (r < 0) return r; + /* if the bucked is not synced we can remove the meta file */ + if (!is_syncing_bucket_meta(bucket)) { + RGWObjVersionTracker objv_tracker; + string entry; + get_bucket_instance_entry(bucket, entry); + r= rgw_bucket_instance_remove_entry(this, entry, &objv_tracker); + if (r < 0) { + return r; + } + } return 0; } @@ -4162,10 +4207,18 @@ int RGWRados::set_attrs(void *ctx, rgw_obj& obj, return 0; string tag; + bufferlist bl; if (state) { - r = prepare_update_index(state, bucket, CLS_RGW_OP_ADD, obj, tag); + /* we don't pass state here, because we need to generate a new tag, not reuse the + * same tag, otherwise we might race and clobber another operation on the same object + */ + r = prepare_update_index(NULL, bucket, CLS_RGW_OP_ADD, obj, tag); if (r < 0) return r; + + bl.append(tag.c_str(), tag.size() + 1); + + op.setxattr(RGW_ATTR_ID_TAG, bl); } r = ref.ioctx.operate(ref.oid, &op); @@ -4192,6 +4245,7 @@ int RGWRados::set_attrs(void *ctx, rgw_obj& obj, return r; if (state) { + state->obj_tag.swap(bl); if (rmattrs) { for (iter = rmattrs->begin(); iter != rmattrs->end(); ++iter) { state->attrset.erase(iter->first); @@ -5954,7 +6008,7 @@ int RGWRados::cls_obj_complete_cancel(rgw_bucket& bucket, string& tag, string& n { RGWObjEnt ent; ent.name = name; - return cls_obj_complete_op(bucket, CLS_RGW_OP_ADD, tag, -1 /* pool id */, 0, ent, RGW_OBJ_CATEGORY_NONE, NULL); + return cls_obj_complete_op(bucket, CLS_RGW_OP_CANCEL, tag, -1 /* pool id */, 0, ent, RGW_OBJ_CATEGORY_NONE, NULL); } int RGWRados::cls_obj_set_bucket_tag_timeout(rgw_bucket& bucket, uint64_t timeout) diff --git a/ceph/src/rgw/rgw_rados.h b/ceph/src/rgw/rgw_rados.h index ff161b83..5eee4309 100644 --- a/ceph/src/rgw/rgw_rados.h +++ b/ceph/src/rgw/rgw_rados.h @@ -269,6 +269,12 @@ public: ::decode(rules, bl); } else { explicit_objs = true; + if (!objs.empty()) { + map::iterator iter = objs.begin(); + head_obj = iter->second.loc; + head_size = iter->second.size; + max_head_size = head_size; + } } if (struct_v >= 4) { @@ -1208,6 +1214,7 @@ class RGWRados GetObjState() : sent_data(false) {} }; + atomic64_t max_req_id; Mutex lock; SafeTimer *timer; @@ -1296,7 +1303,7 @@ protected: RGWQuotaHandler *quota_handler; public: - RGWRados() : lock("rados_timer_lock"), timer(NULL), + RGWRados() : max_req_id(0), lock("rados_timer_lock"), timer(NULL), gc(NULL), use_gc_thread(false), quota_threads(false), num_watchers(0), watchers(NULL), watch_handles(NULL), watch_initialized(false), @@ -1307,6 +1314,10 @@ public: rest_master_conn(NULL), meta_mgr(NULL), data_log(NULL) {} + uint64_t get_new_req_id() { + return max_req_id.inc(); + } + void set_context(CephContext *_cct) { cct = _cct; } @@ -1590,6 +1601,11 @@ public: */ virtual int delete_bucket(rgw_bucket& bucket, RGWObjVersionTracker& objv_tracker); + /** + * Check to see if the bucket metadata is synced + */ + bool is_syncing_bucket_meta(rgw_bucket& bucket); + int set_bucket_owner(rgw_bucket& bucket, ACLOwner& owner); int set_buckets_enabled(std::vector& buckets, bool enabled); int bucket_suspended(rgw_bucket& bucket, bool *suspended); diff --git a/ceph/src/rgw/rgw_rest.cc b/ceph/src/rgw/rgw_rest.cc index 59026fbc..13d1643f 100644 --- a/ceph/src/rgw/rgw_rest.cc +++ b/ceph/src/rgw/rgw_rest.cc @@ -76,10 +76,10 @@ string lowercase_underscore_http_attr(const string& orig) for (size_t i = 0; i < orig.size(); ++i, ++s) { switch (*s) { case '-': - buf[i] = '_'; - break; + buf[i] = '_'; + break; default: - buf[i] = tolower(*s); + buf[i] = tolower(*s); } } return string(buf); @@ -98,10 +98,32 @@ string uppercase_underscore_http_attr(const string& orig) for (size_t i = 0; i < orig.size(); ++i, ++s) { switch (*s) { case '-': - buf[i] = '_'; - break; + buf[i] = '_'; + break; default: - buf[i] = toupper(*s); + buf[i] = toupper(*s); + } + } + return string(buf); +} + +/* + * make attrs look-like-this + * converts underscores to dashes + */ +string lowercase_dash_http_attr(const string& orig) +{ + const char *s = orig.c_str(); + char buf[orig.size() + 1]; + buf[orig.size()] = '\0'; + + for (size_t i = 0; i < orig.size(); ++i, ++s) { + switch (*s) { + case '_': + buf[i] = '-'; + break; + default: + buf[i] = tolower(*s); } } return string(buf); @@ -122,15 +144,15 @@ string camelcase_dash_http_attr(const string& orig) for (size_t i = 0; i < orig.size(); ++i, ++s) { switch (*s) { case '_': - buf[i] = '-'; - last_sep = true; - break; + buf[i] = '-'; + last_sep = true; + break; default: - if (last_sep) - buf[i] = toupper(*s); - else - buf[i] = tolower(*s); - last_sep = false; + if (last_sep) + buf[i] = toupper(*s); + else + buf[i] = tolower(*s); + last_sep = false; } } return string(buf); @@ -272,8 +294,11 @@ void dump_bucket_from_state(struct req_state *s) { int expose_bucket = g_conf->rgw_expose_bucket; if (expose_bucket) { - if (!s->bucket_name_str.empty()) - s->cio->print("Bucket: \"%s\"\r\n", s->bucket_name_str.c_str()); + if (!s->bucket_name_str.empty()) { + string b; + url_encode(s->bucket_name_str, b); + s->cio->print("Bucket: %s\r\n", b.c_str()); + } } } @@ -405,7 +430,8 @@ void dump_start(struct req_state *s) } } -void end_header(struct req_state *s, RGWOp *op, const char *content_type) +void end_header(struct req_state *s, RGWOp *op, const char *content_type, const int64_t proposed_content_length, + bool force_content_type) { string ctype; @@ -413,7 +439,13 @@ void end_header(struct req_state *s, RGWOp *op, const char *content_type) dump_access_control(s, op); } - if (!content_type || s->err.is_err()) { + if (s->prot_flags & RGW_REST_SWIFT && !content_type) { + force_content_type = true; + } + + /* do not send content type if content length is zero + and the content type was not set by the user */ + if (force_content_type || (!content_type && s->formatter->get_len() != 0) || s->err.is_err()){ switch (s->format) { case RGW_FORMAT_XML: ctype = "application/xml"; @@ -438,10 +470,18 @@ void end_header(struct req_state *s, RGWOp *op, const char *content_type) s->formatter->dump_string("Message", s->err.message); s->formatter->close_section(); dump_content_length(s, s->formatter->get_len()); + } else { + if (proposed_content_length != NO_CONTENT_LENGTH) { + dump_content_length(s, proposed_content_length); + } } - int r = s->cio->print("Content-type: %s\r\n", content_type); - if (r < 0) { - ldout(s->cct, 0) << "ERROR: s->cio->print() returned err=" << r << dendl; + + int r; + if (content_type) { + r = s->cio->print("Content-Type: %s\r\n", content_type); + if (r < 0) { + ldout(s->cct, 0) << "ERROR: s->cio->print() returned err=" << r << dendl; + } } r = s->cio->complete_header(); if (r < 0) { @@ -1218,10 +1258,21 @@ int RGWREST::preprocess(struct req_state *s, RGWClientIO *cio) url_decode(s->info.request_uri, s->decoded_uri); s->length = info.env->get("CONTENT_LENGTH"); if (s->length) { - if (*s->length == '\0') + if (*s->length == '\0') { s->content_length = 0; - else - s->content_length = atoll(s->length); + } else { + string err; + s->content_length = strict_strtoll(s->length, 10, &err); + if (!err.empty()) { + ldout(s->cct, 10) << "bad content length, aborting" << dendl; + return -EINVAL; + } + } + } + + if (s->content_length < 0) { + ldout(s->cct, 10) << "negative content length, aborting" << dendl; + return -EINVAL; } map::iterator giter; diff --git a/ceph/src/rgw/rgw_rest.h b/ceph/src/rgw/rgw_rest.h index d42ec8d1..0624e4f7 100644 --- a/ceph/src/rgw/rgw_rest.h +++ b/ceph/src/rgw/rgw_rest.h @@ -12,6 +12,8 @@ extern std::map rgw_to_http_attrs; extern void rgw_rest_init(CephContext *cct); +extern string lowercase_dash_http_attr(const string& orig); + extern void rgw_flush_formatter_and_reset(struct req_state *s, ceph::Formatter *formatter); @@ -352,10 +354,16 @@ public: } }; +static const int64_t NO_CONTENT_LENGTH = -1; + extern void set_req_state_err(struct req_state *s, int err_no); extern void dump_errno(struct req_state *s); extern void dump_errno(struct req_state *s, int ret); -extern void end_header(struct req_state *s, RGWOp *op = NULL, const char *content_type = NULL); +extern void end_header(struct req_state *s, + RGWOp *op = NULL, + const char *content_type = NULL, + const int64_t proposed_content_length = NO_CONTENT_LENGTH, + bool force_content_type = false); extern void dump_start(struct req_state *s); extern void list_all_buckets_start(struct req_state *s); extern void dump_owner(struct req_state *s, string& id, string& name, const char *section = NULL); diff --git a/ceph/src/rgw/rgw_rest_s3.cc b/ceph/src/rgw/rgw_rest_s3.cc index 6fcecf7a..83144ef2 100644 --- a/ceph/src/rgw/rgw_rest_s3.cc +++ b/ceph/src/rgw/rgw_rest_s3.cc @@ -960,38 +960,64 @@ int RGWPostObj_ObjStore_S3::get_policy() ret = rgw_get_user_info_by_access_key(store, s3_access_key, user_info); if (ret < 0) { - ldout(s->cct, 0) << "User lookup failed!" << dendl; - err_msg = "Bad access key / signature"; - return -EACCES; - } + // Try keystone authentication as well + int keystone_result = -EINVAL; + if (!store->ctx()->_conf->rgw_s3_auth_use_keystone || + store->ctx()->_conf->rgw_keystone_url.empty()) { + return -EACCES; + } + dout(20) << "s3 keystone: trying keystone auth" << dendl; - map access_keys = user_info.access_keys; + RGW_Auth_S3_Keystone_ValidateToken keystone_validator(store->ctx()); + keystone_result = keystone_validator.validate_s3token(s3_access_key,string(encoded_policy.c_str(),encoded_policy.length()),received_signature_str); - map::const_iterator iter = access_keys.find(s3_access_key); - // We know the key must exist, since the user was returned by - // rgw_get_user_info_by_access_key, but it doesn't hurt to check! - if (iter == access_keys.end()) { - ldout(s->cct, 0) << "Secret key lookup failed!" << dendl; - err_msg = "No secret key for matching access key"; - return -EACCES; - } - string s3_secret_key = (iter->second).key; - - char expected_signature_char[CEPH_CRYPTO_HMACSHA1_DIGESTSIZE]; - - calc_hmac_sha1(s3_secret_key.c_str(), s3_secret_key.size(), encoded_policy.c_str(), encoded_policy.length(), expected_signature_char); - bufferlist expected_signature_hmac_raw; - bufferlist expected_signature_hmac_encoded; - expected_signature_hmac_raw.append(expected_signature_char, CEPH_CRYPTO_HMACSHA1_DIGESTSIZE); - expected_signature_hmac_raw.encode_base64(expected_signature_hmac_encoded); - expected_signature_hmac_encoded.append((char)0); /* null terminate */ - - if (received_signature_str.compare(expected_signature_hmac_encoded.c_str()) != 0) { - ldout(s->cct, 0) << "Signature verification failed!" << dendl; - ldout(s->cct, 0) << "received: " << received_signature_str.c_str() << dendl; - ldout(s->cct, 0) << "expected: " << expected_signature_hmac_encoded.c_str() << dendl; - err_msg = "Bad access key / signature"; - return -EACCES; + if (keystone_result < 0) { + ldout(s->cct, 0) << "User lookup failed!" << dendl; + err_msg = "Bad access key / signature"; + return -EACCES; + } + + user_info.user_id = keystone_validator.response.token.tenant.id; + user_info.display_name = keystone_validator.response.token.tenant.name; + + /* try to store user if it not already exists */ + if (rgw_get_user_info_by_uid(store, keystone_validator.response.token.tenant.id, user_info) < 0) { + int ret = rgw_store_user_info(store, user_info, NULL, NULL, 0, true); + if (ret < 0) { + dout(10) << "NOTICE: failed to store new user's info: ret=" << ret << dendl; + } + + s->perm_mask = RGW_PERM_FULL_CONTROL; + } + } else { + map access_keys = user_info.access_keys; + + map::const_iterator iter = access_keys.find(s3_access_key); + // We know the key must exist, since the user was returned by + // rgw_get_user_info_by_access_key, but it doesn't hurt to check! + if (iter == access_keys.end()) { + ldout(s->cct, 0) << "Secret key lookup failed!" << dendl; + err_msg = "No secret key for matching access key"; + return -EACCES; + } + string s3_secret_key = (iter->second).key; + + char expected_signature_char[CEPH_CRYPTO_HMACSHA1_DIGESTSIZE]; + + calc_hmac_sha1(s3_secret_key.c_str(), s3_secret_key.size(), encoded_policy.c_str(), encoded_policy.length(), expected_signature_char); + bufferlist expected_signature_hmac_raw; + bufferlist expected_signature_hmac_encoded; + expected_signature_hmac_raw.append(expected_signature_char, CEPH_CRYPTO_HMACSHA1_DIGESTSIZE); + expected_signature_hmac_raw.encode_base64(expected_signature_hmac_encoded); + expected_signature_hmac_encoded.append((char)0); /* null terminate */ + + if (received_signature_str.compare(expected_signature_hmac_encoded.c_str()) != 0) { + ldout(s->cct, 0) << "Signature verification failed!" << dendl; + ldout(s->cct, 0) << "received: " << received_signature_str.c_str() << dendl; + ldout(s->cct, 0) << "expected: " << expected_signature_hmac_encoded.c_str() << dendl; + err_msg = "Bad access key / signature"; + return -EACCES; + } } ldout(s->cct, 0) << "Successful Signature Verification!" << dendl; bufferlist decoded_policy; @@ -1300,6 +1326,7 @@ void RGWGetACLs_ObjStore_S3::send_response() dump_errno(s); end_header(s, this, "application/xml"); dump_start(s); + rgw_flush_formatter(s, s->formatter); s->cio->write(acls.c_str(), acls.size()); } @@ -2115,7 +2142,18 @@ int RGW_Auth_S3::authorize(RGWRados *store, struct req_state *s) } else { keystone_result = keystone_validator.validate_s3token(auth_id, token, auth_sign); if (keystone_result == 0) { - s->user.user_id = keystone_validator.response.token.tenant.id; + // Check for time skew first + time_t req_sec = s->header_time.sec(); + + if ((req_sec < now - RGW_AUTH_GRACE_MINS * 60 || + req_sec > now + RGW_AUTH_GRACE_MINS * 60) && !qsr) { + dout(10) << "req_sec=" << req_sec << " now=" << now << "; now - RGW_AUTH_GRACE_MINS=" << now - RGW_AUTH_GRACE_MINS * 60 << "; now + RGW_AUTH_GRACE_MINS=" << now + RGW_AUTH_GRACE_MINS * 60 << dendl; + dout(0) << "NOTICE: request time skew too big now=" << utime_t(now, 0) << " req_time=" << s->header_time << dendl; + return -ERR_REQUEST_TIME_SKEWED; + } + + + s->user.user_id = keystone_validator.response.token.tenant.id; s->user.display_name = keystone_validator.response.token.tenant.name; // wow. /* try to store user if it not already exists */ diff --git a/ceph/src/rgw/rgw_rest_swift.cc b/ceph/src/rgw/rgw_rest_swift.cc index 36544dbb..4e4475a8 100644 --- a/ceph/src/rgw/rgw_rest_swift.cc +++ b/ceph/src/rgw/rgw_rest_swift.cc @@ -51,8 +51,11 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_begin(bool has_buckets) ret = STATUS_NO_CONTENT; set_req_state_err(s, ret); } - dump_errno(s); - end_header(s, NULL); + + if (!g_conf->rgw_swift_enforce_content_length) { + dump_errno(s); + end_header(s, NULL, NULL, NO_CONTENT_LENGTH, true); + } if (!ret) { dump_start(s); @@ -79,7 +82,9 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_data(RGWUserBuckets& buckets) s->formatter->dump_int("bytes", obj.size); } s->formatter->close_section(); - rgw_flush_formatter(s, s->formatter); + if (!g_conf->rgw_swift_enforce_content_length) { + rgw_flush_formatter(s, s->formatter); + } } } @@ -87,6 +92,14 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_end() { if (sent_data) { s->formatter->close_section(); + } + + if (g_conf->rgw_swift_enforce_content_length) { + dump_errno(s); + end_header(s, NULL, NULL, s->formatter->get_len(), true); + } + + if (sent_data || g_conf->rgw_swift_enforce_content_length) { rgw_flush_formatter_and_reset(s, s->formatter); } } @@ -204,14 +217,19 @@ next: s->formatter->close_section(); - if (!ret && s->formatter->get_len() == 0) - ret = STATUS_NO_CONTENT; - else if (ret > 0) + int64_t content_len = 0; + if (!ret) { + content_len = s->formatter->get_len(); + if (content_len == 0) { + ret = STATUS_NO_CONTENT; + } + } else if (ret > 0) { ret = 0; + } set_req_state_err(s, ret); dump_errno(s); - end_header(s, this); + end_header(s, this, NULL, content_len); if (ret < 0) { return; } @@ -239,6 +257,17 @@ static void dump_container_metadata(struct req_state *s, RGWBucketEnt& bucket) if (write_acl.size()) { s->cio->print("X-Container-Write: %s\r\n", write_acl.c_str()); } + // Dump user-defined metadata items + const size_t PREFIX_LEN = sizeof(RGW_ATTR_META_PREFIX) - 1; + map::iterator iter; + for (iter = s->bucket_attrs.lower_bound(RGW_ATTR_META_PREFIX); iter != s->bucket_attrs.end(); ++iter) { + const char *name = iter->first.c_str(); + if (strncmp(name, RGW_ATTR_META_PREFIX, PREFIX_LEN) == 0) { + s->cio->print("X-Container-Meta-%s: %s\r\n", name + PREFIX_LEN, iter->second.c_str()); + } else { + break; + } + } } } @@ -266,7 +295,8 @@ void RGWStatAccount_ObjStore_SWIFT::send_response() set_req_state_err(s, ret); dump_errno(s); - end_header(s, NULL); + end_header(s, NULL, NULL, 0, true); + dump_start(s); } @@ -280,7 +310,7 @@ void RGWStatBucket_ObjStore_SWIFT::send_response() set_req_state_err(s, ret); dump_errno(s); - end_header(s, this); + end_header(s, this,NULL,0, true); dump_start(s); } @@ -360,7 +390,8 @@ void RGWCreateBucket_ObjStore_SWIFT::send_response() ret = STATUS_ACCEPTED; set_req_state_err(s, ret); dump_errno(s); - end_header(s, NULL); + /* Propose ending HTTP header with 0 Content-Length header. */ + end_header(s, NULL, NULL, 0); rgw_flush_formatter_and_reset(s, s->formatter); } @@ -372,7 +403,7 @@ void RGWDeleteBucket_ObjStore_SWIFT::send_response() set_req_state_err(s, r); dump_errno(s); - end_header(s, this); + end_header(s, this, NULL, 0); rgw_flush_formatter_and_reset(s, s->formatter); } @@ -424,6 +455,11 @@ void RGWPutObj_ObjStore_SWIFT::send_response() rgw_flush_formatter_and_reset(s, s->formatter); } +#define REMOVE_ATTR_PREFIX "HTTP_X_REMOVE_CONTAINER_META_" +#define PUT_ATTR_PREFIX "HTTP_X_CONTAINER_META_" +#define REMOVE_ATTR_PREFIX_LEN sizeof(REMOVE_ATTR_PREFIX) - 1 +#define PUT_ATTR_PREFIX_LEN sizeof(PUT_ATTR_PREFIX) - 1 + int RGWPutMetadata_ObjStore_SWIFT::get_params() { if (s->has_bad_meta) @@ -434,6 +470,24 @@ int RGWPutMetadata_ObjStore_SWIFT::get_params() if (r < 0) { return r; } + map& m = s->info.env->get_map(); + map::iterator iter; + for (iter = m.begin(); iter != m.end(); ++iter) { + size_t prefix_len = 0; + const char *p = iter->first.c_str(); + if (strncasecmp(p, REMOVE_ATTR_PREFIX, REMOVE_ATTR_PREFIX_LEN) == 0) { + // Explicitly requested removal + prefix_len = REMOVE_ATTR_PREFIX_LEN; + } else if ((strncasecmp(p, PUT_ATTR_PREFIX, PUT_ATTR_PREFIX_LEN) == 0) && iter->second.empty()) { + // Removal requested by putting an empty value + prefix_len = PUT_ATTR_PREFIX_LEN; + } + if (prefix_len > 0) { + string name(RGW_ATTR_META_PREFIX); + name.append(lowercase_dash_http_attr(p + prefix_len)); + rmattr_names.insert(name); + } + } } return 0; @@ -563,6 +617,7 @@ int RGWGetObj_ObjStore_SWIFT::send_response_data(bufferlist& bl, off_t bl_ofs, o dump_content_length(s, total_len); dump_last_modified(s, lastmod); + s->cio->print("X-Timestamp: %lld\r\n", (long long)lastmod); if (!ret) { map::iterator iter = attrs.find(RGW_ATTR_ETAG); @@ -578,15 +633,15 @@ int RGWGetObj_ObjStore_SWIFT::send_response_data(bufferlist& bl, off_t bl_ofs, o const char *name = iter->first.c_str(); map::iterator aiter = rgw_to_http_attrs.find(name); if (aiter != rgw_to_http_attrs.end()) { - if (aiter->first.compare(RGW_ATTR_CONTENT_TYPE) == 0) { // special handling for content_type - content_type = iter->second.c_str(); - continue; + if (aiter->first.compare(RGW_ATTR_CONTENT_TYPE) == 0) { // special handling for content_type + content_type = iter->second.c_str(); + continue; } response_attrs[aiter->second] = iter->second.c_str(); } else { if (strncmp(name, RGW_ATTR_META_PREFIX, sizeof(RGW_ATTR_META_PREFIX)-1) == 0) { name += sizeof(RGW_ATTR_META_PREFIX) - 1; - s->cio->print("X-%s-Meta-%s: %s\r\n", (s->object ? "Object" : "Container"), name, iter->second.c_str()); + s->cio->print("X-Object-Meta-%s: %s\r\n", name, iter->second.c_str()); } } } @@ -633,7 +688,7 @@ void RGWOptionsCORS_ObjStore_SWIFT::send_response() } get_response_params(hdrs, exp_hdrs, &max_age); dump_errno(s); - dump_access_control(s, origin, req_meth, hdrs.c_str(), exp_hdrs.c_str(), max_age); + dump_access_control(s, origin, req_meth, hdrs.c_str(), exp_hdrs.c_str(), max_age); end_header(s, NULL); } @@ -910,7 +965,7 @@ int RGWHandler_ObjStore_SWIFT::init_from_header(struct req_state *s) return 0; s->bucket_name_str = first; - + s->info.effective_uri = "/" + s->bucket_name_str; if (req.size()) { diff --git a/ceph/src/rgw/rgw_swift.cc b/ceph/src/rgw/rgw_swift.cc index 46c45bd9..6418f5b3 100644 --- a/ceph/src/rgw/rgw_swift.cc +++ b/ceph/src/rgw/rgw_swift.cc @@ -520,6 +520,13 @@ int RGWSwift::validate_keystone_token(RGWRados *store, const string& token, stru if (ret < 0) return ret; + if (t.expired()) { + ldout(cct, 0) << "got expired token: " << t.token.tenant.name << ":" << t.user.name << " expired: " << t.token.expires << dendl; + return -EPERM; + } + + keystone_token_cache->add(token_id, t); + ret = update_user_info(store, info, rgw_user); if (ret < 0) return ret; diff --git a/ceph/src/test/Makefile.am b/ceph/src/test/Makefile.am index 69f9e841..9ede2758 100644 --- a/ceph/src/test/Makefile.am +++ b/ceph/src/test/Makefile.am @@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd if LINUX ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm -ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format +ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} bin_DEBUGPROGRAMS += ceph_test_librbd_fsx endif diff --git a/ceph/src/test/bufferlist.cc b/ceph/src/test/bufferlist.cc index ff872389..9190d915 100644 --- a/ceph/src/test/bufferlist.cc +++ b/ceph/src/test/bufferlist.cc @@ -2093,6 +2093,17 @@ TEST(BufferList, zero) { bl.zero((unsigned)3, (unsigned)3); EXPECT_EQ(0, ::memcmp("ABC\0\0\0GHIKLM", bl.c_str(), 9)); } + { + bufferlist bl; + bufferptr ptr1(4); + bufferptr ptr2(4); + memset(ptr1.c_str(), 'a', 4); + memset(ptr2.c_str(), 'b', 4); + bl.append(ptr1); + bl.append(ptr2); + bl.zero((unsigned)2, (unsigned)4); + EXPECT_EQ(0, ::memcmp("aa\0\0\0\0bb", bl.c_str(), 8)); + } } TEST(BufferList, EmptyAppend) { diff --git a/ceph/src/test/librados/TestCase.cc b/ceph/src/test/librados/TestCase.cc index 7f072fd8..3747683b 100644 --- a/ceph/src/test/librados/TestCase.cc +++ b/ceph/src/test/librados/TestCase.cc @@ -91,7 +91,14 @@ void RadosTestPP::cleanup_default_namespace(librados::IoCtx ioctx) for (ObjectIterator it = ioctx.objects_begin(); it != ioctx.objects_end(); ++it) { ioctx.locator_set_key(it->second); - ASSERT_EQ(0, ioctx.remove(it->first)); + ObjectWriteOperation op; + op.remove(); + librados::AioCompletion *completion = s_cluster.aio_create_completion(); + ASSERT_EQ(0, ioctx.aio_operate(it->first, completion, &op, + librados::OPERATION_IGNORE_CACHE)); + completion->wait_for_safe(); + ASSERT_EQ(0, completion->get_return_value()); + completion->release(); } } diff --git a/ceph/src/test/librados/misc.cc b/ceph/src/test/librados/misc.cc index 38443ce1..259942a4 100644 --- a/ceph/src/test/librados/misc.cc +++ b/ceph/src/test/librados/misc.cc @@ -39,6 +39,25 @@ TEST(LibRadosMiscVersion, VersionPP) { Rados::version(&major, &minor, &extra); } +TEST(LibRadosMiscConnectFailure, ConnectFailure) { + rados_t cluster; + + char *id = getenv("CEPH_CLIENT_ID"); + if (id) + std::cerr << "Client id is: " << id << std::endl; + + ASSERT_EQ(0, rados_create(&cluster, NULL)); + ASSERT_EQ(0, rados_conf_read_file(cluster, NULL)); + ASSERT_EQ(0, rados_conf_parse_env(cluster, NULL)); + + ASSERT_EQ(0, rados_conf_set(cluster, "client_mount_timeout", "0.000001")); + + ASSERT_NE(0, rados_connect(cluster)); + ASSERT_NE(0, rados_connect(cluster)); + + rados_shutdown(cluster); +} + TEST_F(LibRadosMisc, ClusterFSID) { char fsid[37]; ASSERT_EQ(-ERANGE, rados_cluster_fsid(cluster, fsid, sizeof(fsid) - 1)); diff --git a/ceph/src/test/librados/tier.cc b/ceph/src/test/librados/tier.cc index a89d68b0..9f3df302 100644 --- a/ceph/src/test/librados/tier.cc +++ b/ceph/src/test/librados/tier.cc @@ -75,16 +75,15 @@ protected: static void SetUpTestCase() { pool_name = get_temp_pool_name(); ASSERT_EQ("", create_one_pool_pp(pool_name, s_cluster)); - cache_pool_name = get_temp_pool_name(); - ASSERT_EQ(0, s_cluster.pool_create(cache_pool_name.c_str())); } static void TearDownTestCase() { - ASSERT_EQ(0, s_cluster.pool_delete(cache_pool_name.c_str())); ASSERT_EQ(0, destroy_one_pool_pp(pool_name, s_cluster)); } static std::string cache_pool_name; virtual void SetUp() { + cache_pool_name = get_temp_pool_name(); + ASSERT_EQ(0, s_cluster.pool_create(cache_pool_name.c_str())); RadosTestPP::SetUp(); ASSERT_EQ(0, cluster.ioctx_create(cache_pool_name.c_str(), cache_ioctx)); cache_ioctx.set_namespace(ns); @@ -112,6 +111,7 @@ protected: cleanup_default_namespace(cache_ioctx); cache_ioctx.close(); + ASSERT_EQ(0, s_cluster.pool_delete(cache_pool_name.c_str())); } librados::IoCtx cache_ioctx; }; @@ -624,7 +624,24 @@ TEST_F(LibRadosTwoPoolsPP, Whiteout) { ASSERT_TRUE(it == cache_ioctx.objects_end()); } + // delete a whiteout and verify it goes away ASSERT_EQ(-ENOENT, ioctx.remove("foo")); + { + ObjectWriteOperation op; + op.remove(); + librados::AioCompletion *completion = cluster.aio_create_completion(); + ASSERT_EQ(0, ioctx.aio_operate("bar", completion, &op, + librados::OPERATION_IGNORE_CACHE)); + completion->wait_for_safe(); + ASSERT_EQ(0, completion->get_return_value()); + completion->release(); + + ObjectIterator it = cache_ioctx.objects_begin(); + ASSERT_TRUE(it != cache_ioctx.objects_end()); + ASSERT_TRUE(it->first == string("foo")); + ++it; + ASSERT_TRUE(it == cache_ioctx.objects_end()); + } // recreate an object and verify we can read it { @@ -2154,6 +2171,91 @@ TEST_F(LibRadosTwoPoolsPP, HitSetTrim) { } } +TEST_F(LibRadosTwoPoolsPP, PromoteOn2ndRead) { + // create object + { + bufferlist bl; + bl.append("hi there"); + 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)); + + // enable hitset tracking for this pool + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "hit_set_count", 2), + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "hit_set_period", 600), + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "hit_set_type", "bloom"), + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "min_read_recency_for_promote", 1), + inbl, NULL, NULL)); + + // wait for maps to settle + cluster.wait_for_latest_osdmap(); + + // 1st read, don't trigger a promote + { + bufferlist bl; + ASSERT_EQ(1, ioctx.read("foo", bl, 1, 0)); + } + + // verify the object is NOT present in the cache tier + { + ObjectIterator it = cache_ioctx.objects_begin(); + ASSERT_TRUE(it == cache_ioctx.objects_end()); + } + + // Read until the object is present in the cache tier + while (true) { + bufferlist bl; + ASSERT_EQ(1, ioctx.read("foo", bl, 1, 0)); + + ObjectIterator it = cache_ioctx.objects_begin(); + if (it != cache_ioctx.objects_end()) { + ASSERT_TRUE(it->first == string("foo")); + ++it; + ASSERT_TRUE(it == cache_ioctx.objects_end()); + break; + } + + sleep(1); + } + + // tear down tiers + ASSERT_EQ(0, cluster.mon_command( + "{\"prefix\": \"osd tier remove-overlay\", \"pool\": \"" + pool_name + + "\"}", + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + "{\"prefix\": \"osd tier remove\", \"pool\": \"" + pool_name + + "\", \"tierpool\": \"" + cache_pool_name + "\"}", + inbl, NULL, NULL)); + + // wait for maps to settle before next test + cluster.wait_for_latest_osdmap(); +} + class LibRadosTwoPoolsECPP : public RadosTestECPP { public: @@ -2163,16 +2265,15 @@ protected: static void SetUpTestCase() { pool_name = get_temp_pool_name(); ASSERT_EQ("", create_one_ec_pool_pp(pool_name, s_cluster)); - cache_pool_name = get_temp_pool_name(); - ASSERT_EQ(0, s_cluster.pool_create(cache_pool_name.c_str())); } static void TearDownTestCase() { - ASSERT_EQ(0, s_cluster.pool_delete(cache_pool_name.c_str())); ASSERT_EQ(0, destroy_one_ec_pool_pp(pool_name, s_cluster)); } static std::string cache_pool_name; virtual void SetUp() { + cache_pool_name = get_temp_pool_name(); + ASSERT_EQ(0, s_cluster.pool_create(cache_pool_name.c_str())); RadosTestECPP::SetUp(); ASSERT_EQ(0, cluster.ioctx_create(cache_pool_name.c_str(), cache_ioctx)); cache_ioctx.set_namespace(ns); @@ -2200,6 +2301,7 @@ protected: cleanup_default_namespace(cache_ioctx); cache_ioctx.close(); + ASSERT_EQ(0, s_cluster.pool_delete(cache_pool_name.c_str())); } librados::IoCtx cache_ioctx; @@ -2640,7 +2742,23 @@ TEST_F(LibRadosTwoPoolsECPP, Whiteout) { ASSERT_TRUE(it == cache_ioctx.objects_end()); } + // delete a whiteout and verify it goes away ASSERT_EQ(-ENOENT, ioctx.remove("foo")); + { + ObjectWriteOperation op; + op.remove(); + librados::AioCompletion *completion = cluster.aio_create_completion(); + ASSERT_EQ(0, ioctx.aio_operate("bar", completion, &op, + librados::OPERATION_IGNORE_CACHE)); + completion->wait_for_safe(); + ASSERT_EQ(0, completion->get_return_value()); + completion->release(); + + ObjectIterator it = cache_ioctx.objects_begin(); + ASSERT_TRUE(it != cache_ioctx.objects_end()); + ++it; + ASSERT_TRUE(it == cache_ioctx.objects_end()); + } // recreate an object and verify we can read it { @@ -4019,6 +4137,91 @@ TEST_F(LibRadosTwoPoolsECPP, HitSetTrim) { delete[] buf; } +TEST_F(LibRadosTwoPoolsECPP, PromoteOn2ndRead) { + // create object + { + bufferlist bl; + bl.append("hi there"); + 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)); + + // enable hitset tracking for this pool + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "hit_set_count", 2), + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "hit_set_period", 600), + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "hit_set_type", "bloom"), + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + set_pool_str(cache_pool_name, "min_read_recency_for_promote", 1), + inbl, NULL, NULL)); + + // wait for maps to settle + cluster.wait_for_latest_osdmap(); + + // 1st read, don't trigger a promote + { + bufferlist bl; + ASSERT_EQ(1, ioctx.read("foo", bl, 1, 0)); + } + + // verify the object is NOT present in the cache tier + { + ObjectIterator it = cache_ioctx.objects_begin(); + ASSERT_TRUE(it == cache_ioctx.objects_end()); + } + + // Read until the object is present in the cache tier + while (true) { + bufferlist bl; + ASSERT_EQ(1, ioctx.read("foo", bl, 1, 0)); + + ObjectIterator it = cache_ioctx.objects_begin(); + if (it != cache_ioctx.objects_end()) { + ASSERT_TRUE(it->first == string("foo")); + ++it; + ASSERT_TRUE(it == cache_ioctx.objects_end()); + break; + } + + sleep(1); + } + + // tear down tiers + ASSERT_EQ(0, cluster.mon_command( + "{\"prefix\": \"osd tier remove-overlay\", \"pool\": \"" + pool_name + + "\"}", + inbl, NULL, NULL)); + ASSERT_EQ(0, cluster.mon_command( + "{\"prefix\": \"osd tier remove\", \"pool\": \"" + pool_name + + "\", \"tierpool\": \"" + cache_pool_name + "\"}", + inbl, NULL, NULL)); + + // wait for maps to settle before next test + cluster.wait_for_latest_osdmap(); +} + int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/ceph/src/test/librbd/test_librbd.cc b/ceph/src/test/librbd/test_librbd.cc index c37d8846..867e197f 100644 --- a/ceph/src/test/librbd/test_librbd.cc +++ b/ceph/src/test/librbd/test_librbd.cc @@ -750,8 +750,16 @@ TEST(LibRBD, TestIO) ASSERT_EQ(10, rbd_write(image, info.size - 10, 100, test_data)); rbd_aio_create_completion(NULL, (rbd_callback_t) simple_read_cb, &comp); - ASSERT_EQ(-EINVAL, rbd_aio_write(image, info.size, 1, test_data, comp)); - ASSERT_EQ(-EINVAL, rbd_aio_read(image, info.size, 1, test_data, comp)); + ASSERT_EQ(0, rbd_aio_write(image, info.size, 1, test_data, comp)); + ASSERT_EQ(0, rbd_aio_wait_for_complete(comp)); + ASSERT_EQ(-EINVAL, rbd_aio_get_return_value(comp)); + rbd_aio_release(comp); + + rbd_aio_create_completion(NULL, (rbd_callback_t) simple_read_cb, &comp); + ASSERT_EQ(0, rbd_aio_read(image, info.size, 1, test_data, comp)); + ASSERT_EQ(0, rbd_aio_wait_for_complete(comp)); + ASSERT_EQ(-EINVAL, rbd_aio_get_return_value(comp)); + rbd_aio_release(comp); ASSERT_EQ(0, rbd_close(image)); @@ -1965,6 +1973,65 @@ TEST(LibRBD, TestPendingAio) ASSERT_EQ(0, destroy_one_pool(pool_name, &cluster)); } +TEST(LibRBD, BlockingAIO) +{ + librados::Rados rados; + librados::IoCtx ioctx; + string pool_name = get_temp_pool_name(); + + ASSERT_EQ("", create_one_pool_pp(pool_name, rados)); + ASSERT_EQ(0, rados.ioctx_create(pool_name.c_str(), ioctx)); + + librbd::RBD rbd; + std::string name = "testimg"; + uint64_t size = 1 << 20; + int order = 18; + ASSERT_EQ(0, create_image_pp(rbd, ioctx, name.c_str(), size, &order)); + + CephContext *cct = reinterpret_cast(ioctx.cct()); + cct->_conf->set_val_or_die("rbd_non_blocking_aio", "0"); + + librbd::Image image; + ASSERT_EQ(0, rbd.open(ioctx, image, name.c_str(), NULL)); + + bufferlist bl; + bl.append(std::string(256, '1')); + + librbd::RBD::AioCompletion *write_comp = + new librbd::RBD::AioCompletion(NULL, NULL); + ASSERT_EQ(0, image.aio_write(0, bl.length(), bl, write_comp)); + + librbd::RBD::AioCompletion *flush_comp = + new librbd::RBD::AioCompletion(NULL, NULL); + ASSERT_EQ(0, image.aio_flush(flush_comp)); + ASSERT_EQ(0, flush_comp->wait_for_complete()); + ASSERT_EQ(0, flush_comp->get_return_value()); + flush_comp->release(); + + ASSERT_EQ(1, write_comp->is_complete()); + ASSERT_EQ(0, write_comp->get_return_value()); + write_comp->release(); + + librbd::RBD::AioCompletion *discard_comp = + new librbd::RBD::AioCompletion(NULL, NULL); + ASSERT_EQ(0, image.aio_discard(128, 128, discard_comp)); + ASSERT_EQ(0, discard_comp->wait_for_complete()); + discard_comp->release(); + + librbd::RBD::AioCompletion *read_comp = + new librbd::RBD::AioCompletion(NULL, NULL); + bufferlist read_bl; + image.aio_read(0, bl.length(), read_bl, read_comp); + ASSERT_EQ(0, read_comp->wait_for_complete()); + ASSERT_EQ(bl.length(), read_comp->get_return_value()); + read_comp->release(); + + bufferlist expected_bl; + expected_bl.append(std::string(128, '1')); + expected_bl.append(std::string(128, '\0')); + ASSERT_TRUE(expected_bl.contents_equal(read_bl)); +} + int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/ceph/src/test/mon/moncap.cc b/ceph/src/test/mon/moncap.cc index d381319f..f9a0b5c0 100644 --- a/ceph/src/test/mon/moncap.cc +++ b/ceph/src/test/mon/moncap.cc @@ -177,7 +177,7 @@ TEST(MonCap, AllowAll) { ASSERT_TRUE(cap.parse("allow *", NULL)); ASSERT_TRUE(cap.is_allow_all()); - ASSERT_TRUE(cap.is_capable(NULL, entity_name_t::CLIENT(0), + ASSERT_TRUE(cap.is_capable(NULL, EntityName(), "foo", "asdf", map(), true, true, true)); MonCap cap2; @@ -191,7 +191,8 @@ TEST(MonCap, ProfileOSD) { bool r = cap.parse("allow profile osd", NULL); ASSERT_TRUE(r); - entity_name_t name = entity_name_t::OSD(123); + EntityName name; + name.from_str("osd.123"); map ca; ASSERT_TRUE(cap.is_capable(NULL, name, "osd", "", ca, true, false, false)); diff --git a/ceph/src/test/mon/test_mon_workloadgen.cc b/ceph/src/test/mon/test_mon_workloadgen.cc index 3c6ff562..d1659d6d 100644 --- a/ceph/src/test/mon/test_mon_workloadgen.cc +++ b/ceph/src/test/mon/test_mon_workloadgen.cc @@ -247,8 +247,7 @@ class ClientStub : public TestStub return err; } - messenger.reset(Messenger::create(cct, entity_name_t::CLIENT(-1), - "stubclient", getpid())); + messenger.reset(Messenger::create_client_messenger(cct, "stubclient")); assert(messenger.get() != NULL); messenger->set_default_policy( diff --git a/ceph/src/test/objectstore/chain_xattr.cc b/ceph/src/test/objectstore/chain_xattr.cc index 8346c02b..7c089621 100644 --- a/ceph/src/test/objectstore/chain_xattr.cc +++ b/ceph/src/test/objectstore/chain_xattr.cc @@ -29,6 +29,7 @@ #include #define LARGE_BLOCK_LEN CHAIN_XATTR_MAX_BLOCK_LEN + 1024 +#define FILENAME "bufferlist" TEST(chain_xattr, get_and_set) { const char* file = "testfile"; @@ -147,6 +148,44 @@ TEST(chain_xattr, get_and_set) { ::unlink(file); } +TEST(chain_xattr, chunk_aligned) { + const char* file = FILENAME; + ::unlink(file); + int fd = ::open(file, O_CREAT|O_WRONLY|O_TRUNC, 0700); + const string user("user."); + + // set N* chunk size + const string name = "user.foo"; + const string name2 = "user.bar"; + + for (int len = CHAIN_XATTR_MAX_BLOCK_LEN - 10; + len < CHAIN_XATTR_MAX_BLOCK_LEN + 10; + ++len) { + cout << len << std::endl; + const string x(len, 'x'); + char buf[len*2]; + ASSERT_EQ(len, chain_setxattr(file, name.c_str(), x.c_str(), len)); + char attrbuf[4096]; + int l = ceph_os_listxattr(file, attrbuf, sizeof(attrbuf)); + for (char *p = attrbuf; p - attrbuf < l; p += strlen(p) + 1) { + cout << " attr " << p << std::endl; + } + ASSERT_EQ(len, chain_getxattr(file, name.c_str(), buf, len*2)); + ASSERT_EQ(0, chain_removexattr(file, name.c_str())); + + ASSERT_EQ(len, chain_fsetxattr(fd, name2.c_str(), x.c_str(), len)); + l = ceph_os_flistxattr(fd, attrbuf, sizeof(attrbuf)); + for (char *p = attrbuf; p - attrbuf < l; p += strlen(p) + 1) { + cout << " attr " << p << std::endl; + } + ASSERT_EQ(len, chain_fgetxattr(fd, name2.c_str(), buf, len*2)); + ASSERT_EQ(0, chain_fremovexattr(fd, name2.c_str())); + } + + ::close(fd); + ::unlink(file); +} + TEST(chain_xattr, listxattr) { const char* file = "testfile"; ::unlink(file); diff --git a/ceph/src/test/objectstore/test_idempotent_sequence.cc b/ceph/src/test/objectstore/test_idempotent_sequence.cc index 3ef2c799..df502f8b 100644 --- a/ceph/src/test/objectstore/test_idempotent_sequence.cc +++ b/ceph/src/test/objectstore/test_idempotent_sequence.cc @@ -79,8 +79,8 @@ std::string status_file; int run_diff(std::string& a_path, std::string& a_journal, std::string& b_path, std::string& b_journal) { - FileStore *a = new FileStore(a_path, a_journal, "a"); - FileStore *b = new FileStore(b_path, b_journal, "b"); + FileStore *a = new FileStore(a_path, a_journal, 0, "a"); + FileStore *b = new FileStore(b_path, b_journal, 0, "b"); int ret = 0; { diff --git a/ceph/src/test/osd/TestPGLog.cc b/ceph/src/test/osd/TestPGLog.cc index c2063b89..6dc6beca 100644 --- a/ceph/src/test/osd/TestPGLog.cc +++ b/ceph/src/test/osd/TestPGLog.cc @@ -138,6 +138,14 @@ public: fullauth.index(); fulldiv.index(); } + void set_div_bounds(eversion_t head, eversion_t tail) { + fulldiv.tail = divinfo.log_tail = tail; + fulldiv.head = divinfo.last_update = head; + } + void set_auth_bounds(eversion_t head, eversion_t tail) { + fullauth.tail = authinfo.log_tail = tail; + fullauth.head = authinfo.last_update = head; + } const IndexedLog &get_fullauth() const { return fullauth; } const IndexedLog &get_fulldiv() const { return fulldiv; } const pg_info_t &get_authinfo() const { return authinfo; } @@ -235,6 +243,8 @@ public: proc_replica_log( t, oinfo, olog, omissing, pg_shard_t(1, 0)); + assert(oinfo.last_update >= log.tail); + if (!tcase.base.empty()) { ASSERT_EQ(tcase.base.rbegin()->version, oinfo.last_update); } @@ -1270,8 +1280,8 @@ TEST_F(PGLogTest, proc_replica_log) { pg_shard_t from; eversion_t last_update(1, 1); - oinfo.last_update = last_update; - eversion_t last_complete(2, 1); + log.head = olog.head = oinfo.last_update = last_update; + eversion_t last_complete(1, 1); oinfo.last_complete = last_complete; EXPECT_TRUE(t.empty()); @@ -1470,12 +1480,12 @@ TEST_F(PGLogTest, proc_replica_log) { } /* +--------------------------+ - | log olog | + | olog log | +--------+-------+---------+ | |object | | |version | hash | version | | | | | - tail > (1,1) | x5 | (1,1) < tail + tail > (1,1) | x9 | (1,1) < tail | | | | | | | | | (1,2) | x3 | (1,2) | @@ -1503,34 +1513,38 @@ TEST_F(PGLogTest, proc_replica_log) { pg_shard_t from; eversion_t last_update(1, 2); + hobject_t divergent_object; + divergent_object.hash = 0x9; { pg_log_entry_t e; e.mod_desc.mark_unrollbackable(); e.version = eversion_t(1, 1); - e.soid.hash = 0x5; + e.soid = divergent_object; log.tail = e.version; log.log.push_back(e); e.version = last_update; e.soid.hash = 0x3; log.log.push_back(e); - e.version = eversion_t(1,3); - e.soid.hash = 0x9; + e.version = eversion_t(2, 3); + e.prior_version = eversion_t(1, 1); + e.soid = divergent_object; e.op = pg_log_entry_t::DELETE; log.log.push_back(e); log.head = e.version; log.index(); e.version = eversion_t(1, 1); - e.soid.hash = 0x5; + e.soid = divergent_object; olog.tail = e.version; olog.log.push_back(e); e.version = last_update; e.soid.hash = 0x3; olog.log.push_back(e); - e.version = eversion_t(2, 3); - e.soid.hash = 0x9; + e.version = eversion_t(1, 3); + e.prior_version = eversion_t(1, 1); + e.soid = divergent_object; e.op = pg_log_entry_t::DELETE; olog.log.push_back(e); olog.head = e.version; @@ -1547,28 +1561,30 @@ TEST_F(PGLogTest, proc_replica_log) { proc_replica_log(t, oinfo, olog, omissing, from); EXPECT_TRUE(t.empty()); - EXPECT_FALSE(omissing.have_missing()); + EXPECT_TRUE(omissing.have_missing()); + EXPECT_TRUE(omissing.is_missing(divergent_object)); + EXPECT_EQ(omissing.missing[divergent_object].have, eversion_t(0, 0)); + EXPECT_EQ(omissing.missing[divergent_object].need, eversion_t(1, 1)); EXPECT_EQ(last_update, oinfo.last_update); - EXPECT_EQ(last_update, oinfo.last_complete); } /* +--------------------------+ - | log olog | + | olog log | +--------+-------+---------+ | |object | | |version | hash | version | | | | | - tail > (1,1) | x5 | (1,1) < tail + tail > (1,1) | x9 | (1,1) < tail | | | | | | | | | (1,2) | x3 | (1,2) | | | | | | | | | head > (1,3) | x9 | | - | DELETE | | | + | MODIFY | | | | | | | | | x9 | (2,3) < head - | | | MODIFY | + | | | DELETE | | | | | +--------+-------+---------+ @@ -1593,28 +1609,30 @@ TEST_F(PGLogTest, proc_replica_log) { e.mod_desc.mark_unrollbackable(); e.version = eversion_t(1, 1); - e.soid.hash = 0x5; + e.soid = divergent_object; log.tail = e.version; log.log.push_back(e); e.version = last_update; e.soid.hash = 0x3; log.log.push_back(e); - e.version = eversion_t(1, 3); - e.soid.hash = 0x9; + e.version = eversion_t(2, 3); + e.prior_version = eversion_t(1, 1); + e.soid = divergent_object; e.op = pg_log_entry_t::DELETE; log.log.push_back(e); log.head = e.version; log.index(); e.version = eversion_t(1, 1); - e.soid.hash = 0x5; + e.soid = divergent_object; olog.tail = e.version; olog.log.push_back(e); e.version = last_update; e.soid.hash = 0x3; olog.log.push_back(e); - e.version = eversion_t(2, 3); - e.soid.hash = 0x9; + e.version = eversion_t(1, 3); + e.prior_version = eversion_t(1, 1); + e.soid = divergent_object; divergent_object = e.soid; omissing.add(divergent_object, e.version, eversion_t()); e.op = pg_log_entry_t::MODIFY; @@ -1628,16 +1646,18 @@ TEST_F(PGLogTest, proc_replica_log) { EXPECT_TRUE(t.empty()); EXPECT_TRUE(omissing.have_missing()); EXPECT_TRUE(omissing.is_missing(divergent_object)); - EXPECT_EQ(eversion_t(2, 3), omissing.missing[divergent_object].need); + EXPECT_EQ(eversion_t(1, 3), omissing.missing[divergent_object].need); EXPECT_EQ(olog.head, oinfo.last_update); EXPECT_EQ(olog.head, oinfo.last_complete); proc_replica_log(t, oinfo, olog, omissing, from); EXPECT_TRUE(t.empty()); - EXPECT_FALSE(omissing.have_missing()); + EXPECT_TRUE(omissing.have_missing()); + EXPECT_TRUE(omissing.is_missing(divergent_object)); + EXPECT_EQ(omissing.missing[divergent_object].have, eversion_t(0, 0)); + EXPECT_EQ(omissing.missing[divergent_object].need, eversion_t(1, 1)); EXPECT_EQ(last_update, oinfo.last_update); - EXPECT_EQ(last_update, oinfo.last_complete); } /* +--------------------------+ @@ -1862,6 +1882,20 @@ TEST_F(PGLogTest, merge_log_prior_version_have) { run_test_case(t); } +TEST_F(PGLogTest, merge_log_split_missing_entries_at_head) { + TestCase t; + t.auth.push_back(mk_ple_mod_rb(mk_obj(1), mk_evt(10, 100), mk_evt(8, 70))); + t.auth.push_back(mk_ple_mod_rb(mk_obj(1), mk_evt(15, 150), mk_evt(10, 100))); + + t.div.push_back(mk_ple_mod(mk_obj(1), mk_evt(8, 70), mk_evt(8, 65))); + + t.setup(); + t.set_div_bounds(mk_evt(9, 79), mk_evt(8, 69)); + t.set_auth_bounds(mk_evt(10, 160), mk_evt(9, 77)); + t.final.add(mk_obj(1), mk_evt(15, 150), mk_evt(8, 70)); + run_test_case(t); +} + int main(int argc, char **argv) { vector args; argv_to_vec(argc, (const char **)argv, args); diff --git a/ceph/src/tools/Makefile.am b/ceph/src/tools/Makefile.am index 6078eb47..c554bf8c 100644 --- a/ceph/src/tools/Makefile.am +++ b/ceph/src/tools/Makefile.am @@ -11,20 +11,12 @@ ceph_kvstore_tool_LDADD = $(LIBOS) $(CEPH_GLOBAL) ceph_kvstore_tool_CXXFLAGS = $(UNITTEST_CXXFLAGS) bin_DEBUGPROGRAMS += ceph-kvstore-tool - -ceph_filestore_tool_SOURCES = tools/ceph_filestore_tool.cc -ceph_filestore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) -lboost_program_options -if LINUX -ceph_filestore_tool_LDADD += -ldl -endif # LINUX -bin_PROGRAMS += ceph_filestore_tool - -ceph_filestore_dump_SOURCES = tools/ceph_filestore_dump.cc -ceph_filestore_dump_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) +ceph_objectstore_tool_SOURCES = tools/ceph_objectstore_tool.cc +ceph_objectstore_tool_LDADD = $(LIBOSD) $(LIBOS) $(CEPH_GLOBAL) $(BOOST_PROGRAM_OPTIONS_LIBS) $(LIBRADOS) if LINUX -ceph_filestore_dump_LDADD += -ldl +ceph_objectstore_tool_LDADD += -ldl endif # LINUX -bin_PROGRAMS += ceph_filestore_dump +bin_PROGRAMS += ceph-objectstore-tool monmaptool_SOURCES = tools/monmaptool.cc monmaptool_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON) diff --git a/ceph/src/tools/ceph_authtool.cc b/ceph/src/tools/ceph_authtool.cc index f66a3c66..1b6b90a8 100644 --- a/ceph/src/tools/ceph_authtool.cc +++ b/ceph/src/tools/ceph_authtool.cc @@ -84,7 +84,7 @@ int main(int argc, const char **argv) gen_print_key = true; } else if (ceph_argparse_witharg(args, i, &val, "-a", "--add-key", (char*)NULL)) { add_key = val; - } else if (ceph_argparse_flag(args, i, &val, "-l", "--list", (char*)NULL)) { + } else if (ceph_argparse_flag(args, i, "-l", "--list", (char*)NULL)) { list = true; } else if (ceph_argparse_witharg(args, i, &val, "--caps", (char*)NULL)) { caps_fn = val; diff --git a/ceph/src/tools/ceph_filestore_dump.cc b/ceph/src/tools/ceph_filestore_dump.cc deleted file mode 100644 index 87a83873..00000000 --- a/ceph/src/tools/ceph_filestore_dump.cc +++ /dev/null @@ -1,1429 +0,0 @@ -// -*- 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) 2013 Inktank - * - * 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. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "common/Formatter.h" - -#include "global/global_init.h" -#include "os/ObjectStore.h" -#include "os/FileStore.h" -#include "common/perf_counters.h" -#include "common/errno.h" -#include "osd/PGLog.h" -#include "osd/OSD.h" - -namespace po = boost::program_options; -using namespace std; - -enum { - TYPE_NONE = 0, - TYPE_PG_BEGIN, - TYPE_PG_END, - TYPE_OBJECT_BEGIN, - TYPE_OBJECT_END, - TYPE_DATA, - TYPE_ATTRS, - TYPE_OMAP_HDR, - TYPE_OMAP, - TYPE_PG_METADATA, - END_OF_TYPES, //Keep at the end -}; - -//#define INTERNAL_TEST -//#define INTERNAL_TEST2 - -#ifdef INTERNAL_TEST -CompatSet get_test_compat_set() { - CompatSet::FeatureSet ceph_osd_feature_compat; - CompatSet::FeatureSet ceph_osd_feature_ro_compat; - CompatSet::FeatureSet ceph_osd_feature_incompat; - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_BASE); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_PGINFO); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_OLOC); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_LEC); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_CATEGORIES); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_HOBJECTPOOL); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_BIGINFO); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_LEVELDBINFO); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_LEVELDBLOG); -#ifdef INTERNAL_TEST2 - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SNAPMAPPER); - ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS); -#endif - return CompatSet(ceph_osd_feature_compat, ceph_osd_feature_ro_compat, - ceph_osd_feature_incompat); -} -#endif - -typedef uint8_t sectiontype_t; -typedef uint32_t mymagic_t; -typedef int64_t mysize_t; -const ssize_t max_read = 1024 * 1024; -const uint16_t shortmagic = 0xffce; //goes into stream as "ceff" -//endmagic goes into stream as "ceff ffec" -const mymagic_t endmagic = (0xecff << 16) | shortmagic; -const int fd_none = INT_MIN; - -//The first FIXED_LENGTH bytes are a fixed -//portion of the export output. This includes the overall -//version number, and size of header and footer. -//THIS STRUCTURE CAN ONLY BE APPENDED TO. If it needs to expand, -//the version can be bumped and then anything -//can be added to the export format. -struct super_header { - static const uint32_t super_magic = (shortmagic << 16) | shortmagic; - static const uint32_t super_ver = 2; - static const uint32_t FIXED_LENGTH = 16; - uint32_t magic; - uint32_t version; - uint32_t header_size; - uint32_t footer_size; - - super_header() : magic(0), version(0), header_size(0), footer_size(0) { } - int read_super(); - - void encode(bufferlist& bl) const { - ::encode(magic, bl); - ::encode(version, bl); - ::encode(header_size, bl); - ::encode(footer_size, bl); - } - void decode(bufferlist::iterator& bl) { - ::decode(magic, bl); - ::decode(version, bl); - ::decode(header_size, bl); - ::decode(footer_size, bl); - } -}; - -struct header { - sectiontype_t type; - mysize_t size; - header(sectiontype_t type, mysize_t size) : - type(type), size(size) { } - header(): type(0), size(0) { } - - int get_header(); - - void encode(bufferlist& bl) const { - uint32_t debug_type = (type << 24) | (type << 16) | shortmagic; - ENCODE_START(1, 1, bl); - ::encode(debug_type, bl); - ::encode(size, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - uint32_t debug_type; - DECODE_START(1, bl); - ::decode(debug_type, bl); - type = debug_type >> 24; - ::decode(size, bl); - DECODE_FINISH(bl); - } -}; - -struct footer { - mymagic_t magic; - footer() : magic(endmagic) { } - - int get_footer(); - - void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); - ::encode(magic, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); - ::decode(magic, bl); - DECODE_FINISH(bl); - } -}; - -struct pg_begin { - spg_t pgid; - OSDSuperblock superblock; - - pg_begin(spg_t pg, const OSDSuperblock& sb): - pgid(pg), superblock(sb) { } - pg_begin() { } - - void encode(bufferlist& bl) const { - // If superblock doesn't include CEPH_FS_FEATURE_INCOMPAT_SHARDS then - // shard will be NO_SHARD for a replicated pool. This means - // that we allow the decode by struct_v 2. - ENCODE_START(3, 2, bl); - ::encode(pgid.pgid, bl); - ::encode(superblock, bl); - ::encode(pgid.shard, bl); - ENCODE_FINISH(bl); - } - // NOTE: New super_ver prevents decode from ver 1 - void decode(bufferlist::iterator& bl) { - DECODE_START(3, bl); - ::decode(pgid.pgid, bl); - if (struct_v > 1) { - ::decode(superblock, bl); - } - if (struct_v > 2) { - ::decode(pgid.shard, bl); - } else { - pgid.shard = ghobject_t::NO_SHARD; - } - DECODE_FINISH(bl); - } -}; - -struct object_begin { - ghobject_t hoid; - object_begin(const ghobject_t &hoid): hoid(hoid) { } - object_begin() { } - - // If superblock doesn't include CEPH_FS_FEATURE_INCOMPAT_SHARDS then - // generation will be NO_GEN, shard_id will be NO_SHARD for a replicated - // pool. This means we will allow the decode by struct_v 1. - void encode(bufferlist& bl) const { - ENCODE_START(2, 1, bl); - ::encode(hoid.hobj, bl); - ::encode(hoid.generation, bl); - ::encode(hoid.shard_id, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - DECODE_START(2, bl); - ::decode(hoid.hobj, bl); - if (struct_v > 1) { - ::decode(hoid.generation, bl); - ::decode(hoid.shard_id, bl); - } else { - hoid.generation = ghobject_t::NO_GEN; - hoid.shard_id = ghobject_t::NO_SHARD; - } - DECODE_FINISH(bl); - } -}; - -struct data_section { - uint64_t offset; - uint64_t len; - bufferlist databl; - data_section(uint64_t offset, uint64_t len, bufferlist bl): - offset(offset), len(len), databl(bl) { } - data_section(): offset(0), len(0) { } - - void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); - ::encode(offset, bl); - ::encode(len, bl); - ::encode(databl, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); - ::decode(offset, bl); - ::decode(len, bl); - ::decode(databl, bl); - DECODE_FINISH(bl); - } -}; - -struct attr_section { - map data; - attr_section(const map &data) : data(data) { } - attr_section() { } - - void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); - ::encode(data, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); - ::decode(data, bl); - DECODE_FINISH(bl); - } -}; - -struct omap_hdr_section { - bufferlist hdr; - omap_hdr_section(bufferlist hdr) : hdr(hdr) { } - omap_hdr_section() { } - - void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); - ::encode(hdr, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); - ::decode(hdr, bl); - DECODE_FINISH(bl); - } -}; - -struct omap_section { - map omap; - omap_section(const map &omap) : - omap(omap) { } - omap_section() { } - - void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); - ::encode(omap, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); - ::decode(omap, bl); - DECODE_FINISH(bl); - } -}; - -struct metadata_section { - __u8 struct_ver; - epoch_t map_epoch; - pg_info_t info; - pg_log_t log; - - metadata_section(__u8 struct_ver, epoch_t map_epoch, const pg_info_t &info, - const pg_log_t &log) - : struct_ver(struct_ver), - map_epoch(map_epoch), - info(info), - log(log) { } - metadata_section() - : struct_ver(0), - map_epoch(0) { } - - void encode(bufferlist& bl) const { - ENCODE_START(1, 1, bl); - ::encode(struct_ver, bl); - ::encode(map_epoch, bl); - ::encode(info, bl); - ::encode(log, bl); - ENCODE_FINISH(bl); - } - void decode(bufferlist::iterator& bl) { - DECODE_START(1, bl); - ::decode(struct_ver, bl); - ::decode(map_epoch, bl); - ::decode(info, bl); - ::decode(log, bl); - DECODE_FINISH(bl); - } -}; - -hobject_t infos_oid = OSD::make_infos_oid(); -hobject_t biginfo_oid, log_oid; - -int file_fd = fd_none; -bool debug = false; -super_header sh; - -template -int write_section(sectiontype_t type, const T& obj, int fd) { - bufferlist blhdr, bl, blftr; - obj.encode(bl); - header hdr(type, bl.length()); - hdr.encode(blhdr); - footer ft; - ft.encode(blftr); - - int ret = blhdr.write_fd(fd); - if (ret) return ret; - ret = bl.write_fd(fd); - if (ret) return ret; - ret = blftr.write_fd(fd); - return ret; -} - -int write_simple(sectiontype_t type, int fd) -{ - bufferlist hbl; - - header hdr(type, 0); - hdr.encode(hbl); - return hbl.write_fd(fd); -} - -static void invalid_path(string &path) -{ - cout << "Invalid path to osd store specified: " << path << "\n"; - exit(1); -} - -int get_log(ObjectStore *fs, coll_t coll, spg_t pgid, const pg_info_t &info, - PGLog::IndexedLog &log, pg_missing_t &missing) -{ - map divergent_priors; - try { - ostringstream oss; - PGLog::read_log(fs, coll, log_oid, info, divergent_priors, log, missing, oss); - if (debug && oss.str().size()) - cerr << oss.str() << std::endl; - } - catch (const buffer::error &e) { - cout << "read_log threw exception error " << e.what() << std::endl; - return 1; - } - return 0; -} - -//Based on RemoveWQ::_process() -void remove_coll(ObjectStore *store, const coll_t &coll) -{ - spg_t pg; - coll.is_pg_prefix(pg); - OSDriver driver( - store, - coll_t(), - OSD::make_snapmapper_oid()); - SnapMapper mapper(&driver, 0, 0, 0, pg.shard); - - vector objects; - ghobject_t next; - int r = 0; - int64_t num = 0; - ObjectStore::Transaction *t = new ObjectStore::Transaction; - cout << "remove_coll " << coll << std::endl; - while (!next.is_max()) { - r = store->collection_list_partial(coll, next, 200, 300, 0, - &objects, &next); - if (r < 0) - goto out; - for (vector::iterator i = objects.begin(); - i != objects.end(); - ++i, ++num) { - - OSDriver::OSTransaction _t(driver.get_transaction(t)); - cout << "remove " << *i << std::endl; - int r = mapper.remove_oid(i->hobj, &_t); - if (r != 0 && r != -ENOENT) { - assert(0); - } - - t->remove(coll, *i); - if (num >= 30) { - store->apply_transaction(*t); - delete t; - t = new ObjectStore::Transaction; - num = 0; - } - } - } - t->remove_collection(coll); - store->apply_transaction(*t); -out: - delete t; -} - -//Based on part of OSD::load_pgs() -int finish_remove_pgs(ObjectStore *store, uint64_t *next_removal_seq) -{ - vector ls; - int r = store->list_collections(ls); - if (r < 0) { - cout << "finish_remove_pgs: failed to list pgs: " << cpp_strerror(-r) - << std::endl; - return r; - } - - for (vector::iterator it = ls.begin(); - it != ls.end(); - ++it) { - spg_t pgid; - snapid_t snap; - - if (it->is_temp(pgid)) { - cout << "finish_remove_pgs " << *it << " clearing temp" << std::endl; - OSD::recursive_remove_collection(store, *it); - continue; - } - - if (it->is_pg(pgid, snap)) { - continue; - } - - uint64_t seq; - if (it->is_removal(&seq, &pgid)) { - if (seq >= *next_removal_seq) - *next_removal_seq = seq + 1; - cout << "finish_remove_pgs removing " << *it << ", seq is " - << seq << " pgid is " << pgid << std::endl; - remove_coll(store, *it); - continue; - } - - //cout << "finish_remove_pgs ignoring unrecognized " << *it << std::endl; - } - return 0; -} - -int initiate_new_remove_pg(ObjectStore *store, spg_t r_pgid, - uint64_t *next_removal_seq) -{ - ObjectStore::Transaction *rmt = new ObjectStore::Transaction; - - if (store->collection_exists(coll_t(r_pgid))) { - coll_t to_remove = coll_t::make_removal_coll((*next_removal_seq)++, r_pgid); - cout << "collection rename " << coll_t(r_pgid) - << " to " << to_remove - << std::endl; - rmt->collection_rename(coll_t(r_pgid), to_remove); - } else { - delete rmt; - return ENOENT; - } - - cout << "remove " << coll_t::META_COLL << " " << log_oid.oid << std::endl; - rmt->remove(coll_t::META_COLL, log_oid); - cout << "remove " << coll_t::META_COLL << " " << biginfo_oid.oid << std::endl; - rmt->remove(coll_t::META_COLL, biginfo_oid); - - store->apply_transaction(*rmt); - - return 0; -} - -int header::get_header() -{ - bufferlist ebl; - bufferlist::iterator ebliter = ebl.begin(); - ssize_t bytes; - - bytes = ebl.read_fd(file_fd, sh.header_size); - if ((size_t)bytes != sh.header_size) { - cout << "Unexpected EOF" << std::endl; - return EFAULT; - } - - decode(ebliter); - - return 0; -} - -int footer::get_footer() -{ - bufferlist ebl; - bufferlist::iterator ebliter = ebl.begin(); - ssize_t bytes; - - bytes = ebl.read_fd(file_fd, sh.footer_size); - if ((size_t)bytes != sh.footer_size) { - cout << "Unexpected EOF" << std::endl; - return EFAULT; - } - - decode(ebliter); - - if (magic != endmagic) { - cout << "Bad footer magic" << std::endl; - return EFAULT; - } - - return 0; -} - -int write_info(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info, - __u8 struct_ver) -{ - //Empty for this - interval_set snap_collections; // obsolete - map past_intervals; - coll_t coll(info.pgid); - - int ret = PG::_write_info(t, epoch, - info, coll, - past_intervals, - snap_collections, - infos_oid, - struct_ver, - true, true); - if (ret < 0) ret = -ret; - if (ret) cout << "Failed to write info" << std::endl; - return ret; -} - -void write_log(ObjectStore::Transaction &t, pg_log_t &log) -{ - map divergent_priors; - PGLog::write_log(t, log, log_oid, divergent_priors); -} - -int write_pg(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info, - pg_log_t &log, __u8 struct_ver) -{ - int ret = write_info(t, epoch, info, struct_ver); - if (ret) return ret; - write_log(t, log); - return 0; -} - -int export_file(ObjectStore *store, coll_t cid, ghobject_t &obj) -{ - struct stat st; - mysize_t total; - footer ft; - - int ret = store->stat(cid, obj, &st); - if (ret < 0) - return ret; - - if (file_fd != STDOUT_FILENO) - cout << "read " << obj << std::endl; - - total = st.st_size; - if (debug && file_fd != STDOUT_FILENO) - cout << "size=" << total << std::endl; - - object_begin objb(obj); - ret = write_section(TYPE_OBJECT_BEGIN, objb, file_fd); - if (ret < 0) - return ret; - - uint64_t offset = 0; - bufferlist rawdatabl, databl; - while(total > 0) { - rawdatabl.clear(); - databl.clear(); - mysize_t len = max_read; - if (len > total) - len = total; - - ret = store->read(cid, obj, offset, len, rawdatabl); - if (ret < 0) - return ret; - if (ret == 0) - return -EINVAL; - - data_section dblock(offset, len, rawdatabl); - total -= ret; - offset += ret; - - if (debug && file_fd != STDOUT_FILENO) - cout << "data section offset=" << offset << " len=" << len << std::endl; - - ret = write_section(TYPE_DATA, dblock, file_fd); - if (ret) return ret; - } - - //Handle attrs for this object - map aset; - ret = store->getattrs(cid, obj, aset, false); - if (ret) return ret; - attr_section as(aset); - ret = write_section(TYPE_ATTRS, as, file_fd); - if (ret) - return ret; - - if (debug && file_fd != STDOUT_FILENO) { - cout << "attrs size " << aset.size() << std::endl; - } - - //Handle omap information - databl.clear(); - bufferlist hdrbuf; - map out; - ret = store->omap_get(cid, obj, &hdrbuf, &out); - if (ret < 0) - return ret; - - omap_hdr_section ohs(hdrbuf); - ret = write_section(TYPE_OMAP_HDR, ohs, file_fd); - if (ret) - return ret; - - if (!out.empty()) { - omap_section oms(out); - ret = write_section(TYPE_OMAP, oms, file_fd); - if (ret) - return ret; - - if (debug && file_fd != STDOUT_FILENO) - cout << "omap map size " << out.size() << std::endl; - } - - ret = write_simple(TYPE_OBJECT_END, file_fd); - if (ret) - return ret; - - return 0; -} - -int export_files(ObjectStore *store, coll_t coll) -{ - vector objects; - ghobject_t next; - - while (!next.is_max()) { - int r = store->collection_list_partial(coll, next, 200, 300, 0, - &objects, &next); - if (r < 0) - return r; - for (vector::iterator i = objects.begin(); - i != objects.end(); - ++i) { - r = export_file(store, coll, *i); - if (r < 0) - return r; - } - } - return 0; -} - -//Write super_header with its fixed 16 byte length -void write_super() -{ - bufferlist superbl; - super_header sh; - footer ft; - - header hdr(TYPE_NONE, 0); - hdr.encode(superbl); - - sh.magic = super_header::super_magic; - sh.version = super_header::super_ver; - sh.header_size = superbl.length(); - superbl.clear(); - ft.encode(superbl); - sh.footer_size = superbl.length(); - superbl.clear(); - - sh.encode(superbl); - assert(super_header::FIXED_LENGTH == superbl.length()); - superbl.write_fd(file_fd); -} - -int do_export(ObjectStore *fs, coll_t coll, spg_t pgid, pg_info_t &info, - epoch_t map_epoch, __u8 struct_ver, const OSDSuperblock& superblock) -{ - PGLog::IndexedLog log; - pg_missing_t missing; - - if (file_fd != STDOUT_FILENO) - cout << "Exporting " << pgid << std::endl; - - int ret = get_log(fs, coll, pgid, info, log, missing); - if (ret > 0) - return ret; - - write_super(); - - pg_begin pgb(pgid, superblock); - ret = write_section(TYPE_PG_BEGIN, pgb, file_fd); - if (ret) - return ret; - - ret = export_files(fs, coll); - if (ret) { - if (file_fd != STDOUT_FILENO) - cout << "export_files error " << ret << std::endl; - return ret; - } - - metadata_section ms(struct_ver, map_epoch, info, log); - ret = write_section(TYPE_PG_METADATA, ms, file_fd); - if (ret) - return ret; - - ret = write_simple(TYPE_PG_END, file_fd); - if (ret) - return ret; - - return 0; -} - -int super_header::read_super() -{ - bufferlist ebl; - bufferlist::iterator ebliter = ebl.begin(); - ssize_t bytes; - - bytes = ebl.read_fd(file_fd, super_header::FIXED_LENGTH); - if ((size_t)bytes != super_header::FIXED_LENGTH) { - cout << "Unexpected EOF" << std::endl; - return EFAULT; - } - - decode(ebliter); - - return 0; -} - -int read_section(int fd, sectiontype_t *type, bufferlist *bl) -{ - header hdr; - ssize_t bytes; - - int ret = hdr.get_header(); - if (ret) - return ret; - - *type = hdr.type; - - bl->clear(); - bytes = bl->read_fd(fd, hdr.size); - if (bytes != hdr.size) { - cout << "Unexpected EOF" << std::endl; - return EFAULT; - } - - if (hdr.size > 0) { - footer ft; - ret = ft.get_footer(); - if (ret) - return ret; - } - - return 0; -} - -int get_data(ObjectStore *store, coll_t coll, ghobject_t hoid, - ObjectStore::Transaction *t, bufferlist &bl) -{ - bufferlist::iterator ebliter = bl.begin(); - data_section ds; - ds.decode(ebliter); - - if (debug) - cout << "\tdata: offset " << ds.offset << " len " << ds.len << std::endl; - t->write(coll, hoid, ds.offset, ds.len, ds.databl); - return 0; -} - -int get_attrs(ObjectStore *store, coll_t coll, ghobject_t hoid, - ObjectStore::Transaction *t, bufferlist &bl, - OSDriver &driver, SnapMapper &snap_mapper) -{ - bufferlist::iterator ebliter = bl.begin(); - attr_section as; - as.decode(ebliter); - - if (debug) - cout << "\tattrs: len " << as.data.size() << std::endl; - t->setattrs(coll, hoid, as.data); - - if (hoid.hobj.snap < CEPH_MAXSNAP && hoid.generation == ghobject_t::NO_GEN) { - map::iterator mi = as.data.find(OI_ATTR); - if (mi != as.data.end()) { - bufferlist attr_bl; - attr_bl.push_back(mi->second); - object_info_t oi(attr_bl); - - if (debug) - cout << "object_info " << oi << std::endl; - - OSDriver::OSTransaction _t(driver.get_transaction(t)); - set oi_snaps(oi.snaps.begin(), oi.snaps.end()); - snap_mapper.add_oid(hoid.hobj, oi_snaps, &_t); - } - } - - return 0; -} - -int get_omap_hdr(ObjectStore *store, coll_t coll, ghobject_t hoid, - ObjectStore::Transaction *t, bufferlist &bl) -{ - bufferlist::iterator ebliter = bl.begin(); - omap_hdr_section oh; - oh.decode(ebliter); - - if (debug) - cout << "\tomap header: " << string(oh.hdr.c_str(), oh.hdr.length()) - << std::endl; - t->omap_setheader(coll, hoid, oh.hdr); - return 0; -} - -int get_omap(ObjectStore *store, coll_t coll, ghobject_t hoid, - ObjectStore::Transaction *t, bufferlist &bl) -{ - bufferlist::iterator ebliter = bl.begin(); - omap_section os; - os.decode(ebliter); - - if (debug) - cout << "\tomap: size " << os.omap.size() << std::endl; - t->omap_setkeys(coll, hoid, os.omap); - return 0; -} - -int get_object(ObjectStore *store, coll_t coll, bufferlist &bl) -{ - ObjectStore::Transaction tran; - ObjectStore::Transaction *t = &tran; - bufferlist::iterator ebliter = bl.begin(); - object_begin ob; - ob.decode(ebliter); - OSDriver driver( - store, - coll_t(), - OSD::make_snapmapper_oid()); - spg_t pg; - coll.is_pg_prefix(pg); - SnapMapper mapper(&driver, 0, 0, 0, pg.shard); - - t->touch(coll, ob.hoid); - - cout << "Write " << ob.hoid << std::endl; - - bufferlist ebl; - bool done = false; - while(!done) { - sectiontype_t type; - int ret = read_section(file_fd, &type, &ebl); - if (ret) - return ret; - - //cout << "\tdo_object: Section type " << hex << type << dec << std::endl; - //cout << "\t\tsection size " << ebl.length() << std::endl; - if (type >= END_OF_TYPES) { - cout << "Skipping unknown object section type" << std::endl; - continue; - } - switch(type) { - case TYPE_DATA: - ret = get_data(store, coll, ob.hoid, t, ebl); - if (ret) return ret; - break; - case TYPE_ATTRS: - ret = get_attrs(store, coll, ob.hoid, t, ebl, driver, mapper); - if (ret) return ret; - break; - case TYPE_OMAP_HDR: - ret = get_omap_hdr(store, coll, ob.hoid, t, ebl); - if (ret) return ret; - break; - case TYPE_OMAP: - ret = get_omap(store, coll, ob.hoid, t, ebl); - if (ret) return ret; - break; - case TYPE_OBJECT_END: - done = true; - break; - default: - return EFAULT; - } - } - store->apply_transaction(*t); - return 0; -} - -int get_pg_metadata(ObjectStore *store, coll_t coll, bufferlist &bl) -{ - ObjectStore::Transaction tran; - ObjectStore::Transaction *t = &tran; - bufferlist::iterator ebliter = bl.begin(); - metadata_section ms; - ms.decode(ebliter); - -#if DIAGNOSTIC - Formatter *formatter = new JSONFormatter(true); - cout << "struct_v " << (int)ms.struct_ver << std::endl; - cout << "epoch " << ms.map_epoch << std::endl; - formatter->open_object_section("info"); - ms.info.dump(formatter); - formatter->close_section(); - formatter->flush(cout); - cout << std::endl; - - formatter->open_object_section("log"); - ms.log.dump(formatter); - formatter->close_section(); - formatter->flush(cout); - cout << std::endl; -#endif - - coll_t newcoll(ms.info.pgid); - t->collection_rename(coll, newcoll); - - int ret = write_pg(*t, ms.map_epoch, ms.info, ms.log, ms.struct_ver); - if (ret) return ret; - - store->apply_transaction(*t); - - return 0; -} - -int do_import(ObjectStore *store, OSDSuperblock& sb) -{ - bufferlist ebl; - pg_info_t info; - PGLog::IndexedLog log; - - uint64_t next_removal_seq = 0; //My local seq - finish_remove_pgs(store, &next_removal_seq); - - int ret = sh.read_super(); - if (ret) - return ret; - - if (sh.magic != super_header::super_magic) { - cout << "Invalid magic number" << std::endl; - return EFAULT; - } - - if (sh.version > super_header::super_ver) { - cout << "Can't handle export format version=" << sh.version << std::endl; - return EINVAL; - } - - //First section must be TYPE_PG_BEGIN - sectiontype_t type; - ret = read_section(file_fd, &type, &ebl); - if (ret) - return ret; - if (type != TYPE_PG_BEGIN) { - return EFAULT; - } - - bufferlist::iterator ebliter = ebl.begin(); - pg_begin pgb; - pgb.decode(ebliter); - spg_t pgid = pgb.pgid; - - if (debug) { - cout << "Exported features: " << pgb.superblock.compat_features << std::endl; - } - if (sb.compat_features.compare(pgb.superblock.compat_features) == -1) { - cout << "Export has incompatible features set " - << pgb.superblock.compat_features << std::endl; - return 1; - } - - log_oid = OSD::make_pg_log_oid(pgid); - biginfo_oid = OSD::make_pg_biginfo_oid(pgid); - - //Check for PG already present. - coll_t coll(pgid); - if (store->collection_exists(coll)) { - cout << "pgid " << pgid << " already exists" << std::endl; - return 1; - } - - //Switch to collection which will be removed automatically if - //this program is interupted. - coll_t rmcoll = coll_t::make_removal_coll(next_removal_seq, pgid); - ObjectStore::Transaction *t = new ObjectStore::Transaction; - t->create_collection(rmcoll); - store->apply_transaction(*t); - delete t; - - cout << "Importing pgid " << pgid << std::endl; - - bool done = false; - bool found_metadata = false; - while(!done) { - ret = read_section(file_fd, &type, &ebl); - if (ret) - return ret; - - //cout << "do_import: Section type " << hex << type << dec << std::endl; - if (type >= END_OF_TYPES) { - cout << "Skipping unknown section type" << std::endl; - continue; - } - switch(type) { - case TYPE_OBJECT_BEGIN: - ret = get_object(store, rmcoll, ebl); - if (ret) return ret; - break; - case TYPE_PG_METADATA: - ret = get_pg_metadata(store, rmcoll, ebl); - if (ret) return ret; - found_metadata = true; - break; - case TYPE_PG_END: - done = true; - break; - default: - return EFAULT; - } - } - - if (!found_metadata) { - cout << "Missing metadata section" << std::endl; - return EFAULT; - } - - return 0; -} - -int main(int argc, char **argv) -{ - string fspath, jpath, pgidstr, type, file; - Formatter *formatter = new JSONFormatter(true); - - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "produce help message") - ("filestore-path", po::value(&fspath), - "path to filestore directory, mandatory") - ("journal-path", po::value(&jpath), - "path to journal, mandatory") - ("pgid", po::value(&pgidstr), - "PG id, mandatory except for import") - ("type", po::value(&type), - "Arg is one of [info, log, remove, export, or import], mandatory") - ("file", po::value(&file), - "path of file to export or import") - ("debug", "Enable diagnostic output to stderr") - ; - - po::variables_map vm; - po::parsed_options parsed = - po::command_line_parser(argc, argv).options(desc).allow_unregistered().run(); - po::store( parsed, vm); - try { - po::notify(vm); - } - catch(...) { - cout << desc << std::endl; - exit(1); - } - - if (vm.count("help")) { - cout << desc << std::endl; - return 1; - } - - if (!vm.count("filestore-path")) { - cout << "Must provide filestore-path" << std::endl - << desc << std::endl; - return 1; - } - if (!vm.count("journal-path")) { - cout << "Must provide journal-path" << std::endl - << desc << std::endl; - return 1; - } - if (!vm.count("type")) { - cout << "Must provide type (info, log, remove, export, import)" - << std::endl << desc << std::endl; - return 1; - } - if (type != "import" && !vm.count("pgid")) { - cout << "Must provide pgid" << std::endl - << desc << std::endl; - return 1; - } - - file_fd = fd_none; - if (type == "export") { - if (!vm.count("file")) { - file_fd = STDOUT_FILENO; - } else { - file_fd = open(file.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666); - } - } else if (type == "import") { - if (!vm.count("file")) { - file_fd = STDIN_FILENO; - } else { - file_fd = open(file.c_str(), O_RDONLY); - } - } - - if (vm.count("file") && file_fd == fd_none) { - cout << "--file option only applies to import or export" << std::endl; - return 1; - } - - if (file_fd != fd_none && file_fd < 0) { - perror("open"); - return 1; - } - - if ((fspath.length() == 0 || jpath.length() == 0) || - (type != "info" && type != "log" && type != "remove" && type != "export" - && type != "import") || - (type != "import" && pgidstr.length() == 0)) { - cerr << "Invalid params" << std::endl; - exit(1); - } - - if (type == "import" && pgidstr.length()) { - cerr << "--pgid option invalid with import" << std::endl; - exit(1); - } - - 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()); - } - - //Suppress derr() output to stderr by default - if (!vm.count("debug")) { - close(STDERR_FILENO); - (void)open("/dev/null", O_WRONLY); - debug = false; - } else { - debug = true; - } - - global_init( - &def_args, ceph_options, CEPH_ENTITY_TYPE_OSD, - CODE_ENVIRONMENT_UTILITY, 0); - //CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); - common_init_finish(g_ceph_context); - g_ceph_context->_conf->apply_changes(NULL); - g_conf = g_ceph_context->_conf; - - //Verify that fspath really is an osd store - struct stat st; - if (::stat(fspath.c_str(), &st) == -1) { - perror("fspath"); - invalid_path(fspath); - } - if (!S_ISDIR(st.st_mode)) { - invalid_path(fspath); - } - string check = fspath + "/whoami"; - if (::stat(check.c_str(), &st) == -1) { - perror("whoami"); - invalid_path(fspath); - } - if (!S_ISREG(st.st_mode)) { - invalid_path(fspath); - } - check = fspath + "/current"; - if (::stat(check.c_str(), &st) == -1) { - perror("current"); - invalid_path(fspath); - } - if (!S_ISDIR(st.st_mode)) { - invalid_path(fspath); - } - - spg_t pgid; - if (pgidstr.length() && !pgid.parse(pgidstr.c_str())) { - cout << "Invalid pgid '" << pgidstr << "' specified" << std::endl; - exit(1); - } - - ObjectStore *fs = new FileStore(fspath, jpath); - - int r = fs->mount(); - if (r < 0) { - if (r == -EBUSY) { - cout << "OSD has the store locked" << std::endl; - } else { - cout << "Mount failed with '" << cpp_strerror(-r) << "'" << std::endl; - } - return 1; - } - - bool fs_sharded_objects = fs->get_allow_sharded_objects(); - - int ret = 0; - vector ls; - vector::iterator it; - CompatSet supported; - -#ifdef INTERNAL_TEST - supported = get_test_compat_set(); -#else - supported = OSD::get_osd_compat_set(); -#endif - - bufferlist bl; - OSDSuperblock superblock; - bufferlist::iterator p; - r = fs->read(coll_t::META_COLL, OSD_SUPERBLOCK_POBJECT, 0, 0, bl); - if (r < 0) { - cout << "Failure to read OSD superblock error= " << r << std::endl; - goto out; - } - - p = bl.begin(); - ::decode(superblock, p); - -#ifdef INTERNAL_TEST2 - fs->set_allow_sharded_objects(); - assert(fs->get_allow_sharded_objects()); - fs_sharded_objects = true; - superblock.compat_features.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS); -#endif - - if (debug && file_fd != STDOUT_FILENO) { - cout << "Supported features: " << supported << std::endl; - cout << "On-disk features: " << superblock.compat_features << std::endl; - } - if (supported.compare(superblock.compat_features) == -1) { - cout << "On-disk OSD incompatible features set " - << superblock.compat_features << std::endl; - ret = EINVAL; - goto out; - } - - // If there was a crash as an OSD was transitioning to sharded objects - // and hadn't completed a set_allow_sharded_objects(). - // This utility does not want to attempt to finish that transition. - if (superblock.compat_features.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_SHARDS) != fs_sharded_objects) { - // An OSD should never have call set_allow_sharded_objects() before - // updating its own OSD features. - if (fs_sharded_objects) - cout << "FileStore sharded but OSD not set, Corruption?" << std::endl; - else - cout << "Found incomplete transition to sharded objects" << std::endl; - ret = EINVAL; - goto out; - } - - if (type == "import") { - - try { - ret = do_import(fs, superblock); - } - catch (const buffer::error &e) { - cout << "do_import threw exception error " << e.what() << std::endl; - ret = EFAULT; - } - if (ret == EFAULT) { - cout << "Corrupt input for import" << std::endl; - } - if (ret == 0) - cout << "Import successful" << std::endl; - goto out; - } - - log_oid = OSD::make_pg_log_oid(pgid); - biginfo_oid = OSD::make_pg_biginfo_oid(pgid); - - if (type == "remove") { - uint64_t next_removal_seq = 0; //My local seq - finish_remove_pgs(fs, &next_removal_seq); - int r = initiate_new_remove_pg(fs, pgid, &next_removal_seq); - if (r) { - cout << "PG '" << pgid << "' not found" << std::endl; - ret = 1; - goto out; - } - finish_remove_pgs(fs, &next_removal_seq); - cout << "Remove successful" << std::endl; - goto out; - } - - r = fs->list_collections(ls); - if (r < 0) { - cout << "failed to list pgs: " << cpp_strerror(-r) << std::endl; - exit(1); - } - - for (it = ls.begin(); it != ls.end(); ++it) { - snapid_t snap; - spg_t tmppgid; - - if (!it->is_pg(tmppgid, snap)) { - continue; - } - - if (tmppgid != pgid) { - continue; - } - if (snap != CEPH_NOSNAP && debug) { - cerr << "skipping snapped dir " << *it - << " (pg " << pgid << " snap " << snap << ")" << std::endl; - continue; - } - - //Found! - break; - } - - epoch_t map_epoch; - if (it != ls.end()) { - - coll_t coll = *it; - - bufferlist bl; - map_epoch = PG::peek_map_epoch(fs, coll, infos_oid, &bl); - if (debug) - cerr << "map_epoch " << map_epoch << std::endl; - - pg_info_t info(pgid); - map past_intervals; - hobject_t biginfo_oid = OSD::make_pg_biginfo_oid(pgid); - interval_set snap_collections; - - __u8 struct_ver; - r = PG::read_info(fs, coll, bl, info, past_intervals, biginfo_oid, - infos_oid, snap_collections, struct_ver); - if (r < 0) { - cout << "read_info error " << cpp_strerror(-r) << std::endl; - ret = 1; - goto out; - } - if (debug) - cerr << "struct_v " << (int)struct_ver << std::endl; - - if (type == "export") { - ret = do_export(fs, coll, pgid, info, map_epoch, struct_ver, superblock); - if (ret == 0 && file_fd != STDOUT_FILENO) - cout << "Export successful" << std::endl; - } else if (type == "info") { - formatter->open_object_section("info"); - info.dump(formatter); - formatter->close_section(); - formatter->flush(cout); - cout << std::endl; - } else if (type == "log") { - PGLog::IndexedLog log; - pg_missing_t missing; - ret = get_log(fs, coll, pgid, info, log, missing); - if (ret > 0) - goto out; - - formatter->open_object_section("log"); - log.dump(formatter); - formatter->close_section(); - formatter->flush(cout); - cout << std::endl; - formatter->open_object_section("missing"); - missing.dump(formatter); - formatter->close_section(); - formatter->flush(cout); - cout << std::endl; - } - } else { - cout << "PG '" << pgid << "' not found" << std::endl; - ret = 1; - } - -out: - if (fs->umount() < 0) { - cout << "umount failed" << std::endl; - return 1; - } - - return (ret != 0); -} - diff --git a/ceph/src/tools/ceph_filestore_tool.cc b/ceph/src/tools/ceph_filestore_tool.cc deleted file mode 100644 index eb9f8dac..00000000 --- a/ceph/src/tools/ceph_filestore_tool.cc +++ /dev/null @@ -1,260 +0,0 @@ -// -*- 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) 2013 Inktank - * - * 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. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "common/Formatter.h" - -#include "global/global_init.h" -#include "os/ObjectStore.h" -#include "os/FileStore.h" -#include "common/perf_counters.h" -#include "common/errno.h" -#include "osd/PGLog.h" -#include "osd/osd_types.h" -#include "osd/OSD.h" - -namespace po = boost::program_options; -using namespace std; - -static void invalid_path(string &path) -{ - cout << "Invalid path to osd store specified: " << path << "\n"; - exit(1); -} - -int main(int argc, char **argv) -{ - string fspath, jpath, pgidstr; - bool list_lost_objects = false; - bool fix_lost_objects = false; - unsigned LIST_AT_A_TIME = 100; - unsigned scanned = 0; - - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "produce help message") - ("filestore-path", po::value(&fspath), - "path to filestore directory, mandatory") - ("journal-path", po::value(&jpath), - "path to journal, mandatory") - ("pgid", po::value(&pgidstr), - "PG id") - ("list-lost-objects", po::value( - &list_lost_objects)->default_value(false), - "list lost objects") - ("fix-lost-objects", po::value( - &fix_lost_objects)->default_value(false), - "fix lost objects") - ; - - po::variables_map vm; - po::parsed_options parsed = - po::command_line_parser(argc, argv).options(desc). - allow_unregistered().run(); - po::store( parsed, vm); - try { - po::notify(vm); - } - catch(...) { - cout << desc << std::endl; - exit(1); - } - - if (vm.count("help")) { - cout << desc << std::endl; - return 1; - } - - if (!vm.count("filestore-path")) { - cerr << "Must provide filestore-path" << std::endl - << desc << std::endl; - return 1; - } - if (!vm.count("journal-path")) { - cerr << "Must provide journal-path" << std::endl - << desc << std::endl; - return 1; - } - - if ((fspath.length() == 0 || jpath.length() == 0)) { - cerr << "Invalid params" << desc << std::endl; - exit(1); - } - - 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_OSD, - CODE_ENVIRONMENT_UTILITY, 0); - //CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); - common_init_finish(g_ceph_context); - g_ceph_context->_conf->apply_changes(NULL); - g_conf = g_ceph_context->_conf; - - //Verify that fspath really is an osd store - struct stat st; - if (::stat(fspath.c_str(), &st) == -1) { - perror("fspath"); - invalid_path(fspath); - } - if (!S_ISDIR(st.st_mode)) { - invalid_path(fspath); - } - string check = fspath + "/whoami"; - if (::stat(check.c_str(), &st) == -1) { - perror("whoami"); - invalid_path(fspath); - } - if (!S_ISREG(st.st_mode)) { - invalid_path(fspath); - } - check = fspath + "/current"; - if (::stat(check.c_str(), &st) == -1) { - perror("current"); - invalid_path(fspath); - } - if (!S_ISDIR(st.st_mode)) { - invalid_path(fspath); - } - - ObjectStore *fs = new FileStore(fspath, jpath); - - int r = fs->mount(); - if (r < 0) { - if (r == -EBUSY) { - cout << "OSD has the store locked" << std::endl; - } else { - cout << "Mount failed with '" << cpp_strerror(-r) << "'" << std::endl; - } - return 1; - } - - vector colls_to_check; - if (pgidstr.length()) { - spg_t pgid; - if (!pgid.parse(pgidstr.c_str())) { - cout << "Invalid pgid '" << pgidstr << "' specified" << std::endl; - exit(1); - } - colls_to_check.push_back(coll_t(pgid)); - } else { - vector candidates; - r = fs->list_collections(candidates); - if (r < 0) { - cerr << "Error listing collections: " << cpp_strerror(r) << std::endl; - goto UMOUNT; - } - for (vector::iterator i = candidates.begin(); - i != candidates.end(); - ++i) { - spg_t pgid; - snapid_t snap; - if (i->is_pg(pgid, snap)) { - colls_to_check.push_back(*i); - } - } - } - - cerr << colls_to_check.size() << " pgs to scan" << std::endl; - for (vector::iterator i = colls_to_check.begin(); - i != colls_to_check.end(); - ++i, ++scanned) { - cerr << "Scanning " << *i << ", " << scanned << "/" - << colls_to_check.size() << " completed" << std::endl; - ghobject_t next; - while (!next.is_max()) { - vector list; - r = fs->collection_list_partial( - *i, - next, - LIST_AT_A_TIME, - LIST_AT_A_TIME, - CEPH_NOSNAP, - &list, - &next); - if (r < 0) { - cerr << "Error listing collection: " << *i << ", " - << cpp_strerror(r) << std::endl; - goto UMOUNT; - } - for (vector::iterator obj = list.begin(); - obj != list.end(); - ++obj) { - bufferlist attr; - r = fs->getattr(*i, *obj, OI_ATTR, attr); - if (r < 0) { - cerr << "Error getting attr on : " << make_pair(*i, *obj) << ", " - << cpp_strerror(r) << std::endl; - goto UMOUNT; - } - object_info_t oi; - bufferlist::iterator bp = attr.begin(); - try { - ::decode(oi, bp); - } catch (...) { - r = -EINVAL; - cerr << "Error getting attr on : " << make_pair(*i, *obj) << ", " - << cpp_strerror(r) << std::endl; - goto UMOUNT; - } - if (oi.is_lost()) { - if (list_lost_objects) { - cout << *i << "/" << *obj << " is lost" << std::endl; - } - if (fix_lost_objects) { - cerr << *i << "/" << *obj << " is lost, fixing" << std::endl; - oi.clear_flag(object_info_t::FLAG_LOST); - bufferlist bl2; - ::encode(oi, bl2); - ObjectStore::Transaction t; - t.setattr(*i, *obj, OI_ATTR, bl2); - r = fs->apply_transaction(t); - if (r < 0) { - cerr << "Error getting fixing attr on : " << make_pair(*i, *obj) - << ", " - << cpp_strerror(r) << std::endl; - goto UMOUNT; - } - } - } - } - } - } - cerr << "Completed" << std::endl; - - UMOUNT: - fs->sync_and_flush(); - fs->umount(); - return r; -} diff --git a/ceph/src/tools/ceph_objectstore_tool.cc b/ceph/src/tools/ceph_objectstore_tool.cc new file mode 100644 index 00000000..306a9f05 --- /dev/null +++ b/ceph/src/tools/ceph_objectstore_tool.cc @@ -0,0 +1,3086 @@ +// -*- 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) 2013 Inktank + * + * 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. + * + */ + +#include +#include +#include + +#include + +#include "common/Formatter.h" +#include "common/errno.h" +#include "common/ceph_argparse.h" + +#include "global/global_init.h" + +#include "os/ObjectStore.h" +#include "os/FileStore.h" + +#include "osd/PGLog.h" +#include "osd/OSD.h" + +#include "json_spirit/json_spirit_value.h" +#include "json_spirit/json_spirit_reader.h" + +#include "include/rados/librados.hpp" + +namespace po = boost::program_options; +using namespace std; + +enum { + TYPE_NONE = 0, + TYPE_PG_BEGIN, + TYPE_PG_END, + TYPE_OBJECT_BEGIN, + TYPE_OBJECT_END, + TYPE_DATA, + TYPE_ATTRS, + TYPE_OMAP_HDR, + TYPE_OMAP, + TYPE_PG_METADATA, + END_OF_TYPES, //Keep at the end +}; + +//#define INTERNAL_TEST +//#define INTERNAL_TEST2 +//#define INTERNAL_TEST3 + +#ifdef INTERNAL_TEST +CompatSet get_test_compat_set() { + CompatSet::FeatureSet ceph_osd_feature_compat; + CompatSet::FeatureSet ceph_osd_feature_ro_compat; + CompatSet::FeatureSet ceph_osd_feature_incompat; + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_BASE); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_PGINFO); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_OLOC); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_LEC); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_CATEGORIES); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_HOBJECTPOOL); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_BIGINFO); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_LEVELDBINFO); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_LEVELDBLOG); +#ifdef INTERNAL_TEST2 + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SNAPMAPPER); + ceph_osd_feature_incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS); +#endif + return CompatSet(ceph_osd_feature_compat, ceph_osd_feature_ro_compat, + ceph_osd_feature_incompat); +} +#endif + +typedef uint8_t sectiontype_t; +typedef uint32_t mymagic_t; +typedef int64_t mysize_t; +const ssize_t max_read = 1024 * 1024; +const uint16_t shortmagic = 0xffce; //goes into stream as "ceff" +//endmagic goes into stream as "ceff ffec" +const mymagic_t endmagic = (0xecff << 16) | shortmagic; +const int fd_none = INT_MIN; +bool outistty; + +//The first FIXED_LENGTH bytes are a fixed +//portion of the export output. This includes the overall +//version number, and size of header and footer. +//THIS STRUCTURE CAN ONLY BE APPENDED TO. If it needs to expand, +//the version can be bumped and then anything +//can be added to the export format. +struct super_header { + static const uint32_t super_magic = (shortmagic << 16) | shortmagic; + // ver = 1, Initial version + // ver = 2, Add OSDSuperblock to pg_begin + static const uint32_t super_ver = 2; + static const uint32_t FIXED_LENGTH = 16; + uint32_t magic; + uint32_t version; + uint32_t header_size; + uint32_t footer_size; + + super_header() : magic(0), version(0), header_size(0), footer_size(0) { } + int read_super(); + + void encode(bufferlist& bl) const { + ::encode(magic, bl); + ::encode(version, bl); + ::encode(header_size, bl); + ::encode(footer_size, bl); + } + void decode(bufferlist::iterator& bl) { + ::decode(magic, bl); + ::decode(version, bl); + ::decode(header_size, bl); + ::decode(footer_size, bl); + } +}; + +struct header { + sectiontype_t type; + mysize_t size; + header(sectiontype_t type, mysize_t size) : + type(type), size(size) { } + header(): type(0), size(0) { } + + int get_header(); + + void encode(bufferlist& bl) const { + uint32_t debug_type = (type << 24) | (type << 16) | shortmagic; + ENCODE_START(1, 1, bl); + ::encode(debug_type, bl); + ::encode(size, bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + uint32_t debug_type; + DECODE_START(1, bl); + ::decode(debug_type, bl); + type = debug_type >> 24; + ::decode(size, bl); + DECODE_FINISH(bl); + } +}; + +struct footer { + mymagic_t magic; + footer() : magic(endmagic) { } + + int get_footer(); + + void encode(bufferlist& bl) const { + ENCODE_START(1, 1, bl); + ::encode(magic, bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + DECODE_START(1, bl); + ::decode(magic, bl); + DECODE_FINISH(bl); + } +}; + +struct pg_begin { + spg_t pgid; + OSDSuperblock superblock; + + pg_begin(spg_t pg, const OSDSuperblock& sb): + pgid(pg), superblock(sb) { } + pg_begin() { } + + void encode(bufferlist& bl) const { + // If superblock doesn't include CEPH_FS_FEATURE_INCOMPAT_SHARDS then + // shard will be NO_SHARD for a replicated pool. This means + // that we allow the decode by struct_v 2. + ENCODE_START(3, 2, bl); + ::encode(pgid.pgid, bl); + ::encode(superblock, bl); + ::encode(pgid.shard, bl); + ENCODE_FINISH(bl); + } + // NOTE: New super_ver prevents decode from ver 1 + void decode(bufferlist::iterator& bl) { + DECODE_START(3, bl); + ::decode(pgid.pgid, bl); + if (struct_v > 1) { + ::decode(superblock, bl); + } + if (struct_v > 2) { + ::decode(pgid.shard, bl); + } else { + pgid.shard = ghobject_t::NO_SHARD; + } + DECODE_FINISH(bl); + } +}; + +struct object_begin { + ghobject_t hoid; + + // Duplicate what is in the OI_ATTR so we have it at the start + // of object processing. + object_info_t oi; + + object_begin(const ghobject_t &hoid): hoid(hoid) { } + object_begin() { } + + // If superblock doesn't include CEPH_FS_FEATURE_INCOMPAT_SHARDS then + // generation will be NO_GEN, shard_id will be NO_SHARD for a replicated + // pool. This means we will allow the decode by struct_v 1. + void encode(bufferlist& bl) const { + ENCODE_START(3, 1, bl); + ::encode(hoid.hobj, bl); + ::encode(hoid.generation, bl); + ::encode(hoid.shard_id, bl); + ::encode(oi, bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + DECODE_START(3, bl); + ::decode(hoid.hobj, bl); + if (struct_v > 1) { + ::decode(hoid.generation, bl); + ::decode(hoid.shard_id, bl); + } else { + hoid.generation = ghobject_t::NO_GEN; + hoid.shard_id = ghobject_t::NO_SHARD; + } + if (struct_v > 2) { + ::decode(oi, bl); + } + DECODE_FINISH(bl); + } +}; + +struct data_section { + uint64_t offset; + uint64_t len; + bufferlist databl; + data_section(uint64_t offset, uint64_t len, bufferlist bl): + offset(offset), len(len), databl(bl) { } + data_section(): offset(0), len(0) { } + + void encode(bufferlist& bl) const { + ENCODE_START(1, 1, bl); + ::encode(offset, bl); + ::encode(len, bl); + ::encode(databl, bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + DECODE_START(1, bl); + ::decode(offset, bl); + ::decode(len, bl); + ::decode(databl, bl); + DECODE_FINISH(bl); + } +}; + +struct attr_section { + map data; + attr_section(const map &data) : data(data) { } + attr_section() { } + + void encode(bufferlist& bl) const { + ENCODE_START(1, 1, bl); + ::encode(data, bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + DECODE_START(1, bl); + ::decode(data, bl); + DECODE_FINISH(bl); + } +}; + +struct omap_hdr_section { + bufferlist hdr; + omap_hdr_section(bufferlist hdr) : hdr(hdr) { } + omap_hdr_section() { } + + void encode(bufferlist& bl) const { + ENCODE_START(1, 1, bl); + ::encode(hdr, bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + DECODE_START(1, bl); + ::decode(hdr, bl); + DECODE_FINISH(bl); + } +}; + +struct omap_section { + map omap; + omap_section(const map &omap) : + omap(omap) { } + omap_section() { } + + void encode(bufferlist& bl) const { + ENCODE_START(1, 1, bl); + ::encode(omap, bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + DECODE_START(1, bl); + ::decode(omap, bl); + DECODE_FINISH(bl); + } +}; + +struct metadata_section { + __u8 struct_ver; + epoch_t map_epoch; + pg_info_t info; + pg_log_t log; + map past_intervals; + OSDMap osdmap; + + metadata_section(__u8 struct_ver, epoch_t map_epoch, const pg_info_t &info, + const pg_log_t &log, map &past_intervals) + : struct_ver(struct_ver), + map_epoch(map_epoch), + info(info), + log(log), + past_intervals(past_intervals) { } + metadata_section() + : struct_ver(0), + map_epoch(0) { } + + void encode(bufferlist& bl) const { + ENCODE_START(3, 1, bl); + ::encode(struct_ver, bl); + ::encode(map_epoch, bl); + ::encode(info, bl); + ::encode(log, bl); + ::encode(past_intervals, bl); + osdmap.encode(bl); + ENCODE_FINISH(bl); + } + void decode(bufferlist::iterator& bl) { + DECODE_START(3, bl); + ::decode(struct_ver, bl); + ::decode(map_epoch, bl); + ::decode(info, bl); + ::decode(log, bl); + if (struct_v > 1) { + ::decode(past_intervals, bl); + } else { + cout << "NOTICE: Older export without past_intervals" << std::endl; + } + if (struct_v > 2) { + osdmap.decode(bl); + } else { + cout << "WARNING: Older export without OSDMap information" << std::endl; + } + DECODE_FINISH(bl); + } +}; + +struct action_on_object_t { + virtual ~action_on_object_t() {} + virtual int call(ObjectStore *store, coll_t coll, ghobject_t &ghobj, object_info_t &oi) = 0; +}; + +int _action_on_all_objects_in_pg(ObjectStore *store, coll_t coll, action_on_object_t &action, bool debug) +{ + unsigned LIST_AT_A_TIME = 100; + ghobject_t next; + while (!next.is_max()) { + vector list; + int r = store->collection_list_partial( + coll, + next, + LIST_AT_A_TIME, + LIST_AT_A_TIME, + 0, + &list, + &next); + if (r < 0) { + cerr << "Error listing collection: " << coll << ", " + << cpp_strerror(r) << std::endl; + return r; + } + for (vector::iterator obj = list.begin(); + obj != list.end(); + ++obj) { + bufferlist attr; + r = store->getattr(coll, *obj, OI_ATTR, attr); + if (r < 0) { + cerr << "Error getting attr on : " << make_pair(coll, *obj) << ", " + << cpp_strerror(r) << std::endl; + return r; + } + object_info_t oi; + bufferlist::iterator bp = attr.begin(); + try { + ::decode(oi, bp); + } catch (...) { + r = -EINVAL; + cerr << "Error getting attr on : " << make_pair(coll, *obj) << ", " + << cpp_strerror(r) << std::endl; + return r; + } + r = action.call(store, coll, *obj, oi); + if (r < 0) + return r; + } + } + return 0; +} + +int action_on_all_objects_in_pg(ObjectStore *store, coll_t coll, action_on_object_t &action, bool debug) +{ + int r = _action_on_all_objects_in_pg(store, coll, action, debug); + store->sync_and_flush(); + return r; +} + +int _action_on_all_objects(ObjectStore *store, action_on_object_t &action, bool debug) +{ + unsigned scanned = 0; + int r = 0; + vector colls_to_check; + vector candidates; + r = store->list_collections(candidates); + if (r < 0) { + cerr << "Error listing collections: " << cpp_strerror(r) << std::endl; + return r; + } + for (vector::iterator i = candidates.begin(); + i != candidates.end(); + ++i) { + spg_t pgid; + snapid_t snap; + if (i->is_pg(pgid, snap)) { + colls_to_check.push_back(*i); + } + } + + if (debug) + cerr << colls_to_check.size() << " pgs to scan" << std::endl; + for (vector::iterator i = colls_to_check.begin(); + i != colls_to_check.end(); + ++i, ++scanned) { + if (debug) + cerr << "Scanning " << *i << ", " << scanned << "/" + << colls_to_check.size() << " completed" << std::endl; + r = _action_on_all_objects_in_pg(store, *i, action, debug); + if (r < 0) + return r; + } + return 0; +} + +int action_on_all_objects(ObjectStore *store, action_on_object_t &action, bool debug) +{ + int r = _action_on_all_objects(store, action, debug); + store->sync_and_flush(); + return r; +} + +struct pgid_object_list { + list > _objects; + + void insert(coll_t coll, ghobject_t &ghobj) { + _objects.push_back(make_pair(coll, ghobj)); + } + + void dump(Formatter *f, bool human_readable) const { + if (!human_readable) + f->open_array_section("pgid_objects"); + for (list >::const_iterator i = _objects.begin(); + i != _objects.end(); + ++i) { + if (i != _objects.begin() && human_readable) { + f->flush(cout); + cout << std::endl; + } + f->open_array_section("pgid_object"); + string pgid = i->first.c_str(); + std::size_t pos = pgid.find("_"); + if (pos == string::npos) + f->dump_string("pgid", pgid); + else + f->dump_string("pgid", pgid.substr(0, pos)); + f->open_object_section("ghobject"); + i->second.dump(f); + f->close_section(); + f->close_section(); + } + if (!human_readable) + f->close_section(); + } +}; + +struct lookup_ghobject : public action_on_object_t { + pgid_object_list _objects; + const string _name; + + lookup_ghobject(const string& name) : _name(name) { } + + virtual int call(ObjectStore *store, coll_t coll, ghobject_t &ghobj, object_info_t &oi) { + if (_name.length() == 0 || ghobj.hobj.oid.name == _name) + _objects.insert(coll, ghobj); + return 0; + } + + int size() const { + return _objects._objects.size(); + } + + pair pop() { + pair front = _objects._objects.front(); + _objects._objects.pop_front(); + return front; + } + + void dump(Formatter *f, bool human_readable) const { + _objects.dump(f, human_readable); + } +}; + +hobject_t infos_oid = OSD::make_infos_oid(); +hobject_t biginfo_oid, log_oid; + +int file_fd = fd_none; +bool debug = false; +super_header sh; +uint64_t testalign; + +template +int write_section(sectiontype_t type, const T& obj, int fd) { + bufferlist blhdr, bl, blftr; + obj.encode(bl); + header hdr(type, bl.length()); + hdr.encode(blhdr); + footer ft; + ft.encode(blftr); + + int ret = blhdr.write_fd(fd); + if (ret) return ret; + ret = bl.write_fd(fd); + if (ret) return ret; + ret = blftr.write_fd(fd); + return ret; +} + +// Convert non-printable characters to '\###' +static void cleanbin(string &str) +{ + bool cleaned = false; + string clean; + + for (string::iterator it = str.begin(); it != str.end(); ++it) { + if (!isprint(*it)) { + clean.push_back('\\'); + clean.push_back('0' + ((*it >> 6) & 7)); + clean.push_back('0' + ((*it >> 3) & 7)); + clean.push_back('0' + (*it & 7)); + cleaned = true; + } else { + clean.push_back(*it); + } + } + + if (cleaned) + str = clean; + return; +} + +int write_simple(sectiontype_t type, int fd) +{ + bufferlist hbl; + + header hdr(type, 0); + hdr.encode(hbl); + return hbl.write_fd(fd); +} + +static int get_fd_data(int fd, bufferlist &bl) +{ + uint64_t total = 0; + do { + ssize_t bytes = bl.read_fd(fd, max_read); + if (bytes < 0) { + cerr << "read_fd error " << cpp_strerror(-bytes) << std::endl; + return 1; + } + + if (bytes == 0) + break; + + total += bytes; + } while(true); + + assert(bl.length() == total); + return 0; +} + +static void invalid_filestore_path(string &path) +{ + cerr << "Invalid filestore path specified: " << path << "\n"; + exit(1); +} + +int get_log(ObjectStore *fs, coll_t coll, spg_t pgid, const pg_info_t &info, + PGLog::IndexedLog &log, pg_missing_t &missing) +{ + map divergent_priors; + try { + ostringstream oss; + PGLog::read_log(fs, coll, log_oid, info, divergent_priors, log, missing, oss); + if (debug && oss.str().size()) + cerr << oss.str() << std::endl; + } + catch (const buffer::error &e) { + cerr << "read_log threw exception error " << e.what() << std::endl; + return 1; + } + return 0; +} + +//Based on RemoveWQ::_process() +void remove_coll(ObjectStore *store, const coll_t &coll) +{ + spg_t pg; + coll.is_pg_prefix(pg); + OSDriver driver( + store, + coll_t(), + OSD::make_snapmapper_oid()); + SnapMapper mapper(&driver, 0, 0, 0, pg.shard); + + ghobject_t next; + int r = 0; + int64_t num = 0; + ObjectStore::Transaction *t = new ObjectStore::Transaction; + cout << "remove_coll " << coll << std::endl; + while (!next.is_max()) { + vector objects; + r = store->collection_list_partial(coll, next, 200, 300, 0, + &objects, &next); + if (r < 0) + goto out; + for (vector::iterator i = objects.begin(); + i != objects.end(); + ++i, ++num) { + + OSDriver::OSTransaction _t(driver.get_transaction(t)); + cout << "remove " << *i << std::endl; + int r = mapper.remove_oid(i->hobj, &_t); + if (r != 0 && r != -ENOENT) { + assert(0); + } + + t->remove(coll, *i); + if (num >= 30) { + store->apply_transaction(*t); + delete t; + t = new ObjectStore::Transaction; + num = 0; + } + } + } + t->remove_collection(coll); + store->apply_transaction(*t); +out: + delete t; +} + +//Based on part of OSD::load_pgs() +int finish_remove_pgs(ObjectStore *store, uint64_t *next_removal_seq) +{ + vector ls; + int r = store->list_collections(ls); + if (r < 0) { + cerr << "finish_remove_pgs: failed to list pgs: " << cpp_strerror(-r) + << std::endl; + return r; + } + + for (vector::iterator it = ls.begin(); + it != ls.end(); + ++it) { + spg_t pgid; + + if (it->is_temp(pgid)) { + cout << "finish_remove_pgs " << *it << " clearing temp" << std::endl; + OSD::recursive_remove_collection(store, *it); + continue; + } + + uint64_t seq; + if (it->is_removal(&seq, &pgid)) { + if (seq >= *next_removal_seq) + *next_removal_seq = seq + 1; + cout << "finish_remove_pgs removing " << *it << ", seq is " + << seq << " pgid is " << pgid << std::endl; + remove_coll(store, *it); + continue; + } + + //cout << "finish_remove_pgs ignoring unrecognized " << *it << std::endl; + } + return 0; +} + +int initiate_new_remove_pg(ObjectStore *store, spg_t r_pgid, + uint64_t *next_removal_seq) +{ + ObjectStore::Transaction *rmt = new ObjectStore::Transaction; + + if (store->collection_exists(coll_t(r_pgid))) { + coll_t to_remove = coll_t::make_removal_coll((*next_removal_seq)++, r_pgid); + cout << "collection rename " << coll_t(r_pgid) + << " to " << to_remove + << std::endl; + rmt->collection_rename(coll_t(r_pgid), to_remove); + } else { + delete rmt; + return ENOENT; + } + + cout << "remove " << coll_t::META_COLL << " " << log_oid.oid << std::endl; + rmt->remove(coll_t::META_COLL, log_oid); + cout << "remove " << coll_t::META_COLL << " " << biginfo_oid.oid << std::endl; + rmt->remove(coll_t::META_COLL, biginfo_oid); + + store->apply_transaction(*rmt); + + return 0; +} + +int header::get_header() +{ + bufferlist ebl; + bufferlist::iterator ebliter = ebl.begin(); + ssize_t bytes; + + bytes = ebl.read_fd(file_fd, sh.header_size); + if ((size_t)bytes != sh.header_size) { + cerr << "Unexpected EOF" << std::endl; + return EFAULT; + } + + decode(ebliter); + + return 0; +} + +int footer::get_footer() +{ + bufferlist ebl; + bufferlist::iterator ebliter = ebl.begin(); + ssize_t bytes; + + bytes = ebl.read_fd(file_fd, sh.footer_size); + if ((size_t)bytes != sh.footer_size) { + cerr << "Unexpected EOF" << std::endl; + return EFAULT; + } + + decode(ebliter); + + if (magic != endmagic) { + cerr << "Bad footer magic" << std::endl; + return EFAULT; + } + + return 0; +} + +int write_info(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info, + __u8 struct_ver, map &past_intervals) +{ + //Empty for this + interval_set snap_collections; // obsolete + coll_t coll(info.pgid); + + int ret = PG::_write_info(t, epoch, + info, coll, + past_intervals, + snap_collections, + infos_oid, + struct_ver, + true, true); + if (ret < 0) ret = -ret; + if (ret) cerr << "Failed to write info" << std::endl; + return ret; +} + +void write_log(ObjectStore::Transaction &t, pg_log_t &log) +{ + map divergent_priors; + PGLog::write_log(t, log, log_oid, divergent_priors); +} + +int write_pg(ObjectStore::Transaction &t, epoch_t epoch, pg_info_t &info, + pg_log_t &log, __u8 struct_ver, map &past_intervals) +{ + int ret = write_info(t, epoch, info, struct_ver, past_intervals); + if (ret) return ret; + write_log(t, log); + return 0; +} + +const int OMAP_BATCH_SIZE = 25; +void get_omap_batch(ObjectMap::ObjectMapIterator &iter, map &oset) +{ + oset.clear(); + for (int count = OMAP_BATCH_SIZE; count && iter->valid(); --count, iter->next()) { + oset.insert(pair(iter->key(), iter->value())); + } +} + +int export_file(ObjectStore *store, coll_t cid, ghobject_t &obj) +{ + struct stat st; + mysize_t total; + footer ft; + + int ret = store->stat(cid, obj, &st); + if (ret < 0) + return ret; + + cerr << "Read " << obj << std::endl; + + total = st.st_size; + if (debug) + cerr << "size=" << total << std::endl; + + object_begin objb(obj); + + { + bufferptr bp; + bufferlist bl; + ret = store->getattr(cid, obj, OI_ATTR, bp); + if (ret < 0) { + cerr << "getattr failure object_info " << ret << std::endl; + return ret; + } + bl.push_back(bp); + decode(objb.oi, bl); + if (debug) + cerr << "object_info: " << objb.oi << std::endl; + } + + // XXX: Should we be checking for WHITEOUT or LOST in objb.oi.flags and skip? + + ret = write_section(TYPE_OBJECT_BEGIN, objb, file_fd); + if (ret < 0) + return ret; + + uint64_t offset = 0; + bufferlist rawdatabl; + while(total > 0) { + rawdatabl.clear(); + mysize_t len = max_read; + if (len > total) + len = total; + + ret = store->read(cid, obj, offset, len, rawdatabl); + if (ret < 0) + return ret; + if (ret == 0) + return -EINVAL; + + data_section dblock(offset, len, rawdatabl); + if (debug) + cerr << "data section offset=" << offset << " len=" << len << std::endl; + + total -= ret; + offset += ret; + + ret = write_section(TYPE_DATA, dblock, file_fd); + if (ret) return ret; + } + + //Handle attrs for this object + map aset; + ret = store->getattrs(cid, obj, aset, false); + if (ret) return ret; + attr_section as(aset); + ret = write_section(TYPE_ATTRS, as, file_fd); + if (ret) + return ret; + + if (debug) { + cerr << "attrs size " << aset.size() << std::endl; + } + + //Handle omap information + bufferlist hdrbuf; + ret = store->omap_get_header(cid, obj, &hdrbuf, true); + if (ret < 0) { + cerr << "omap_get_header: " << cpp_strerror(-ret) << std::endl; + return ret; + } + + omap_hdr_section ohs(hdrbuf); + ret = write_section(TYPE_OMAP_HDR, ohs, file_fd); + if (ret) + return ret; + + ObjectMap::ObjectMapIterator iter = store->get_omap_iterator(cid, obj); + if (!iter) { + ret = -ENOENT; + cerr << "omap_get_iterator: " << cpp_strerror(-ret) << std::endl; + return ret; + } + iter->seek_to_first(); + int mapcount = 0; + map out; + while(iter->valid()) { + get_omap_batch(iter, out); + + if (out.empty()) break; + + mapcount += out.size(); + omap_section oms(out); + ret = write_section(TYPE_OMAP, oms, file_fd); + if (ret) + return ret; + } + if (debug) + cerr << "omap map size " << mapcount << std::endl; + + ret = write_simple(TYPE_OBJECT_END, file_fd); + if (ret) + return ret; + + return 0; +} + +int export_files(ObjectStore *store, coll_t coll) +{ + ghobject_t next; + + while (!next.is_max()) { + vector objects; + int r = store->collection_list_partial(coll, next, 200, 300, 0, + &objects, &next); + if (r < 0) + return r; + for (vector::iterator i = objects.begin(); + i != objects.end(); + ++i) { + r = export_file(store, coll, *i); + if (r < 0) + return r; + } + } + return 0; +} + +int get_osdmap(ObjectStore *store, epoch_t e, OSDMap &osdmap) +{ + bufferlist bl; + bool found = store->read( + coll_t::META_COLL, OSD::get_osdmap_pobject_name(e), 0, 0, bl) >= 0; + if (!found) { + cerr << "Can't find OSDMap for pg epoch " << e << std::endl; + return ENOENT; + } + osdmap.decode(bl); + if (debug) + cerr << osdmap << std::endl; + return 0; +} + +int add_osdmap(ObjectStore *store, metadata_section &ms) +{ + return get_osdmap(store, ms.map_epoch, ms.osdmap); +} + +//Write super_header with its fixed 16 byte length +void write_super() +{ + bufferlist superbl; + super_header sh; + footer ft; + + header hdr(TYPE_NONE, 0); + hdr.encode(superbl); + + sh.magic = super_header::super_magic; + sh.version = super_header::super_ver; + sh.header_size = superbl.length(); + superbl.clear(); + ft.encode(superbl); + sh.footer_size = superbl.length(); + superbl.clear(); + + sh.encode(superbl); + assert(super_header::FIXED_LENGTH == superbl.length()); + superbl.write_fd(file_fd); +} + +int do_export(ObjectStore *fs, coll_t coll, spg_t pgid, pg_info_t &info, + epoch_t map_epoch, __u8 struct_ver, const OSDSuperblock& superblock, + map &past_intervals) +{ + PGLog::IndexedLog log; + pg_missing_t missing; + + cerr << "Exporting " << pgid << std::endl; + + int ret = get_log(fs, coll, pgid, info, log, missing); + if (ret > 0) + return ret; + + write_super(); + + pg_begin pgb(pgid, superblock); + // Special case: If replicated pg don't require the importing OSD to have shard feature + if (pgid.is_no_shard()) { + pgb.superblock.compat_features.incompat.remove(CEPH_OSD_FEATURE_INCOMPAT_SHARDS); + } + ret = write_section(TYPE_PG_BEGIN, pgb, file_fd); + if (ret) + return ret; + + // The metadata_section is now before files, so import can detect + // errors and abort without wasting time. + metadata_section ms(struct_ver, map_epoch, info, log, past_intervals); + ret = add_osdmap(fs, ms); + if (ret) + return ret; + ret = write_section(TYPE_PG_METADATA, ms, file_fd); + if (ret) + return ret; + + ret = export_files(fs, coll); + if (ret) { + cerr << "export_files error " << ret << std::endl; + return ret; + } + + ret = write_simple(TYPE_PG_END, file_fd); + if (ret) + return ret; + + return 0; +} + +int super_header::read_super() +{ + bufferlist ebl; + bufferlist::iterator ebliter = ebl.begin(); + ssize_t bytes; + + bytes = ebl.read_fd(file_fd, super_header::FIXED_LENGTH); + if ((size_t)bytes != super_header::FIXED_LENGTH) { + cerr << "Unexpected EOF" << std::endl; + return EFAULT; + } + + decode(ebliter); + + return 0; +} + +int read_section(int fd, sectiontype_t *type, bufferlist *bl) +{ + header hdr; + ssize_t bytes; + + int ret = hdr.get_header(); + if (ret) + return ret; + + *type = hdr.type; + + bl->clear(); + bytes = bl->read_fd(fd, hdr.size); + if (bytes != hdr.size) { + cerr << "Unexpected EOF" << std::endl; + return EFAULT; + } + + if (hdr.size > 0) { + footer ft; + ret = ft.get_footer(); + if (ret) + return ret; + } + + return 0; +} + +int get_data(ObjectStore *store, coll_t coll, ghobject_t hoid, + ObjectStore::Transaction *t, bufferlist &bl) +{ + bufferlist::iterator ebliter = bl.begin(); + data_section ds; + ds.decode(ebliter); + + if (debug) + cerr << "\tdata: offset " << ds.offset << " len " << ds.len << std::endl; + t->write(coll, hoid, ds.offset, ds.len, ds.databl); + return 0; +} + +int get_attrs(ObjectStore *store, coll_t coll, ghobject_t hoid, + ObjectStore::Transaction *t, bufferlist &bl, + OSDriver &driver, SnapMapper &snap_mapper) +{ + bufferlist::iterator ebliter = bl.begin(); + attr_section as; + as.decode(ebliter); + + if (debug) + cerr << "\tattrs: len " << as.data.size() << std::endl; + t->setattrs(coll, hoid, as.data); + + // This could have been handled in the caller if we didn't need to + // support exports that didn't include object_info_t in object_begin. + if (hoid.hobj.snap < CEPH_MAXSNAP && hoid.generation == ghobject_t::NO_GEN) { + map::iterator mi = as.data.find(OI_ATTR); + if (mi != as.data.end()) { + bufferlist attr_bl; + attr_bl.push_back(mi->second); + object_info_t oi(attr_bl); + + if (debug) + cerr << "object_info " << oi << std::endl; + + OSDriver::OSTransaction _t(driver.get_transaction(t)); + set oi_snaps(oi.snaps.begin(), oi.snaps.end()); + snap_mapper.add_oid(hoid.hobj, oi_snaps, &_t); + } + } + + return 0; +} + +int get_omap_hdr(ObjectStore *store, coll_t coll, ghobject_t hoid, + ObjectStore::Transaction *t, bufferlist &bl) +{ + bufferlist::iterator ebliter = bl.begin(); + omap_hdr_section oh; + oh.decode(ebliter); + + if (debug) + cerr << "\tomap header: " << string(oh.hdr.c_str(), oh.hdr.length()) + << std::endl; + t->omap_setheader(coll, hoid, oh.hdr); + return 0; +} + +int get_omap(ObjectStore *store, coll_t coll, ghobject_t hoid, + ObjectStore::Transaction *t, bufferlist &bl) +{ + bufferlist::iterator ebliter = bl.begin(); + omap_section os; + os.decode(ebliter); + + if (debug) + cerr << "\tomap: size " << os.omap.size() << std::endl; + t->omap_setkeys(coll, hoid, os.omap); + return 0; +} + +int skip_object(bufferlist &bl) +{ + bufferlist::iterator ebliter = bl.begin(); + bufferlist ebl; + bool done = false; + while(!done) { + sectiontype_t type; + int ret = read_section(file_fd, &type, &ebl); + if (ret) + return ret; + + ebliter = ebl.begin(); + if (type >= END_OF_TYPES) { + cout << "Skipping unknown object section type" << std::endl; + continue; + } + switch(type) { + case TYPE_DATA: + case TYPE_ATTRS: + case TYPE_OMAP_HDR: + case TYPE_OMAP: + if (debug) + cerr << "Skip type " << (int)type << std::endl; + break; + case TYPE_OBJECT_END: + done = true; + break; + default: + return EFAULT; + } + } + return 0; +} + +int get_object_rados(librados::IoCtx &ioctx, bufferlist &bl) +{ + bufferlist::iterator ebliter = bl.begin(); + object_begin ob; + ob.decode(ebliter); + map::iterator i; + bufferlist abl; + + data_section ds; + attr_section as; + omap_hdr_section oh; + omap_section os; + + assert(g_ceph_context); + if (ob.hoid.hobj.nspace == g_ceph_context->_conf->osd_hit_set_namespace) { + cout << "Skipping internal object " << ob.hoid << std::endl; + skip_object(bl); + return 0; + } + + if (!ob.hoid.hobj.is_head()) { + cout << "Skipping non-head for " << ob.hoid << std::endl; + skip_object(bl); + return 0; + } + + ioctx.set_namespace(ob.hoid.hobj.get_namespace()); + + string msg("Write"); + int ret = ioctx.create(ob.hoid.hobj.oid.name, true); + if (ret && ret != -EEXIST) { + cerr << "create failed: " << cpp_strerror(ret) << std::endl; + return ret; + } + if (ret == -EEXIST) { + msg = "***Overwrite***"; + ret = ioctx.remove(ob.hoid.hobj.oid.name); + if (ret < 0) { + cerr << "remove failed: " << cpp_strerror(ret) << std::endl; + return ret; + } + ret = ioctx.create(ob.hoid.hobj.oid.name, true); + if (ret < 0) { + cerr << "create failed: " << cpp_strerror(ret) << std::endl; + return ret; + } + } + + cout << msg << " " << ob.hoid << std::endl; + + bool need_align = false; + uint64_t alignment = 0; + if (testalign) { + need_align = true; + alignment = testalign; + } else { + if ((need_align = ioctx.pool_requires_alignment())) + alignment = ioctx.pool_required_alignment(); + } + + if (debug && need_align) + cerr << "alignment = " << alignment << std::endl; + + bufferlist ebl, databl; + uint64_t in_offset = 0, out_offset = 0; + bool done = false; + while(!done) { + sectiontype_t type; + int ret = read_section(file_fd, &type, &ebl); + if (ret) + return ret; + + ebliter = ebl.begin(); + //cout << "\tdo_object: Section type " << hex << type << dec << std::endl; + //cout << "\t\tsection size " << ebl.length() << std::endl; + if (type >= END_OF_TYPES) { + cout << "Skipping unknown object section type" << std::endl; + continue; + } + switch(type) { + case TYPE_DATA: + ds.decode(ebliter); + if (debug) + cerr << "\tdata: offset " << ds.offset << " len " << ds.len << std::endl; + if (need_align) { + if (ds.offset != in_offset) { + cerr << "Discontiguous object data in export" << std::endl; + return EFAULT; + } + assert(ds.databl.length() == ds.len); + databl.claim_append(ds.databl); + in_offset += ds.len; + if (databl.length() >= alignment) { + uint64_t rndlen = uint64_t(databl.length() / alignment) * alignment; + if (debug) cerr << "write offset=" << out_offset << " len=" << rndlen << std::endl; + ret = ioctx.write(ob.hoid.hobj.oid.name, databl, rndlen, out_offset); + if (ret) { + cerr << "write failed: " << cpp_strerror(ret) << std::endl; + return ret; + } + out_offset += rndlen; + bufferlist n; + if (databl.length() > rndlen) { + assert(databl.length() - rndlen < alignment); + n.substr_of(databl, rndlen, databl.length() - rndlen); + } + databl = n; + } + break; + } + ret = ioctx.write(ob.hoid.hobj.oid.name, ds.databl, ds.len, ds.offset); + if (ret) { + cerr << "write failed: " << cpp_strerror(ret) << std::endl; + return ret; + } + break; + case TYPE_ATTRS: + as.decode(ebliter); + + if (debug) + cerr << "\tattrs: len " << as.data.size() << std::endl; + for (i = as.data.begin(); i != as.data.end(); ++i) { + if (i->first == "_" || i->first == "snapset") + continue; + abl.clear(); + abl.push_front(i->second); + ret = ioctx.setxattr(ob.hoid.hobj.oid.name, i->first.substr(1).c_str(), abl); + if (ret) { + cerr << "setxattr failed: " << cpp_strerror(ret) << std::endl; + if (ret != -EOPNOTSUPP) + return ret; + } + } + break; + case TYPE_OMAP_HDR: + oh.decode(ebliter); + + if (debug) + cerr << "\tomap header: " << string(oh.hdr.c_str(), oh.hdr.length()) + << std::endl; + ret = ioctx.omap_set_header(ob.hoid.hobj.oid.name, oh.hdr); + if (ret) { + cerr << "omap_set_header failed: " << cpp_strerror(ret) << std::endl; + if (ret != -EOPNOTSUPP) + return ret; + } + break; + case TYPE_OMAP: + os.decode(ebliter); + + if (debug) + cerr << "\tomap: size " << os.omap.size() << std::endl; + ret = ioctx.omap_set(ob.hoid.hobj.oid.name, os.omap); + if (ret) { + cerr << "omap_set failed: " << cpp_strerror(ret) << std::endl; + if (ret != -EOPNOTSUPP) + return ret; + } + break; + case TYPE_OBJECT_END: + if (need_align && databl.length() > 0) { + assert(databl.length() < alignment); + if (debug) cerr << "END write offset=" << out_offset << " len=" << databl.length() << std::endl; + ret = ioctx.write(ob.hoid.hobj.oid.name, databl, databl.length(), out_offset); + if (ret) { + cerr << "write failed: " << cpp_strerror(ret) << std::endl; + return ret; + } + } + done = true; + break; + default: + return EFAULT; + } + } + return 0; +} + +int get_object(ObjectStore *store, coll_t coll, bufferlist &bl, OSDMap &curmap, coll_t final_coll) +{ + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + bufferlist::iterator ebliter = bl.begin(); + object_begin ob; + ob.decode(ebliter); + OSDriver driver( + store, + coll_t(), + OSD::make_snapmapper_oid()); + spg_t pg; + coll.is_pg_prefix(pg); + SnapMapper mapper(&driver, 0, 0, 0, pg.shard); + + assert(g_ceph_context); + if (ob.hoid.hobj.nspace != g_ceph_context->_conf->osd_hit_set_namespace) { + object_t oid = ob.hoid.hobj.oid; + object_locator_t loc(ob.hoid.hobj); + // XXX: Do we need to set the hash? + // loc.hash = ob.hoid.hash; + pg_t raw_pgid = curmap.object_locator_to_pg(oid, loc); + pg_t pgid = curmap.raw_pg_to_pg(raw_pgid); + + spg_t coll_pgid; + snapid_t coll_snap; + if (final_coll.is_pg(coll_pgid, coll_snap) == false) { + cerr << "INTERNAL ERROR: Bad collection during import" << std::endl; + return 1; + } + if (coll_pgid.shard != ob.hoid.shard_id) { + cerr << "INTERNAL ERROR: Importing shard " << coll_pgid.shard + << " but object shard is " << ob.hoid.shard_id << std::endl; + return 1; + } + + if (coll_pgid.pgid != pgid) { + cerr << "Skipping object '" << ob.hoid << "' which no longer belongs in exported pg" << std::endl; + skip_object(bl); + return 0; + } + } + + t->touch(coll, ob.hoid); + + cout << "Write " << ob.hoid << std::endl; + + bufferlist ebl; + bool done = false; + while(!done) { + sectiontype_t type; + int ret = read_section(file_fd, &type, &ebl); + if (ret) + return ret; + + //cout << "\tdo_object: Section type " << hex << type << dec << std::endl; + //cout << "\t\tsection size " << ebl.length() << std::endl; + if (type >= END_OF_TYPES) { + cout << "Skipping unknown object section type" << std::endl; + continue; + } + switch(type) { + case TYPE_DATA: + ret = get_data(store, coll, ob.hoid, t, ebl); + if (ret) return ret; + break; + case TYPE_ATTRS: + ret = get_attrs(store, coll, ob.hoid, t, ebl, driver, mapper); + if (ret) return ret; + break; + case TYPE_OMAP_HDR: + ret = get_omap_hdr(store, coll, ob.hoid, t, ebl); + if (ret) return ret; + break; + case TYPE_OMAP: + ret = get_omap(store, coll, ob.hoid, t, ebl); + if (ret) return ret; + break; + case TYPE_OBJECT_END: + done = true; + break; + default: + return EFAULT; + } + } + store->apply_transaction(*t); + return 0; +} + +int get_pg_metadata(ObjectStore *store, bufferlist &bl, metadata_section &ms, + const OSDSuperblock& sb, OSDMap& curmap) +{ + bufferlist::iterator ebliter = bl.begin(); + ms.decode(ebliter); + +#if DIAGNOSTIC + Formatter *formatter = new JSONFormatter(true); + cout << "struct_v " << (int)ms.struct_ver << std::endl; + cout << "map epoch " << ms.map_epoch << std::endl; + + formatter->open_object_section("importing OSDMap"); + ms.osdmap.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; + + cout << "osd current epoch " << sb.current_epoch << std::endl; + formatter->open_object_section("current OSDMap"); + curmap.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; + + formatter->open_object_section("info"); + ms.info.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; + + formatter->open_object_section("log"); + ms.log.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; +#endif + + if (ms.map_epoch > sb.current_epoch) { + cerr << "ERROR: Export map_epoch " << ms.map_epoch << " > osd epoch " << sb.current_epoch << std::endl; + return 1; + } + + // If the osdmap was present in the metadata we can check for splits. + // Pool verified to exist for call to get_pg_num(). + if (ms.map_epoch < sb.current_epoch) { + bool found_map = false; + OSDMap findmap; + int ret = get_osdmap(store, ms.map_epoch, findmap); + if (ret == 0) + found_map = true; + + // Old export didn't include OSDMap + if (ms.osdmap.get_epoch() == 0) { + // If we found the map locally and an older export didn't have it, + // then we'll use the local one. + if (found_map) { + ms.osdmap = findmap; + } else { + cerr << "WARNING: No OSDMap in old export," + " some objects may be ignored due to a split" << std::endl; + } + } + + // If OSDMap is available check for splits + if (ms.osdmap.get_epoch()) { + spg_t parent(ms.info.pgid); + if (parent.is_split(ms.osdmap.get_pg_num(ms.info.pgid.pgid.m_pool), + curmap.get_pg_num(ms.info.pgid.pgid.m_pool), NULL)) { + cerr << "WARNING: Split occurred, some objects may be ignored" << std::endl; + } + } + } + + ms.past_intervals.clear(); + ms.info.history.same_interval_since = ms.map_epoch = sb.current_epoch; + + return 0; +} + +int do_import_rados(string pool) +{ + bufferlist ebl; + pg_info_t info; + PGLog::IndexedLog log; + + int ret = sh.read_super(); + if (ret) + return ret; + + if (sh.magic != super_header::super_magic) { + cerr << "Invalid magic number" << std::endl; + return EFAULT; + } + + if (sh.version > super_header::super_ver) { + cerr << "Can't handle export format version=" << sh.version << std::endl; + return EINVAL; + } + + //First section must be TYPE_PG_BEGIN + sectiontype_t type; + ret = read_section(file_fd, &type, &ebl); + if (ret) + return ret; + if (type != TYPE_PG_BEGIN) { + return EFAULT; + } + + bufferlist::iterator ebliter = ebl.begin(); + pg_begin pgb; + pgb.decode(ebliter); + spg_t pgid = pgb.pgid; + + if (!pgid.is_no_shard()) { + cerr << "Importing Erasure Coded shard is not supported" << std::endl; + exit(1); + } + + if (debug) { + cerr << "Exported features: " << pgb.superblock.compat_features << std::endl; + } + + // XXX: How to check export features? +#if 0 + if (sb.compat_features.compare(pgb.superblock.compat_features) == -1) { + cerr << "Export has incompatible features set " + << pgb.superblock.compat_features << std::endl; + return 1; + } +#endif + + librados::IoCtx ioctx; + librados::Rados cluster; + + char *id = getenv("CEPH_CLIENT_ID"); + if (id) cerr << "Client id is: " << id << std::endl; + ret = cluster.init(id); + if (ret) { + cerr << "Error " << ret << " in cluster.init" << std::endl; + return ret; + } + ret = cluster.conf_read_file(NULL); + if (ret) { + cerr << "Error " << ret << " in cluster.conf_read_file" << std::endl; + return ret; + } + ret = cluster.conf_parse_env(NULL); + if (ret) { + cerr << "Error " << ret << " in cluster.conf_read_env" << std::endl; + return ret; + } + cluster.connect(); + + ret = cluster.ioctx_create(pool.c_str(), ioctx); + if (ret < 0) { + cerr << "ioctx_create " << pool << " failed with " << ret << std::endl; + return ret; + } + + cout << "Importing from pgid " << pgid << std::endl; + + bool done = false; + bool found_metadata = false; + metadata_section ms; + while(!done) { + ret = read_section(file_fd, &type, &ebl); + if (ret) + return ret; + + //cout << "do_import: Section type " << hex << type << dec << std::endl; + if (type >= END_OF_TYPES) { + cout << "Skipping unknown section type" << std::endl; + continue; + } + switch(type) { + case TYPE_OBJECT_BEGIN: + ret = get_object_rados(ioctx, ebl); + if (ret) return ret; + break; + case TYPE_PG_METADATA: + if (debug) + cout << "Don't care about the old metadata" << std::endl; + found_metadata = true; + break; + case TYPE_PG_END: + done = true; + break; + default: + return EFAULT; + } + } + + if (!found_metadata) { + cerr << "Missing metadata section, ignored" << std::endl; + } + + return 0; +} + +int do_import(ObjectStore *store, OSDSuperblock& sb) +{ + bufferlist ebl; + pg_info_t info; + PGLog::IndexedLog log; + + uint64_t next_removal_seq = 0; //My local seq + finish_remove_pgs(store, &next_removal_seq); + + int ret = sh.read_super(); + if (ret) + return ret; + + if (sh.magic != super_header::super_magic) { + cerr << "Invalid magic number" << std::endl; + return EFAULT; + } + + if (sh.version > super_header::super_ver) { + cerr << "Can't handle export format version=" << sh.version << std::endl; + return EINVAL; + } + + //First section must be TYPE_PG_BEGIN + sectiontype_t type; + ret = read_section(file_fd, &type, &ebl); + if (ret) + return ret; + if (type != TYPE_PG_BEGIN) { + return EFAULT; + } + + bufferlist::iterator ebliter = ebl.begin(); + pg_begin pgb; + pgb.decode(ebliter); + spg_t pgid = pgb.pgid; + + if (!pgb.superblock.cluster_fsid.is_zero() + && pgb.superblock.cluster_fsid != sb.cluster_fsid) { + cerr << "Export came from different cluster with fsid " + << pgb.superblock.cluster_fsid << std::endl; + return 1; + } + + if (debug) { + cerr << "Exported features: " << pgb.superblock.compat_features << std::endl; + } + + // Special case: Old export has SHARDS incompat feature on replicated pg, remove it + if (pgid.is_no_shard()) + pgb.superblock.compat_features.incompat.remove(CEPH_OSD_FEATURE_INCOMPAT_SHARDS); + + if (sb.compat_features.compare(pgb.superblock.compat_features) == -1) { + CompatSet unsupported = sb.compat_features.unsupported(pgb.superblock.compat_features); + + cerr << "Export has incompatible features set " << unsupported << std::endl; + + // If shards setting the issue, then inform user what they can do about it. + if (unsupported.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_SHARDS)) { + cerr << std::endl; + cerr << "OSD requires sharding to be enabled" << std::endl; + cerr << std::endl; + cerr << "If you wish to import, first do 'ceph-objectstore-tool...--op set-allow-sharded-objects'" << std::endl; + } + return 11; // Assume no +EAGAIN gets to end of main() until we clean up error code handling + } + + // Don't import if pool no longer exists + OSDMap curmap; + ret = get_osdmap(store, sb.current_epoch, curmap); + if (ret) { + cerr << "Can't find local OSDMap" << std::endl; + return ret; + } + if (!curmap.have_pg_pool(pgid.pgid.m_pool)) { + cerr << "Pool " << pgid.pgid.m_pool << " no longer exists" << std::endl; + // Special exit code for this error, used by test code + return 10; // Assume no +ECHILD gets to end of main() until we clean up error code handling + } + + log_oid = OSD::make_pg_log_oid(pgid); + biginfo_oid = OSD::make_pg_biginfo_oid(pgid); + + //Check for PG already present. + coll_t coll(pgid); + if (store->collection_exists(coll)) { + cerr << "pgid " << pgid << " already exists" << std::endl; + return 1; + } + + //Switch to collection which will be removed automatically if + //this program is interupted. + coll_t rmcoll = coll_t::make_removal_coll(next_removal_seq, pgid); + ObjectStore::Transaction *t = new ObjectStore::Transaction; + t->create_collection(rmcoll); + store->apply_transaction(*t); + delete t; + + cout << "Importing pgid " << pgid << std::endl; + + bool done = false; + bool found_metadata = false; + metadata_section ms; + while(!done) { + ret = read_section(file_fd, &type, &ebl); + if (ret) + return ret; + + //cout << "do_import: Section type " << hex << type << dec << std::endl; + if (type >= END_OF_TYPES) { + cout << "Skipping unknown section type" << std::endl; + continue; + } + switch(type) { + case TYPE_OBJECT_BEGIN: + ret = get_object(store, rmcoll, ebl, curmap, coll); + if (ret) return ret; + break; + case TYPE_PG_METADATA: + ret = get_pg_metadata(store, ebl, ms, sb, curmap); + if (ret) return ret; + found_metadata = true; + break; + case TYPE_PG_END: + done = true; + break; + default: + return EFAULT; + } + } + + if (!found_metadata) { + cerr << "Missing metadata section" << std::endl; + return EFAULT; + } + + t = new ObjectStore::Transaction; + assert(ms.info.pgid == pgid); + coll_t newcoll(ms.info.pgid); + t->collection_rename(rmcoll, newcoll); + + ret = write_pg(*t, ms.map_epoch, ms.info, ms.log, ms.struct_ver, ms.past_intervals); + if (ret) return ret; + + store->apply_transaction(*t); + delete t; + + return 0; +} + +int do_list(ObjectStore *store, string pgidstr, string object, Formatter *formatter, bool debug, bool human_readable) +{ + int r; + lookup_ghobject lookup(object); + if (pgidstr.length() > 0) { + spg_t pgid; + pgid.parse(pgidstr.c_str()); + r = action_on_all_objects_in_pg(store, coll_t(pgid), lookup, debug); + } else { + r = action_on_all_objects(store, lookup, debug); + } + if (r) + return r; + lookup.dump(formatter, human_readable); + formatter->flush(cout); + cout << std::endl; + return 0; +} + +int do_remove_object(ObjectStore *store, coll_t coll, ghobject_t &ghobj) +{ + spg_t pg; + coll.is_pg_prefix(pg); + OSDriver driver( + store, + coll_t(), + OSD::make_snapmapper_oid()); + SnapMapper mapper(&driver, 0, 0, 0, pg.shard); + struct stat st; + + int r = store->stat(coll, ghobj, &st); + if (r < 0) { + cerr << "remove: " << cpp_strerror(-r) << std::endl; + return r; + } + + ObjectStore::Transaction *t = new ObjectStore::Transaction; + OSDriver::OSTransaction _t(driver.get_transaction(t)); + cout << "remove " << ghobj << std::endl; + r = mapper.remove_oid(ghobj.hobj, &_t); + if (r != 0 && r != -ENOENT) { + cerr << "remove_oid returned " << cpp_strerror(-r) << std::endl; + return r; + } + + t->remove(coll, ghobj); + + store->apply_transaction(*t); + delete t; + return 0; +} + +int do_list_attrs(ObjectStore *store, coll_t coll, ghobject_t &ghobj) +{ + map aset; + int r = store->getattrs(coll, ghobj, aset); + if (r < 0) { + cerr << "getattrs: " << cpp_strerror(-r) << std::endl; + return r; + } + + for (map::iterator i = aset.begin();i != aset.end(); ++i) { + string key(i->first); + if (outistty) + cleanbin(key); + cout << key << std::endl; + } + return 0; +} + +int do_list_omap(ObjectStore *store, coll_t coll, ghobject_t &ghobj) +{ + ObjectMap::ObjectMapIterator iter = store->get_omap_iterator(coll, ghobj); + if (!iter) { + cerr << "omap_get_iterator: " << cpp_strerror(ENOENT) << std::endl; + return -ENOENT; + } + iter->seek_to_first(); + map oset; + while(iter->valid()) { + get_omap_batch(iter, oset); + + for (map::iterator i = oset.begin();i != oset.end(); ++i) { + string key(i->first); + if (outistty) + cleanbin(key); + cout << key << std::endl; + } + } + return 0; +} + +int do_get_bytes(ObjectStore *store, coll_t coll, ghobject_t &ghobj, int fd) +{ + struct stat st; + mysize_t total; + + int ret = store->stat(coll, ghobj, &st); + if (ret < 0) { + cerr << "get-bytes: " << cpp_strerror(-ret) << std::endl; + return 1; + } + + total = st.st_size; + if (debug) + cerr << "size=" << total << std::endl; + + uint64_t offset = 0; + bufferlist rawdatabl; + while(total > 0) { + rawdatabl.clear(); + mysize_t len = max_read; + if (len > total) + len = total; + + ret = store->read(coll, ghobj, offset, len, rawdatabl); + if (ret < 0) + return ret; + if (ret == 0) + return -EINVAL; + + if (debug) + cerr << "data section offset=" << offset << " len=" << len << std::endl; + + total -= ret; + offset += ret; + + ret = write(fd, rawdatabl.c_str(), ret); + if (ret == -1) { + perror("write"); + return 1; + } + } + + return 0; +} + +int do_set_bytes(ObjectStore *store, coll_t coll, ghobject_t &ghobj, int fd) +{ + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + + if (debug) + cerr << "Write " << ghobj << std::endl; + + t->touch(coll, ghobj); + t->truncate(coll, ghobj, 0); + + uint64_t offset = 0; + bufferlist rawdatabl; + do { + rawdatabl.clear(); + ssize_t bytes = rawdatabl.read_fd(fd, max_read); + if (bytes < 0) { + cerr << "read_fd error " << cpp_strerror(-bytes) << std::endl; + return 1; + } + + if (bytes == 0) + break; + + if (debug) + cerr << "\tdata: offset " << offset << " bytes " << bytes << std::endl; + t->write(coll, ghobj, offset, bytes, rawdatabl); + + offset += bytes; + // XXX: Should we apply_transaction() every once in a while for very large files + } while(true); + + store->apply_transaction(*t); + return 0; +} + +int do_get_attr(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key) +{ + bufferptr bp; + + int r = store->getattr(coll, ghobj, key.c_str(), bp); + if (r < 0) { + cerr << "getattr: " << cpp_strerror(-r) << std::endl; + return r; + } + + string value(bp.c_str(), bp.length()); + if (outistty) { + cleanbin(value); + value.push_back('\n'); + } + cout << value; + + return 0; +} + +int do_set_attr(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key, int fd) +{ + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + bufferlist bl; + + if (debug) + cerr << "Setattr " << ghobj << std::endl; + + if (get_fd_data(fd, bl)) + return 1; + + t->touch(coll, ghobj); + + t->setattr(coll, ghobj, key, bl); + + store->apply_transaction(*t); + return 0; +} + +int do_rm_attr(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key) +{ + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + + if (debug) + cerr << "Rmattr " << ghobj << std::endl; + + t->rmattr(coll, ghobj, key); + + store->apply_transaction(*t); + return 0; +} + +int do_get_omap(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key) +{ + set keys; + map out; + + keys.insert(key); + + int r = store->omap_get_values(coll, ghobj, keys, &out); + if (r < 0) { + cerr << "omap_get_values: " << cpp_strerror(-r) << std::endl; + return r; + } + + if (out.empty()) { + cerr << "Key not found" << std::endl; + return -ENOENT; + } + + assert(out.size() == 1); + + bufferlist bl = out.begin()->second; + string value(bl.c_str(), bl.length()); + if (outistty) { + cleanbin(value); + value.push_back('\n'); + } + cout << value; + + return 0; +} + +int do_set_omap(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key, int fd) +{ + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + map attrset; + bufferlist valbl; + + if (debug) + cerr << "Set_omap " << ghobj << std::endl; + + if (get_fd_data(fd, valbl)) + return 1; + + attrset.insert(pair(key, valbl)); + + t->touch(coll, ghobj); + + t->omap_setkeys(coll, ghobj, attrset); + + store->apply_transaction(*t); + return 0; +} + +int do_rm_omap(ObjectStore *store, coll_t coll, ghobject_t &ghobj, string key) +{ + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + set keys; + + keys.insert(key); + + if (debug) + cerr << "Rm_omap " << ghobj << std::endl; + + t->omap_rmkeys(coll, ghobj, keys); + + store->apply_transaction(*t); + return 0; +} + +int do_get_omaphdr(ObjectStore *store, coll_t coll, ghobject_t &ghobj) +{ + bufferlist hdrbl; + + int r = store->omap_get_header(coll, ghobj, &hdrbl, true); + if (r < 0) { + cerr << "omap_get_header: " << cpp_strerror(-r) << std::endl; + return r; + } + + string header(hdrbl.c_str(), hdrbl.length()); + if (outistty) { + cleanbin(header); + header.push_back('\n'); + } + cout << header; + + return 0; +} + +int do_set_omaphdr(ObjectStore *store, coll_t coll, ghobject_t &ghobj, int fd) +{ + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + bufferlist hdrbl; + + if (debug) + cerr << "Omap_setheader " << ghobj << std::endl; + + if (get_fd_data(fd, hdrbl)) + return 1; + + t->touch(coll, ghobj); + + t->omap_setheader(coll, ghobj, hdrbl); + + store->apply_transaction(*t); + return 0; +} + +struct do_list_lost : public action_on_object_t { + virtual int call(ObjectStore *store, coll_t coll, ghobject_t &ghobj, object_info_t &oi) { + if (oi.is_lost()) + cout << coll << "/" << ghobj << " is lost" << std::endl; + return 0; + } +}; + +struct do_fix_lost : public action_on_object_t { + virtual int call(ObjectStore *store, coll_t coll, ghobject_t &ghobj, object_info_t &oi) { + if (oi.is_lost()) { + cout << coll << "/" << ghobj << " is lost, fixing" << std::endl; + oi.clear_flag(object_info_t::FLAG_LOST); + bufferlist bl; + ::encode(oi, bl); + ObjectStore::Transaction t; + t.setattr(coll, ghobj, OI_ATTR, bl); + int r = store->apply_transaction(t); + if (r < 0) { + cerr << "Error getting fixing attr on : " << make_pair(coll, ghobj) + << ", " + << cpp_strerror(r) << std::endl; + return r; + } + } + return 0; + } +}; + +void usage(po::options_description &desc) +{ + cerr << std::endl; + cerr << desc << std::endl; + cerr << std::endl; + cerr << "Positional syntax:" << std::endl; + cerr << std::endl; + cerr << "ceph-objectstore-tool ... (get|set)-bytes [file]" << std::endl; + cerr << "ceph-objectstore-tool ... set-(attr|omap) [file]" << std::endl; + cerr << "ceph-objectstore-tool ... (get|rm)-(attr|omap) " << std::endl; + cerr << "ceph-objectstore-tool ... get-omaphdr" << std::endl; + cerr << "ceph-objectstore-tool ... set-omaphdr [file]" << std::endl; + cerr << "ceph-objectstore-tool ... list-attrs" << std::endl; + cerr << "ceph-objectstore-tool ... list-omap" << std::endl; + cerr << "ceph-objectstore-tool ... remove" << std::endl; + cerr << std::endl; + cerr << "ceph-objectstore-tool import-rados [file]" << std::endl; + cerr << std::endl; + cerr << " can be a JSON object description as displayed" << std::endl; + cerr << "by --op list." << std::endl; + cerr << " can be an object name which will be looked up in all" << std::endl; + cerr << "the OSD's PGs." << std::endl; + cerr << std::endl; + cerr << "The optional [file] argument will read stdin or write stdout" << std::endl; + cerr << "if not specified or if '-' specified." << std::endl; + exit(1); +} + +bool ends_with(const string& check, const string& ending) +{ + return check.size() >= ending.size() && check.rfind(ending) == (check.size() - ending.size()); +} + +int main(int argc, char **argv) +{ + string dpath, jpath, pgidstr, op, file, object, objcmd, arg1, arg2, type, format; + spg_t pgid; + ghobject_t ghobj; + bool human_readable; + Formatter *formatter; + + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "produce help message") + ("type", po::value(&type), + "Arg is one of [filestore (default), memstore, keyvaluestore-dev]") + ("data-path", po::value(&dpath), + "path to object store, mandatory") + ("journal-path", po::value(&jpath), + "path to journal, mandatory for filestore type") + ("pgid", po::value(&pgidstr), + "PG id, mandatory except for import, list-lost, fix-lost, list-pgs, set-allow-sharded-objects") + ("op", po::value(&op), + "Arg is one of [info, log, remove, export, import, list, list-lost, fix-lost, list-pgs, rm-past-intervals, set-allow-sharded-objects]") + ("file", po::value(&file), + "path of file to export or import") + ("format", po::value(&format)->default_value("json-pretty"), + "Output format which may be json, json-pretty, xml, xml-pretty") + ("debug", "Enable diagnostic output to stderr") + ("skip-journal-replay", "Disable journal replay") + ("skip-mount-omap", "Disable mounting of omap") + ; + + po::options_description positional("Positional options"); + positional.add_options() + ("object", po::value(&object), "object name or ghobject in json") + ("objcmd", po::value(&objcmd), "command [(get|set)-bytes, (get|set|rm)-(attr|omap), (get|set)-omaphdr, list-attrs, list-omap, remove]") + ("arg1", po::value(&arg1), "arg1 based on cmd") + ("arg2", po::value(&arg2), "arg2 based on cmd") + ("test-align", po::value(&testalign)->default_value(0), "hidden align option for testing") + ; + + po::options_description all("All options"); + all.add(desc).add(positional); + + po::positional_options_description pd; + pd.add("object", 1).add("objcmd", 1).add("arg1", 1).add("arg2", 1); + + po::variables_map vm; + po::parsed_options parsed = + po::command_line_parser(argc, argv).options(all).allow_unregistered().positional(pd).run(); + po::store( parsed, vm); + try { + po::notify(vm); + } + catch(...) { + usage(desc); + } + + if (vm.count("help")) { + usage(desc); + } + + if (!vm.count("debug")) { + debug = false; + } else { + debug = true; + } + + vector ceph_options; + env_to_vec(ceph_options); + vector ceph_option_strings = po::collect_unrecognized( + parsed.options, po::include_positional); + ceph_options.reserve(ceph_options.size() + 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()); + } + + // Handle completely different operation "import-rados" + if (object == "import-rados") { + if (vm.count("objcmd") == 0) { + cerr << "ceph-objectstore-tool import-rados [file]" << std::endl; + exit(1); + } + + string pool = objcmd; + // positional argument takes precendence, but accept + // --file option too + if (!vm.count("arg1")) { + if (!vm.count("file")) + arg1 = "-"; + else + arg1 = file; + } + if (arg1 == "-") { + if (isatty(STDIN_FILENO)) { + cerr << "stdin is a tty and no file specified" << std::endl; + exit(1); + } + file_fd = STDIN_FILENO; + } else { + file_fd = open(arg1.c_str(), O_RDONLY); + if (file_fd < 0) { + perror("open"); + return 1; + } + } + + global_init(NULL, ceph_options, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0); + common_init_finish(g_ceph_context); + + int ret = do_import_rados(pool); + if (ret == 0) + cout << "Import successful" << std::endl; + return ret != 0; + } + + if (!vm.count("data-path")) { + cerr << "Must provide --data-path" << std::endl; + usage(desc); + } + if (!vm.count("type")) { + type = "filestore"; + } + if (type == "filestore" && !vm.count("journal-path")) { + cerr << "Must provide --journal-path" << std::endl; + usage(desc); + } + if (op != "list" && vm.count("object") && !vm.count("objcmd")) { + cerr << "Invalid syntax, missing command" << std::endl; + usage(desc); + } + if (!vm.count("op") && !(vm.count("object") && vm.count("objcmd"))) { + cerr << "Must provide --op or object command..." << std::endl; + usage(desc); + } + if (op != "list" && vm.count("op") && vm.count("object")) { + cerr << "Can't specify both --op and object command syntax" << std::endl; + usage(desc); + } + outistty = isatty(STDOUT_FILENO); + + file_fd = fd_none; + if (op == "export") { + if (!vm.count("file") || file == "-") { + if (outistty) { + cerr << "stdout is a tty and no --file filename specified" << std::endl; + exit(1); + } + file_fd = STDOUT_FILENO; + } else { + file_fd = open(file.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666); + } + } else if (op == "import") { + if (!vm.count("file") || file == "-") { + if (isatty(STDIN_FILENO)) { + cerr << "stdin is a tty and no --file filename specified" << std::endl; + exit(1); + } + file_fd = STDIN_FILENO; + } else { + file_fd = open(file.c_str(), O_RDONLY); + } + } + + if (vm.count("file") && file_fd == fd_none) { + cerr << "--file option only applies to import or export" << std::endl; + return 1; + } + + if (file_fd != fd_none && file_fd < 0) { + perror("open"); + return 1; + } + + if (dpath.length() == 0) { + cerr << "Invalid params" << std::endl; + return 1; + } + + osflagbits_t flags = 0; + if (vm.count("skip-journal-replay")) + flags |= SKIP_JOURNAL_REPLAY; + if (vm.count("skip-mount-omap")) + flags |= SKIP_MOUNT_OMAP; + + global_init( + NULL, ceph_options, CEPH_ENTITY_TYPE_OSD, + CODE_ENVIRONMENT_UTILITY_NODOUT, 0); + //CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); + common_init_finish(g_ceph_context); + g_conf = g_ceph_context->_conf; + if (debug) { + g_conf->set_val_or_die("log_to_stderr", "true"); + g_conf->set_val_or_die("err_to_stderr", "true"); + } + g_conf->apply_changes(NULL); + + //Verify that data-path really exists + struct stat st; + if (::stat(dpath.c_str(), &st) == -1) { + perror("data-path"); + exit(1); + } + //Verify data data-path really is a filestore + if (type == "filestore") { + if (!S_ISDIR(st.st_mode)) { + invalid_filestore_path(dpath); + } + string check = dpath + "/whoami"; + if (::stat(check.c_str(), &st) == -1) { + perror("whoami"); + invalid_filestore_path(dpath); + } + if (!S_ISREG(st.st_mode)) { + invalid_filestore_path(dpath); + } + check = dpath + "/current"; + if (::stat(check.c_str(), &st) == -1) { + perror("current"); + invalid_filestore_path(dpath); + } + if (!S_ISDIR(st.st_mode)) { + invalid_filestore_path(dpath); + } + } + + if (op == "import" && pgidstr.length()) { + cerr << "--pgid option invalid with import" << std::endl; + return 1; + } + + ObjectStore *fs = ObjectStore::create(g_ceph_context, type, dpath, jpath, flags); + if (fs == NULL) { + cerr << "Must provide --type (filestore, memstore, keyvaluestore-dev)" << std::endl; + exit(1); + } + + int r = fs->mount(); + if (r < 0) { + if (r == -EBUSY) { + cerr << "OSD has the store locked" << std::endl; + } else { + cerr << "Mount failed with '" << cpp_strerror(-r) << "'" << std::endl; + } + return 1; + } + + bool fs_sharded_objects = fs->get_allow_sharded_objects(); + + int ret = 0; + vector ls; + vector::iterator it; + CompatSet supported; + +#ifdef INTERNAL_TEST + supported = get_test_compat_set(); +#else + supported = OSD::get_osd_compat_set(); +#endif + + bufferlist bl; + OSDSuperblock superblock; + bufferlist::iterator p; + r = fs->read(coll_t::META_COLL, OSD_SUPERBLOCK_POBJECT, 0, 0, bl); + if (r < 0) { + cerr << "Failure to read OSD superblock error= " << r << std::endl; + goto out; + } + + p = bl.begin(); + ::decode(superblock, p); + + if (debug) { + cerr << "Cluster fsid=" << superblock.cluster_fsid << std::endl; + } + +#ifdef INTERNAL_TEST2 + fs->set_allow_sharded_objects(); + assert(fs->get_allow_sharded_objects()); + fs_sharded_objects = true; + superblock.compat_features.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS); +#endif + + if (debug) { + cerr << "Supported features: " << supported << std::endl; + cerr << "On-disk features: " << superblock.compat_features << std::endl; + } + if (supported.compare(superblock.compat_features) == -1) { + CompatSet unsupported = supported.unsupported(superblock.compat_features); + cerr << "On-disk OSD incompatible features set " + << unsupported << std::endl; + ret = EINVAL; + goto out; + } + + if (pgidstr.length() && !pgid.parse(pgidstr.c_str())) { + cerr << "Invalid pgid '" << pgidstr << "' specified" << std::endl; + return 1; + } + + if (op != "list" && vm.count("object")) { + json_spirit::Value v; + try { + if (!json_spirit::read(object, v)) { + lookup_ghobject lookup(object); + if (action_on_all_objects(fs, lookup, debug)) { + throw std::runtime_error("Internal error"); + } else { + if (lookup.size() != 1) { + stringstream ss; + if (lookup.size() == 0) + ss << objcmd << ": " << cpp_strerror(ENOENT); + else + ss << "expected a single object named '" << object + << "' but got " << lookup.size() << " instead"; + throw std::runtime_error(ss.str()); + } + pair found = lookup.pop(); + pgidstr = found.first.to_str(); + pgid.parse(pgidstr.c_str()); + ghobj = found.second; + } + } else { + stringstream ss; + if (pgidstr.length() == 0 && v.type() != json_spirit::array_type) { + ss << "object '" << object + << "' must be a JSON array but is of type " + << v.type() << " instead"; + throw std::runtime_error(ss.str()); + } + if (v.type() == json_spirit::array_type) { + json_spirit::Array array = v.get_array(); + vector::iterator i = array.begin(); + if (i->type() != json_spirit::str_type) { + ss << "object '" << object + << "' must be a JSON array with the first element a string but " + << "found type " << v.type() << " instead"; + throw std::runtime_error(ss.str()); + } + string object_pgidstr = i->get_str(); + spg_t object_pgid; + object_pgid.parse(object_pgidstr.c_str()); + if (pgidstr.length() > 0) { + if (object_pgid != pgid) { + ss << "object '" << object + << "' has a pgid different from the --pgid=" + << pgidstr << " option"; + throw std::runtime_error(ss.str()); + } + } else { + pgidstr = object_pgidstr; + pgid = object_pgid; + } + ++i; + v = *i; + } + try { + ghobj.decode(v); + } catch (std::runtime_error& e) { + ss << "Decode object json error: " << e.what(); + throw std::runtime_error(ss.str()); + } + if ((uint64_t)pgid.pgid.m_pool != (uint64_t)ghobj.hobj.pool) { + cerr << "Object pool and pgid pool don't match" << std::endl; + ret = 1; + goto out; + } + } + } catch (std::runtime_error& e) { + cerr << e.what() << std::endl; + ret = 1; + goto out; + } + } + + if (op != "list" && op != "import" && op != "list-lost" && op != "fix-lost" + && op != "list-pgs" && op != "set-allow-sharded-objects" && + (pgidstr.length() == 0)) { + cerr << "Must provide pgid" << std::endl; + usage(desc); + } + + if (op == "set-allow-sharded-objects") { + // This could only happen if we backport changes to an older release + if (!supported.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_SHARDS)) { + cerr << "Can't enable sharded objects in this release" << std::endl; + ret = 1; + goto out; + } + if (superblock.compat_features.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_SHARDS) && + fs_sharded_objects) { + cerr << "Sharded objects already fully enabled" << std::endl; + ret = 0; + goto out; + } + OSDMap curmap; + ret = get_osdmap(fs, superblock.current_epoch, curmap); + if (ret) { + cerr << "Can't find local OSDMap" << std::endl; + goto out; + } + + // Based on OSDMonitor::check_cluster_features() + // XXX: The up state of osds in the last map isn't + // as important from a non-running osd. I'm using + // get_all_osds() instead. An osd which was never + // upgraded and never removed would be flagged here. + stringstream unsupported_ss; + int unsupported_count = 0; + uint64_t features = CEPH_FEATURE_OSD_ERASURE_CODES; + set all_osds; + curmap.get_all_osds(all_osds); + for (set::iterator it = all_osds.begin(); + it != all_osds.end(); ++it) { + const osd_xinfo_t &xi = curmap.get_xinfo(*it); +#ifdef INTERNAL_TEST3 + // Force one of the OSDs to not have support for erasure codes + if (unsupported_count == 0) + ((osd_xinfo_t &)xi).features &= ~features; +#endif + if ((xi.features & features) != features) { + if (unsupported_count > 0) + unsupported_ss << ", "; + unsupported_ss << "osd." << *it; + unsupported_count ++; + } + } + + if (unsupported_count > 0) { + cerr << "ERASURE_CODES feature unsupported by: " + << unsupported_ss.str() << std::endl; + ret = 1; + goto out; + } + + superblock.compat_features.incompat.insert(CEPH_OSD_FEATURE_INCOMPAT_SHARDS); + ObjectStore::Transaction t; + bufferlist bl; + ::encode(superblock, bl); + t.write(coll_t::META_COLL, OSD_SUPERBLOCK_POBJECT, 0, bl.length(), bl); + r = fs->apply_transaction(t); + if (r < 0) { + cerr << "Error writing OSD superblock: " << cpp_strerror(r) << std::endl; + ret = 1; + goto out; + } + + fs->set_allow_sharded_objects(); + + cout << "Enabled on-disk sharded objects" << std::endl; + + ret = 0; + goto out; + } + + // If there was a crash as an OSD was transitioning to sharded objects + // and hadn't completed a set_allow_sharded_objects(). + // This utility does not want to attempt to finish that transition. + if (superblock.compat_features.incompat.contains(CEPH_OSD_FEATURE_INCOMPAT_SHARDS) != fs_sharded_objects) { + // An OSD should never have call set_allow_sharded_objects() before + // updating its own OSD features. + if (fs_sharded_objects) + cerr << "FileStore sharded but OSD not set, Corruption?" << std::endl; + else + cerr << "Found incomplete transition to sharded objects" << std::endl; + cerr << std::endl; + cerr << "Use --op set-allow-sharded-objects to repair" << std::endl; + ret = EINVAL; + goto out; + } + + if (op == "import") { + + try { + ret = do_import(fs, superblock); + } + catch (const buffer::error &e) { + cerr << "do_import threw exception error " << e.what() << std::endl; + ret = EFAULT; + } + if (ret == EFAULT) { + cerr << "Corrupt input for import" << std::endl; + } + if (ret == 0) + cout << "Import successful" << std::endl; + goto out; + } + + log_oid = OSD::make_pg_log_oid(pgid); + biginfo_oid = OSD::make_pg_biginfo_oid(pgid); + + if (op == "remove") { + uint64_t next_removal_seq = 0; //My local seq + finish_remove_pgs(fs, &next_removal_seq); + int r = initiate_new_remove_pg(fs, pgid, &next_removal_seq); + if (r) { + cerr << "PG '" << pgid << "' not found" << std::endl; + ret = 1; + goto out; + } + finish_remove_pgs(fs, &next_removal_seq); + cout << "Remove successful" << std::endl; + goto out; + } + + if (op == "list-lost" || op == "fix-lost") { + boost::scoped_ptr action; + if (op == "list-lost") + action.reset(new do_list_lost()); + if (op == "fix-lost") + action.reset(new do_fix_lost()); + if (pgidstr.length()) + ret = action_on_all_objects_in_pg(fs, coll_t(pgid), *action, debug); + else + ret = action_on_all_objects(fs, *action, debug); + goto out; + } + + // Special list handling. Treating pretty_format as human readable, + // with one object per line and not an enclosing array. + human_readable = ends_with(format, "-pretty"); + if (op == "list" && human_readable) { + // Remove -pretty from end of format which we know is there + format = format.substr(0, format.size() - strlen("-pretty")); + } + + formatter = new_formatter(format); + if (formatter == NULL) { + cerr << "unrecognized format: " << format << std::endl; + ret = 1; + goto out; + } + + if (op == "list") { + r = do_list(fs, pgidstr, object, formatter, debug, human_readable); + if (r) { + cerr << "do_list failed with " << r << std::endl; + ret = 1; + } + goto out; + } + + r = fs->list_collections(ls); + if (r < 0) { + cerr << "failed to list pgs: " << cpp_strerror(-r) << std::endl; + ret = 1; + goto out; + } + + if (debug && op == "list-pgs") + cout << "Performing list-pgs operation" << std::endl; + + // Find pg + for (it = ls.begin(); it != ls.end(); ++it) { + snapid_t snap; + spg_t tmppgid; + + if (!it->is_pg(tmppgid, snap)) { + continue; + } + + if (it->is_temp(tmppgid)) { + continue; + } + + if (op != "list-pgs" && tmppgid != pgid) { + continue; + } + if (snap != CEPH_NOSNAP && debug) { + cout << "skipping snapped dir " << *it + << " (pg " << pgid << " snap " << snap << ")" << std::endl; + continue; + } + + if (op != "list-pgs") { + //Found! + break; + } + + cout << tmppgid << std::endl; + } + + if (op == "list-pgs") { + ret = 0; + goto out; + } + + epoch_t map_epoch; +// The following code for export, info, log require omap or !skip-mount-omap + if (it != ls.end()) { + + coll_t coll = *it; + + if (vm.count("objcmd")) { + ret = 0; + if (objcmd == "remove") { + int r = do_remove_object(fs, coll, ghobj); + if (r) { + ret = 1; + } + goto out; + } else if (objcmd == "list-attrs") { + int r = do_list_attrs(fs, coll, ghobj); + if (r) { + ret = 1; + } + goto out; + } else if (objcmd == "list-omap") { + int r = do_list_omap(fs, coll, ghobj); + if (r) { + ret = 1; + } + goto out; + } else if (objcmd == "get-bytes" || objcmd == "set-bytes") { + int r; + if (objcmd == "get-bytes") { + int fd; + if (vm.count("arg1") == 0 || arg1 == "-") { + fd = STDOUT_FILENO; + } else { + fd = open(arg1.c_str(), O_WRONLY|O_TRUNC|O_CREAT|O_EXCL|O_LARGEFILE, 0666); + if (fd == -1) { + cerr << "open " << arg1 << " " << cpp_strerror(errno) << std::endl; + ret = 1; + goto out; + } + } + r = do_get_bytes(fs, coll, ghobj, fd); + if (fd != STDOUT_FILENO) + close(fd); + } else { + int fd; + if (vm.count("arg1") == 0 || arg1 == "-") { + // Since read_fd() doesn't handle ^D from a tty stdin, don't allow it. + if (isatty(STDIN_FILENO)) { + cerr << "stdin is a tty and no file specified" << std::endl; + ret = 1; + goto out; + } + fd = STDIN_FILENO; + } else { + fd = open(arg1.c_str(), O_RDONLY|O_LARGEFILE, 0666); + if (fd == -1) { + cerr << "open " << arg1 << " " << cpp_strerror(errno) << std::endl; + ret = 1; + goto out; + } + } + r = do_set_bytes(fs, coll, ghobj, fd); + if (fd != STDIN_FILENO) + close(fd); + } + if (r) + ret = 1; + goto out; + } else if (objcmd == "get-attr") { + if (vm.count("arg1") == 0) + usage(desc); + r = do_get_attr(fs, coll, ghobj, arg1); + if (r) + ret = 1; + goto out; + } else if (objcmd == "set-attr") { + if (vm.count("arg1") == 0) + usage(desc); + + int fd; + if (vm.count("arg2") == 0 || arg2 == "-") { + // Since read_fd() doesn't handle ^D from a tty stdin, don't allow it. + if (isatty(STDIN_FILENO)) { + cerr << "stdin is a tty and no file specified" << std::endl; + ret = 1; + goto out; + } + fd = STDIN_FILENO; + } else { + fd = open(arg2.c_str(), O_RDONLY|O_LARGEFILE, 0666); + if (fd == -1) { + cerr << "open " << arg2 << " " << cpp_strerror(errno) << std::endl; + ret = 1; + goto out; + } + } + r = do_set_attr(fs, coll, ghobj, arg1, fd); + if (fd != STDIN_FILENO) + close(fd); + if (r) + ret = 1; + goto out; + } else if (objcmd == "rm-attr") { + if (vm.count("arg1") == 0) + usage(desc); + r = do_rm_attr(fs, coll, ghobj, arg1); + if (r) + ret = 1; + goto out; + } else if (objcmd == "get-omap") { + if (vm.count("arg1") == 0) + usage(desc); + r = do_get_omap(fs, coll, ghobj, arg1); + if (r) + ret = 1; + goto out; + } else if (objcmd == "set-omap") { + if (vm.count("arg1") == 0) + usage(desc); + + int fd; + if (vm.count("arg2") == 0 || arg2 == "-") { + // Since read_fd() doesn't handle ^D from a tty stdin, don't allow it. + if (isatty(STDIN_FILENO)) { + cerr << "stdin is a tty and no file specified" << std::endl; + ret = 1; + goto out; + } + fd = STDIN_FILENO; + } else { + fd = open(arg2.c_str(), O_RDONLY|O_LARGEFILE, 0666); + if (fd == -1) { + cerr << "open " << arg2 << " " << cpp_strerror(errno) << std::endl; + ret = 1; + goto out; + } + } + r = do_set_omap(fs, coll, ghobj, arg1, fd); + if (fd != STDIN_FILENO) + close(fd); + if (r) + ret = 1; + goto out; + } else if (objcmd == "rm-omap") { + if (vm.count("arg1") == 0) + usage(desc); + r = do_rm_omap(fs, coll, ghobj, arg1); + if (r) + ret = 1; + goto out; + } else if (objcmd == "get-omaphdr") { + if (vm.count("arg1")) + usage(desc); + r = do_get_omaphdr(fs, coll, ghobj); + if (r) + ret = 1; + goto out; + } else if (objcmd == "set-omaphdr") { + // Extra arg + if (vm.count("arg2")) + usage(desc); + int fd; + if (vm.count("arg1") == 0 || arg1 == "-") { + // Since read_fd() doesn't handle ^D from a tty stdin, don't allow it. + if (isatty(STDIN_FILENO)) { + cerr << "stdin is a tty and no file specified" << std::endl; + ret = 1; + goto out; + } + fd = STDIN_FILENO; + } else { + fd = open(arg1.c_str(), O_RDONLY|O_LARGEFILE, 0666); + if (fd == -1) { + cerr << "open " << arg1 << " " << cpp_strerror(errno) << std::endl; + ret = 1; + goto out; + } + } + r = do_set_omaphdr(fs, coll, ghobj, fd); + if (fd != STDIN_FILENO) + close(fd); + if (r) + ret = 1; + goto out; + } + cerr << "Unknown object command '" << objcmd << "'" << std::endl; + usage(desc); + } + + bufferlist bl; + map_epoch = PG::peek_map_epoch(fs, coll, infos_oid, &bl); + if (debug) + cerr << "map_epoch " << map_epoch << std::endl; + + pg_info_t info(pgid); + map past_intervals; + hobject_t biginfo_oid = OSD::make_pg_biginfo_oid(pgid); + interval_set snap_collections; + + __u8 struct_ver; + r = PG::read_info(fs, coll, bl, info, past_intervals, biginfo_oid, + infos_oid, snap_collections, struct_ver); + if (r < 0) { + cerr << "read_info error " << cpp_strerror(-r) << std::endl; + ret = 1; + goto out; + } + if (debug) + cerr << "struct_v " << (int)struct_ver << std::endl; + + if (op == "export") { + ret = do_export(fs, coll, pgid, info, map_epoch, struct_ver, superblock, past_intervals); + if (ret == 0) + cerr << "Export successful" << std::endl; + } else if (op == "info") { + formatter->open_object_section("info"); + info.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; + } else if (op == "log") { + PGLog::IndexedLog log; + pg_missing_t missing; + ret = get_log(fs, coll, pgid, info, log, missing); + if (ret > 0) + goto out; + + formatter->open_object_section("log"); + log.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; + formatter->open_object_section("missing"); + missing.dump(formatter); + formatter->close_section(); + formatter->flush(cout); + cout << std::endl; + } else if (op == "rm-past-intervals") { + ObjectStore::Transaction tran; + ObjectStore::Transaction *t = &tran; + + if (struct_ver != PG::cur_struct_v) { + cerr << "Can't remove past-intervals, version mismatch " << (int)struct_ver + << " (pg) != " << (int)PG::cur_struct_v << " (tool)" + << std::endl; + ret = 1; + goto out; + } + + cout << "Remove past-intervals " << past_intervals << std::endl; + + past_intervals.clear(); + ret = write_info(*t, map_epoch, info, struct_ver, past_intervals); + + if (ret == 0) { + fs->apply_transaction(*t); + cout << "Removal succeeded" << std::endl; + } + } else { + cerr << "Must provide --op (info, log, remove, export, import, list, list-lost, fix-lost, list-pgs, rm-past-intervals)" + << std::endl; + usage(desc); + } + } else { + cerr << "PG '" << pgid << "' not found" << std::endl; + ret = 1; + } + +out: + if (fs->umount() < 0) { + cerr << "umount failed" << std::endl; + return 1; + } + + // Check for -errno accidentally getting here + if (ret < 0) + ret = 1; + return ret; +} diff --git a/ceph/src/upstart/ceph-mds.conf b/ceph/src/upstart/ceph-mds.conf index 77841cdc..4063d911 100644 --- a/ceph/src/upstart/ceph-mds.conf +++ b/ceph/src/upstart/ceph-mds.conf @@ -4,7 +4,7 @@ start on ceph-mds stop on runlevel [!2345] or stopping ceph-mds-all respawn -respawn limit 5 30 +respawn limit 3 1800 limit nofile 16384 16384 diff --git a/ceph/src/upstart/ceph-mon.conf b/ceph/src/upstart/ceph-mon.conf index 0279f15c..83c98583 100644 --- a/ceph/src/upstart/ceph-mon.conf +++ b/ceph/src/upstart/ceph-mon.conf @@ -4,7 +4,7 @@ start on ceph-mon stop on runlevel [!2345] or stopping ceph-mon-all respawn -respawn limit 5 30 +respawn limit 3 1800 limit nofile 16384 16384 diff --git a/ceph/src/upstart/ceph-osd.conf b/ceph/src/upstart/ceph-osd.conf index 7175c2d9..6fa97ed1 100644 --- a/ceph/src/upstart/ceph-osd.conf +++ b/ceph/src/upstart/ceph-osd.conf @@ -4,7 +4,7 @@ start on ceph-osd stop on runlevel [!2345] or stopping ceph-osd-all respawn -respawn limit 5 30 +respawn limit 3 1800 limit nofile 32768 32768 diff --git a/ceph/src/vstart.sh b/ceph/src/vstart.sh index 5349c496..237e9716 100755 --- a/ceph/src/vstart.sh +++ b/ceph/src/vstart.sh @@ -369,7 +369,7 @@ $COSDDEBUG $COSDMEMSTORE $extra_conf [mon] - mon pg warn min per osd = 10 + mon pg warn min per osd = 3 mon osd allow primary affinity = true $DAEMONOPTS $CMONDEBUG diff --git a/debian/ceph-test.install b/debian/ceph-test.install index 1d37f45f..1d98f721 100644 --- a/debian/ceph-test.install +++ b/debian/ceph-test.install @@ -1,13 +1,12 @@ usr/bin/ceph-coverage /usr/lib/ceph/bin usr/bin/ceph-kvstore-tool /usr/lib/ceph/bin usr/bin/ceph-monstore-tool /usr/lib/ceph/bin +usr/bin/ceph-objectstore-tool /usr/lib/ceph/bin usr/bin/ceph-osdomap-tool /usr/lib/ceph/bin usr/bin/ceph_bench_log /usr/lib/ceph/bin usr/bin/ceph_dupstore /usr/lib/ceph/bin usr/bin/ceph_erasure_code /usr/lib/ceph/bin usr/bin/ceph_erasure_code_benchmark /usr/lib/ceph/bin -usr/bin/ceph_filestore_dump /usr/lib/ceph/bin -usr/bin/ceph_filestore_tool /usr/lib/ceph/bin usr/bin/ceph_kvstorebench /usr/lib/ceph/bin usr/bin/ceph_multi_stress_watch /usr/lib/ceph/bin usr/bin/ceph_omapbench /usr/lib/ceph/bin diff --git a/debian/ceph.install b/debian/ceph.install index bc443130..29c237d9 100644 --- a/debian/ceph.install +++ b/debian/ceph.install @@ -23,6 +23,7 @@ usr/share/doc/ceph/sample.ceph.conf usr/share/doc/ceph/sample.fetch_config usr/share/man/man8/ceph-clsinfo.8 usr/share/man/man8/ceph-debugpack.8 +usr/share/man/man8/ceph-disk.8 usr/share/man/man8/ceph-mon.8 usr/share/man/man8/ceph-osd.8 usr/share/man/man8/ceph-run.8 diff --git a/debian/changelog b/debian/changelog index 7fe268e9..f72cf7e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,15 @@ -ceph (0.80.9-1~u14.04+mos2+mos7.0+1) mos7.0; urgency=hi +ceph (0.80.11-0u~u14.04+mos1~mos7.0+1) UNRELEASED; urgency=medium + + * new upstream bugfix only release + * refreshed debian/patches: + - dropped url_encode_exposed_bucket.patch, included upstream + - added rgw-fix-empty-json-response-when-getting-user-quota.patch, + fixes http://tracker.ceph.com/issues/13644 + - added increaseFileLimit.patch + + -- Alexey Sheplyakov Thu, 03 Mar 2016 22:24:35 +0300 + +ceph (0.80.9-1~u14.04+mos2+mos7.0+1) mos7.0; urgency=high * Fix security vulnerability CVE-2015-5245 http://tracker.ceph.com/issues/12537 diff --git a/debian/control b/debian/control index ce973bf8..545ec13c 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: ceph Section: admin Priority: optional -Maintainer: MOS Linux team +Maintainer: MOS Ceph team XSBC-Original-Maintainer: Ceph Maintainers Homepage: http://ceph.com/ Build-Depends: debhelper (>= 9~), @@ -405,7 +405,7 @@ Package: ceph-test-dbg Architecture: linux-any Section: debug Priority: extra -Depends: ceph-common, curl, xml2, ${misc:Depends}, ${shlibs:Depends} +Depends: ceph-test (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Debugging symbols for ceph-test Ceph is a distributed storage system designed to provide excellent performance, reliability, and scalability. diff --git a/debian/gbp.conf b/debian/gbp.conf index fce89ec4..5172372d 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,5 +2,8 @@ debian-branch = ubuntu pristine-tar = True +[pq] +patch-numbers = False + [import-orig] filter = debian/* diff --git a/debian/patches/ObjectCacher-fix-bh_read_finish-offset-logic.patch b/debian/patches/ObjectCacher-fix-bh_read_finish-offset-logic.patch new file mode 100644 index 00000000..f743cda7 --- /dev/null +++ b/debian/patches/ObjectCacher-fix-bh_read_finish-offset-logic.patch @@ -0,0 +1,43 @@ +From 45f8135192ed8f9e02b620ae9aca7212a848b944 Mon Sep 17 00:00:00 2001 +From: Greg Farnum +Date: Mon, 23 May 2016 15:14:21 -0700 +Subject: [PATCH] ObjectCacher: fix bh_read_finish offset logic + +If we have an incoming read split across multiple BufferHeads, we want to +line up the BufferHead's bl with the incoming OSDOp's bl at the right offset. We +were erroneously using this nonsense calculation (always equal to zero!) when +a much simpler comparison of the BufferHead's logical object offset to the +incoming OSDOp's logical offset will do the trick nicely. + +Fixes: http://tracker.ceph.com/issues/16002 + +Signed-off-by: Greg Farnum +(cherry picked from commit 9ec6e7f608608088d51e449c9d375844631dcdde) +--- + src/osdc/ObjectCacher.cc | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc +index 95abee1..46989d0 100644 +--- a/src/osdc/ObjectCacher.cc ++++ b/src/osdc/ObjectCacher.cc +@@ -761,7 +761,6 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid, + if (bh->error < 0) + err = bh->error; + +- loff_t oldpos = opos; + opos = bh->end(); + + if (r == -ENOENT) { +@@ -781,7 +780,7 @@ void ObjectCacher::bh_read_finish(int64_t poolid, sobject_t oid, ceph_tid_t tid, + mark_error(bh); + } else { + bh->bl.substr_of(bl, +- oldpos-bh->start(), ++ bh->start() - start, + bh->length()); + mark_clean(bh); + } +-- +1.9.1 + diff --git a/debian/patches/increaseFileLimit.patch b/debian/patches/increaseFileLimit.patch new file mode 100644 index 00000000..b1dc1c0f --- /dev/null +++ b/debian/patches/increaseFileLimit.patch @@ -0,0 +1,32 @@ +Description: Increase file limit to prevent hitting the file limit + +Upstream commit text +" +commit 5773a374d0089ce824dec0a0c74a76e57806cc43 +Author: Sage Weil +Date: Mon Jul 28 09:27:20 2014 -0700 + + upstart/ceph-osd.conf: bump nofile limit up by 10x + + This should ensure that we don't hit this limit on all but the very biggest + clusters. We seen it hit on a ~500 OSD dumpling cluster. + + Backport: firefly, dumpling + Signed-off-by: Sage Weil +" + +Author: Dave Chiluk +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1420647 +Origin: https://github.com/ceph/ceph/commit/5773a374d0089ce824dec0a0c74a76e57806cc43 +--- +--- a/src/upstart/ceph-osd.conf ++++ b/src/upstart/ceph-osd.conf +@@ -6,7 +6,7 @@ stop on runlevel [!2345] or stopping cep + respawn + respawn limit 3 1800 + +-limit nofile 32768 32768 ++limit nofile 327680 327680 + + pre-start script + set -e diff --git a/debian/patches/rgw-fix-empty-json-response-when-getting-user-quota.patch b/debian/patches/rgw-fix-empty-json-response-when-getting-user-quota.patch new file mode 100644 index 00000000..394d1ca6 --- /dev/null +++ b/debian/patches/rgw-fix-empty-json-response-when-getting-user-quota.patch @@ -0,0 +1,22 @@ +From: wuxingyi +Date: Tue, 23 Jun 2015 01:46:48 +0000 +Subject: rgw: fix empty json response when getting user quota + +Fixes: #12117 +Signed-off-by: wuxingyi +--- + src/rgw/rgw_rest_user.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/rgw/rgw_rest_user.cc b/src/rgw/rgw_rest_user.cc +index 30f46f0..1d547c1 100644 +--- a/src/rgw/rgw_rest_user.cc ++++ b/src/rgw/rgw_rest_user.cc +@@ -683,6 +683,7 @@ void RGWOp_Quota_Info::execute() + if (http_ret < 0) + return; + ++ flusher.start(0); + if (show_all) { + UserQuotas quotas(info); + encode_json("quota", quotas, s->formatter); diff --git a/debian/patches/series b/debian/patches/series index a334894f..161f3763 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ virtualenv-never-download modules.patch -url_encode_exposed_bucket.patch +increaseFileLimit.patch +rgw-fix-empty-json-response-when-getting-user-quota.patch +ObjectCacher-fix-bh_read_finish-offset-logic.patch diff --git a/debian/patches/url_encode_exposed_bucket.patch b/debian/patches/url_encode_exposed_bucket.patch deleted file mode 100644 index 6ba037eb..00000000 --- a/debian/patches/url_encode_exposed_bucket.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nuar ceph-0.80.9/src/rgw/rgw_rest.cc ceph-0.80.9-WIP/src/rgw/rgw_rest.cc ---- ceph-0.80.9/src/rgw/rgw_rest.cc 2015-04-09 00:30:46.000000000 +0300 -+++ ceph-0.80.9-WIP/src/rgw/rgw_rest.cc 2015-12-07 22:16:13.100942762 +0300 -@@ -272,8 +272,11 @@ - { - int expose_bucket = g_conf->rgw_expose_bucket; - if (expose_bucket) { -- if (!s->bucket_name_str.empty()) -- s->cio->print("Bucket: \"%s\"\r\n", s->bucket_name_str.c_str()); -+ if (!s->bucket_name_str.empty()){ -+ string b; -+ url_encode(s->bucket_name_str, b); -+ s->cio->print("Bucket: %s\r\n", b.c_str()); -+ } - } - } - diff --git a/debian/watch b/debian/watch index dae6427a..5cff7b3f 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/-/~/" \ - http://ceph.com/download/ceph-(\d.*)\.tar\.bz2 + http://ceph.com/download/ceph-(0\.80\.\d+)\.tar\.gz