From 39bcb43a7a5e027917aba01f3ce775d5d01fdada Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 21 Aug 2014 15:19:22 +0200 Subject: [PATCH] erasure-code: preload the isa plugin by default But only do so when it has been compiled because a recent enough yasm has been found. Signed-off-by: Loic Dachary --- configure.ac | 1 + src/common/config_opts.h | 7 ++++++- src/erasure-code/ErasureCodePlugin.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0440a664125a..4841a3a9dcf8 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,7 @@ if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then if yasm -f elf64 -i src/ceph/src/ceph/src/erasure-code/isa/isa-l/include/ src/erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s -o /dev/null 2> /dev/null ; then echo 'yasm can also build the isa-l stuff' + AC_DEFINE([HAVE_BETTER_YASM_ELF64], [1], [yasm can also build the isa-l]) with_better_yasm=yes else echo "yasm doesn't build the isa-l stuff" diff --git a/src/common/config_opts.h b/src/common/config_opts.h index bc22e4ab3b55..21c93d5b720d 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -444,7 +444,12 @@ OPTION(osd_pool_default_erasure_code_profile, "k=2 " "m=1 " ) // default properties of osd pool create -OPTION(osd_erasure_code_plugins, OPT_STR, "jerasure") // list of erasure code plugins +OPTION(osd_erasure_code_plugins, OPT_STR, + "jerasure" +#ifdef HAVE_BETTER_YASM_ELF64 + " isa" +#endif + ) // list of erasure code plugins OPTION(osd_pool_default_flags, OPT_INT, 0) // default flags for new pools OPTION(osd_pool_default_flag_hashpspool, OPT_BOOL, true) // use new pg hashing to prevent pool/pg overlap OPTION(osd_pool_default_hit_set_bloom_fpp, OPT_FLOAT, .05) diff --git a/src/erasure-code/ErasureCodePlugin.h b/src/erasure-code/ErasureCodePlugin.h index 3fa7c477534c..12808581a665 100644 --- a/src/erasure-code/ErasureCodePlugin.h +++ b/src/erasure-code/ErasureCodePlugin.h @@ -4,6 +4,7 @@ * Ceph distributed storage system * * Copyright (C) 2013,2014 Cloudwatt + * Copyright (C) 2014 Red Hat * * Author: Loic Dachary * -- 2.47.3