Hi Janne,
This looks good ! The 32 byte aligned buffer applies to the diff related to buffer.h though, could you update the title ? I tend to prefer erasure-code over ec : it is easier to grep / search ;-)
Cheers
On 18/09/2014 12:33, Janne Grunau wrote:
> Requiring page aligned buffers and realigning the input if necessary
> creates measurable oberhead. ceph_erasure_code_benchmark is ~30% faster
> with this change for technique=reed_sol_van,k=2,m=1.
>
> Also prevents a misaligned buffer when bufferlist::c_str(bufferlist)
> has to allocate a new buffer to provide continuous one. See bug #9408
>
> Signed-off-by: Janne Grunau <j@xxxxxxxxxx>
> ---
> src/erasure-code/ErasureCode.cc | 57 ++++++++++++++++++++++++++++-------------
> src/erasure-code/ErasureCode.h | 3 ++-
> 2 files changed, 41 insertions(+), 19 deletions(-)
>
> diff --git a/src/erasure-code/ErasureCode.cc b/src/erasure-code/ErasureCode.cc
> index 5953f49..7aa5235 100644
> --- a/src/erasure-code/ErasureCode.cc
> +++ b/src/erasure-code/ErasureCode.cc
> @@ -54,22 +54,49 @@ int ErasureCode::minimum_to_decode_with_cost(const set<int> &want_to_read,
> }
>
> int ErasureCode::encode_prepare(const bufferlist &raw,
> - bufferlist *prepared) const
> + map<int, bufferlist> &encoded) const
> {
> unsigned int k = get_data_chunk_count();
> unsigned int m = get_chunk_count() - k;
> unsigned blocksize = get_chunk_size(raw.length());
> - unsigned padded_length = blocksize * k;
> - *prepared = raw;
> - if (padded_length - raw.length() > 0) {
> - bufferptr pad(padded_length - raw.length());
> - pad.zero();
> - prepared->push_back(pad);
> + unsigned pad_len = blocksize * k - raw.length();
> + unsigned padded_chunks = k - raw.length() / blocksize;
> + bufferlist prepared = raw;
> +
> + if (!prepared.is_aligned()) {
> + // splice padded chunks off to make the rebuild faster
> + if (padded_chunks)
> + prepared.splice((k - padded_chunks) * blocksize,
> + padded_chunks * blocksize - pad_len);
> + prepared.rebuild_aligned();
> + }
> +
> + for (unsigned int i = 0; i < k - padded_chunks; i++) {
> + int chunk_index = chunk_mapping.size() > 0 ? chunk_mapping[i] : i;
> + bufferlist &chunk = encoded[chunk_index];
> + chunk.substr_of(prepared, i * blocksize, blocksize);
> + }
> + if (padded_chunks) {
> + unsigned remainder = raw.length() - (k - padded_chunks) * blocksize;
> + bufferlist padded;
> + bufferptr buf(buffer::create_aligned(padded_chunks * blocksize));
> +
> + raw.copy((k - padded_chunks) * blocksize, remainder, buf.c_str());
> + buf.zero(remainder, pad_len);
> + padded.push_back(buf);
> +
> + for (unsigned int i = k - padded_chunks; i < k; i++) {
> + int chunk_index = chunk_mapping.size() > 0 ? chunk_mapping[i] : i;
> + bufferlist &chunk = encoded[chunk_index];
> + chunk.substr_of(padded, (i - (k - padded_chunks)) * blocksize, blocksize);
> + }
> + }
> + for (unsigned int i = k; i < k + m; i++) {
> + int chunk_index = chunk_mapping.size() > 0 ? chunk_mapping[i] : i;
> + bufferlist &chunk = encoded[chunk_index];
> + chunk.push_back(buffer::create_aligned(blocksize));
> }
> - unsigned coding_length = blocksize * m;
> - bufferptr coding(buffer::create_page_aligned(coding_length));
> - prepared->push_back(coding);
> - prepared->rebuild_page_aligned();
> +
> return 0;
> }
>
> @@ -80,15 +107,9 @@ int ErasureCode::encode(const set<int> &want_to_encode,
> unsigned int k = get_data_chunk_count();
> unsigned int m = get_chunk_count() - k;
> bufferlist out;
> - int err = encode_prepare(in, &out);
> + int err = encode_prepare(in, *encoded);
> if (err)
> return err;
> - unsigned blocksize = get_chunk_size(in.length());
> - for (unsigned int i = 0; i < k + m; i++) {
> - int chunk_index = chunk_mapping.size() > 0 ? chunk_mapping[i] : i;
> - bufferlist &chunk = (*encoded)[chunk_index];
> - chunk.substr_of(out, i * blocksize, blocksize);
> - }
> encode_chunks(want_to_encode, encoded);
> for (unsigned int i = 0; i < k + m; i++) {
> if (want_to_encode.count(i) == 0)
> diff --git a/src/erasure-code/ErasureCode.h b/src/erasure-code/ErasureCode.h
> index 7aaea95..62aa383 100644
> --- a/src/erasure-code/ErasureCode.h
> +++ b/src/erasure-code/ErasureCode.h
> @@ -46,7 +46,8 @@ namespace ceph {
> const map<int, int> &available,
> set<int> *minimum);
>
> - int encode_prepare(const bufferlist &raw, bufferlist *prepared) const;
> + int encode_prepare(const bufferlist &raw,
> + map<int, bufferlist> &encoded) const;
>
> virtual int encode(const set<int> &want_to_encode,
> const bufferlist &in,
>
--
Loïc Dachary, Artisan Logiciel Libre
Attachment:
signature.asc
Description: OpenPGP digital signature
