mirror of
https://github.com/minio/minio.git
synced 2025-12-05 15:22:28 -05:00
Erasure restructuring
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
*/
|
||||
|
||||
// +build linux
|
||||
// amd64
|
||||
|
||||
package erasure
|
||||
|
||||
@@ -25,7 +24,8 @@ package erasure
|
||||
// #include <erasure-code.h>
|
||||
// #include <stdlib.h>
|
||||
//
|
||||
// #include "matrix_decode.h"
|
||||
// #include "decode.h"
|
||||
// #include "encode.h"
|
||||
import "C"
|
||||
import (
|
||||
"errors"
|
||||
@@ -37,17 +37,14 @@ func (e *Encoder) Decode(chunks [][]byte, length int) ([]byte, error) {
|
||||
var decode_matrix *C.uchar
|
||||
var decode_tbls *C.uchar
|
||||
|
||||
var matrix_size C.size_t
|
||||
var decode_tbls_size C.size_t
|
||||
|
||||
k := int(e.p.k)
|
||||
n := int(e.p.n)
|
||||
n := int(e.p.k + e.p.m)
|
||||
|
||||
if len(chunks) != n {
|
||||
return nil, errors.New(fmt.Sprintf("chunks length must be %d", n))
|
||||
}
|
||||
|
||||
var chunk_size int = e.CalcChunkSize(length)
|
||||
chunk_size := int(C.calc_chunk_size(e.k, C.uint(length)))
|
||||
|
||||
src_err_list := make([]int, n+1)
|
||||
var err_count int = 0
|
||||
@@ -67,7 +64,7 @@ func (e *Encoder) Decode(chunks [][]byte, length int) ([]byte, error) {
|
||||
return nil, errors.New("too many erasures requested, can't decode")
|
||||
}
|
||||
|
||||
src_err_list_ptr := Int2cInt(src_err_list[:err_count])
|
||||
src_err_list_ptr := int2cInt(src_err_list[:err_count])
|
||||
|
||||
for i := range chunks {
|
||||
if chunks[i] == nil || len(chunks[i]) == 0 {
|
||||
@@ -75,36 +72,42 @@ func (e *Encoder) Decode(chunks [][]byte, length int) ([]byte, error) {
|
||||
}
|
||||
}
|
||||
|
||||
matrix_size = C.size_t(k * n)
|
||||
decode_matrix = (*C.uchar)(unsafe.Pointer(C.malloc(matrix_size)))
|
||||
C.minio_init_decoder(src_err_list_ptr, e.encode_matrix,
|
||||
&decode_matrix, &decode_tbls,
|
||||
e.k, e.k+e.m, C.int(err_count-1))
|
||||
|
||||
defer C.free(unsafe.Pointer(decode_matrix))
|
||||
|
||||
decode_tbls_size = C.size_t(k * n * 32)
|
||||
decode_tbls = (*C.uchar)(unsafe.Pointer(C.malloc(decode_tbls_size)))
|
||||
defer C.free(unsafe.Pointer(decode_tbls))
|
||||
|
||||
C.gf_gen_decode_matrix(src_err_list_ptr, e.encode_matrix,
|
||||
decode_matrix, e.k, e.k+e.m, C.int(err_count-1), matrix_size)
|
||||
|
||||
C.ec_init_tables(e.k, C.int(err_count-1), decode_matrix, decode_tbls)
|
||||
e.decode_matrix = decode_matrix
|
||||
e.decode_tbls = decode_tbls
|
||||
|
||||
pointers := make([]*byte, n)
|
||||
for i := range chunks {
|
||||
pointers[i] = &chunks[i][0]
|
||||
}
|
||||
|
||||
/*
|
||||
// Pack recovery array as list of valid sources
|
||||
// Its order must be the same as the order
|
||||
// to generate matrix b in gf_gen_decode_matrix
|
||||
var i int
|
||||
for i = 0; i < e.p.k; i++ {
|
||||
recov[i] = buffs[decode_index[i]]
|
||||
}
|
||||
*/
|
||||
|
||||
data := (**C.uchar)(unsafe.Pointer(&pointers[:k][0]))
|
||||
coding := (**C.uchar)(unsafe.Pointer(&pointers[k:][0]))
|
||||
|
||||
C.ec_encode_data(C.int(matrix_size), e.k, C.int(err_count-1), e.decode_tbls,
|
||||
C.ec_encode_data(C.int(chunk_size), e.k, C.int(err_count-1), decode_tbls,
|
||||
data, coding)
|
||||
|
||||
recovered_output := make([]byte, 0, chunk_size*k)
|
||||
for i := 0; i < k; i++ {
|
||||
recovered_output = append(recovered_output, chunks[i]...)
|
||||
}
|
||||
|
||||
e.decode_matrix = decode_matrix
|
||||
e.decode_tbls = decode_tbls
|
||||
|
||||
return recovered_output[:length], nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user