mirror of
https://github.com/amadvance/snapraid.git
synced 2026-10-26 19:01:57 -04:00
Fix some formatting issues of the code
Now it matches the Linux kernel style.
This commit is contained in:
Andrea Mazzoleni
parent
2bcca4f2ec
commit
c8558c28ac
10 changed files with 50 additions and 48 deletions
|
|
@ -83,6 +83,7 @@ void raid_insert(int n, int *v, int i)
|
|||
while (n > 0 && v[n - 1] > v[n]) {
|
||||
/* swap */
|
||||
int t = v[n - 1];
|
||||
|
||||
v[n - 1] = v[n];
|
||||
v[n] = t;
|
||||
|
||||
|
|
|
|||
23
raid/int.c
23
raid/int.c
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
void raid_gen1_int32(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
int d, l;
|
||||
size_t i;
|
||||
|
|
@ -48,7 +48,7 @@ void raid_gen1_int32(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen1_int64(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
int d, l;
|
||||
size_t i;
|
||||
|
|
@ -76,7 +76,7 @@ void raid_gen1_int64(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen2_int32(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
int d, l;
|
||||
|
|
@ -117,7 +117,7 @@ void raid_gen2_int32(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen2_int64(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
int d, l;
|
||||
|
|
@ -163,7 +163,7 @@ void raid_gen2_int64(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen3_int8(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -210,7 +210,7 @@ void raid_gen3_int8(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen4_int8(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -262,7 +262,7 @@ void raid_gen4_int8(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen5_int8(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -319,7 +319,7 @@ void raid_gen5_int8(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen6_int8(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -385,7 +385,7 @@ void raid_gen6_int8(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_rec1_int8(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *pa;
|
||||
const uint8_t *T;
|
||||
|
|
@ -438,7 +438,7 @@ void raid_rec1_int8(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_rec2_int8(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *pa;
|
||||
uint8_t *q;
|
||||
|
|
@ -506,7 +506,7 @@ void raid_rec2_int8(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_recX_int8(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p[RAID_PARITY_MAX];
|
||||
uint8_t *pa[RAID_PARITY_MAX];
|
||||
const uint8_t *T[RAID_PARITY_MAX][RAID_PARITY_MAX];
|
||||
|
|
@ -546,6 +546,7 @@ void raid_recX_int8(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
/* reconstruct */
|
||||
for (j = 0; j < nr; ++j) {
|
||||
uint8_t b = 0;
|
||||
|
||||
for (k = 0; k < nr; ++k)
|
||||
b ^= T[j][k][PD[k]];
|
||||
pa[j][i] = b;
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@
|
|||
/*
|
||||
* Internal functions.
|
||||
*
|
||||
* These are intented to provide access for testing.
|
||||
* These are intended to provide access for testing.
|
||||
*/
|
||||
int raid_selftest(void);
|
||||
void raid_gen_ref(int nd, int np, size_t size, void **vv);
|
||||
|
|
@ -225,6 +225,7 @@ static __always_inline void raid_sse_end(void)
|
|||
#ifdef CONFIG_AVX2
|
||||
static __always_inline void raid_avx_begin(void)
|
||||
{
|
||||
raid_sse_begin();
|
||||
}
|
||||
|
||||
static __always_inline void raid_avx_end(void)
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ void **raid_malloc_vector(int nd, int n, size_t size, void **freeptr)
|
|||
/* because they are usually accessed from the last one */
|
||||
for (i = 0; i < nd / 2; ++i) {
|
||||
void *ptr = v[i];
|
||||
|
||||
v[i] = v[nd - 1 - i];
|
||||
v[nd - 1 - i] = ptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* To avoid this effect, it's better if all the blocks are allocated
|
||||
* with a fixed displacement trying to reduce the cache addresses sharing.
|
||||
*
|
||||
* The selected value was choosen empirically with some speed tests
|
||||
* The selected displacement was chosen empirically with some speed tests
|
||||
* with 8/12/16/20/24 data buffers of 256 KB.
|
||||
*
|
||||
* These are the results in MB/s with no displacement:
|
||||
|
|
|
|||
|
|
@ -147,6 +147,7 @@ static void set_cauchy(uint8_t *matrix)
|
|||
inv_x = 1;
|
||||
for (i = 0; i < DISK; ++i) {
|
||||
uint8_t x = gfinv[inv_x];
|
||||
|
||||
matrix[(j + 2) * DISK + i] = gfinv[y ^ x];
|
||||
inv_x = gfmul(2, inv_x);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,11 +110,11 @@ void raid_init(void)
|
|||
}
|
||||
|
||||
/*
|
||||
* Refence parity computation.
|
||||
* Reference parity computation.
|
||||
*/
|
||||
void raid_gen_ref(int nd, int np, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < size; ++i) {
|
||||
|
|
@ -281,7 +281,7 @@ int raid_selftest(void)
|
|||
|
||||
/* use the multiplication table as data */
|
||||
for (i = 0; i < nd; ++i)
|
||||
ref[i] = ((uint8_t*)gfmul) + size * i;
|
||||
ref[i] = ((uint8_t *)gfmul) + size * i;
|
||||
|
||||
/* setup reference parity */
|
||||
for (i = 0; i < RAID_PARITY_MAX; ++i)
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ void raid_delta_gen(int nr, int *id, int *ip, int nd, size_t size, void **v)
|
|||
void *pa[RAID_PARITY_MAX];
|
||||
int i, j;
|
||||
int np;
|
||||
void* latest;
|
||||
void *latest;
|
||||
|
||||
/* total number of parities we are going to process */
|
||||
/* they are both the used and the unused ones */
|
||||
|
|
@ -420,7 +420,7 @@ void raid_rec1of1(int *id, int nd, size_t size, void **v)
|
|||
*/
|
||||
void raid_rec2of2_int8(int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
size_t i;
|
||||
uint8_t *p;
|
||||
uint8_t *pa;
|
||||
|
|
|
|||
|
|
@ -132,6 +132,8 @@ int raid_test_sort(void)
|
|||
|
||||
int raid_test_rec(int mode, int nd, size_t size)
|
||||
{
|
||||
void (*f[RAID_PARITY_MAX][4])(
|
||||
int nr, int *id, int *ip, int nd, size_t size, void **vbuf);
|
||||
void *v_alloc;
|
||||
void **v;
|
||||
void **data;
|
||||
|
|
@ -146,9 +148,6 @@ int raid_test_rec(int mode, int nd, size_t size)
|
|||
int i;
|
||||
int j;
|
||||
int nr;
|
||||
|
||||
void (*f[RAID_PARITY_MAX][4])(
|
||||
int nr, int *id, int *ip, int nd, size_t size, void **vbuf);
|
||||
int nf[RAID_PARITY_MAX];
|
||||
int np;
|
||||
|
||||
|
|
@ -279,12 +278,11 @@ bail:
|
|||
|
||||
int raid_test_par(int mode, int nd, size_t size)
|
||||
{
|
||||
void (*f[64]) (int nd, size_t size, void **vbuf);
|
||||
void *v_alloc;
|
||||
void **v;
|
||||
int nv;
|
||||
int i, j;
|
||||
|
||||
void (*f[64]) (int nd, size_t size, void **vbuf);
|
||||
int nf;
|
||||
int np;
|
||||
|
||||
|
|
|
|||
49
raid/x86.c
49
raid/x86.c
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
void raid_gen1_sse2(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
int d, l;
|
||||
size_t i;
|
||||
|
|
@ -66,7 +66,7 @@ void raid_gen1_sse2(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen1_avx2(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
int d, l;
|
||||
size_t i;
|
||||
|
|
@ -95,8 +95,7 @@ void raid_gen1_avx2(int nd, size_t size, void **vv)
|
|||
static const struct gfconst16 {
|
||||
uint8_t poly[16];
|
||||
uint8_t low4[16];
|
||||
} gfconst16 __aligned(32) =
|
||||
{
|
||||
} gfconst16 __aligned(32) = {
|
||||
{
|
||||
0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d,
|
||||
0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d
|
||||
|
|
@ -114,7 +113,7 @@ static const struct gfconst16 {
|
|||
*/
|
||||
void raid_gen2_sse2(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
int d, l;
|
||||
|
|
@ -168,7 +167,7 @@ void raid_gen2_sse2(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen2_avx2(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
int d, l;
|
||||
|
|
@ -223,7 +222,7 @@ void raid_gen2_avx2(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen2_sse2ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
int d, l;
|
||||
|
|
@ -301,7 +300,7 @@ void raid_gen2_sse2ext(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen3_ssse3(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -400,7 +399,7 @@ void raid_gen3_ssse3(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen3_ssse3ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -541,7 +540,7 @@ void raid_gen3_ssse3ext(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen3_avx2ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -672,7 +671,7 @@ void raid_gen3_avx2ext(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen4_ssse3(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -790,7 +789,7 @@ void raid_gen4_ssse3(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen4_ssse3ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -963,7 +962,7 @@ void raid_gen4_ssse3ext(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen4_avx2ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -1126,7 +1125,7 @@ __attribute__((force_align_arg_pointer))
|
|||
#endif
|
||||
void raid_gen5_ssse3(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -1264,7 +1263,7 @@ void raid_gen5_ssse3(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen5_ssse3ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -1397,7 +1396,7 @@ void raid_gen5_ssse3ext(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen5_avx2ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -1529,7 +1528,7 @@ __attribute__((force_align_arg_pointer))
|
|||
#endif
|
||||
void raid_gen6_ssse3(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -1689,7 +1688,7 @@ void raid_gen6_ssse3(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen6_ssse3ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -1839,7 +1838,7 @@ void raid_gen6_ssse3ext(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_gen6_avx2ext(int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *q;
|
||||
uint8_t *r;
|
||||
|
|
@ -1984,7 +1983,7 @@ void raid_gen6_avx2ext(int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_rec1_ssse3(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *pa;
|
||||
uint8_t G;
|
||||
|
|
@ -2043,7 +2042,7 @@ void raid_rec1_ssse3(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_rec2_ssse3(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
const int N = 2;
|
||||
uint8_t *p[N];
|
||||
uint8_t *pa[N];
|
||||
|
|
@ -2149,7 +2148,7 @@ void raid_rec2_ssse3(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_recX_ssse3(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
int N = nr;
|
||||
uint8_t *p[RAID_PARITY_MAX];
|
||||
uint8_t *pa[RAID_PARITY_MAX];
|
||||
|
|
@ -2225,7 +2224,7 @@ void raid_recX_ssse3(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_rec1_avx2(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
uint8_t *p;
|
||||
uint8_t *pa;
|
||||
uint8_t G;
|
||||
|
|
@ -2281,7 +2280,7 @@ void raid_rec1_avx2(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_rec2_avx2(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
const int N = 2;
|
||||
uint8_t *p[N];
|
||||
uint8_t *pa[N];
|
||||
|
|
@ -2379,7 +2378,7 @@ void raid_rec2_avx2(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
|||
*/
|
||||
void raid_recX_avx2(int nr, int *id, int *ip, int nd, size_t size, void **vv)
|
||||
{
|
||||
uint8_t **v = (uint8_t**)vv;
|
||||
uint8_t **v = (uint8_t **)vv;
|
||||
int N = nr;
|
||||
uint8_t *p[RAID_PARITY_MAX];
|
||||
uint8_t *pa[RAID_PARITY_MAX];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue