rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 02:49:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adds a new sort functions for RAID.

Browse source
This commit is contained in:
Andrea Mazzoleni 2013-12-28 17:07:00 +01:00
parent 305b52d32a
commit b7a8858233
3 changed files with 96 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -10,6 +10,7 @@ snapraid_SOURCES = \
raid/x86.c \
raid/intz.c \
raid/x86z.c \
raid/sort.c \
snapraid.c \
tommy.c \
util.c \

29
raid/raid.h
View file

@ -83,13 +83,13 @@ void raid_waste(void *zero);
*
* \param nd Number of data disks.
* \param np Number of parities to compute.
* \param size Size of the blocks pointed by vv. It must be a multipler of 64.
* \param vv Vector of pointers to the blocks for disks and parities.
* \param size Size of the blocks pointed by ::v. It must be a multipler of 64.
* \param v Vector of pointers to the blocks for disks and parities.
* It has (::nd + ::np) elements. The first elements are the blocks for
* data, following with the parity blocks.
* Each blocks has ::size bytes.
*/
void raid_par(int nd, int np, size_t size, void **vv);
void raid_par(int nd, int np, size_t size, void **v);
/**
* Recovers failures of data and parity blocks.
@ -112,13 +112,13 @@ void raid_par(int nd, int np, size_t size, void **vv);
* not recomputed.
* \param nd Number of data disks.
* \param np Number of parity disks.
* \param size Size of the blocks pointed by vv. It must be a multipler of 64.
* \param vv Vector of pointers to the blocks for disks and parities.
* \param size Size of the blocks pointed by ::v. It must be a multipler of 64.
* \param v Vector of pointers to the blocks for disks and parities.
* It has (::nd + ::np) elements. The first elements are the blocks
* for data, following with the parity blocks.
* Each blocks has ::size bytes.
*/
void raid_rec(int nrd, const int *id, int nrp, int *ip, int nd, int np, size_t size, void **vv);
void raid_rec(int nrd, const int *id, int nrp, int *ip, int nd, int np, size_t size, void **v);
/**
* Recovers failures of data blocks using the specified parities.
@ -135,13 +135,24 @@ void raid_rec(int nrd, const int *id, int nrp, int *ip, int nd, int np, size_t s
* \param ip[] Vector of ::nr indexes of the parity disks to use for recovering.
* The indexes start from 0. They must be in order.
* \param nd Number of data disks.
* \param size Size of the blocks pointed by vv. It must be a multipler of 64.
* \param vv Vector of pointers to the blocks for disks and parities.
* \param size Size of the blocks pointed by ::v. It must be a multipler of 64.
* \param v Vector of pointers to the blocks for disks and parities.
* It has (::nd + ::ip[::nr - 1] + 1) elements. The first elements are the
* blocks for data, following with the parity blocks.
* Each blocks has ::size bytes.
*/
void raid_rec_dataonly(int nr, const int *id, const int *ip, int nd, size_t size, void **vv);
void raid_rec_dataonly(int nr, const int *id, const int *ip, int nd, size_t size, void **v);
/**
* Sorts a small vector of integers.
*
* If you have block indexes not in order, you can use this function to sort
* them before callign raid_rec().
*
* \param n Number of integers. No more than RAID_PARITY_MAX.
* \paran v Vector of integers.
*/
void raid_sort(int n, int* v);
#endif

75
raid/sort.c Normal file
View file

@ -0,0 +1,75 @@
/*
* Copyright (C) 2013 Andrea Mazzoleni
*
* 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 of the License, 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 <http://www.gnu.org/licenses/>.
*/
#include "internal.h"
#define RAID_SWAP(a, b) \
do { \
if (v[a] > v[b]) { \
int t = v[a]; \
v[a] = v[b]; \
v[b] = t; \
} \
} while (0)
void raid_sort(int n, int* v)
{
/* sorting networks generated with the Batcher's Merge-Exchange algorithm */
switch (n) {
case 2 :
RAID_SWAP(0, 1);
break;
case 3 :
RAID_SWAP(0, 2);
RAID_SWAP(0, 1);
RAID_SWAP(1, 2);
break;
case 4 :
RAID_SWAP(0, 2);
RAID_SWAP(1, 3);
RAID_SWAP(0, 1);
RAID_SWAP(2, 3);
RAID_SWAP(1, 2);
break;
case 5 :
RAID_SWAP(0, 4);
RAID_SWAP(0, 2);
RAID_SWAP(1, 3);
RAID_SWAP(2, 4);
RAID_SWAP(0, 1);
RAID_SWAP(2, 3);
RAID_SWAP(1, 4);
RAID_SWAP(1, 2);
RAID_SWAP(3, 4);
break;
case 6 :
RAID_SWAP(0, 4);
RAID_SWAP(1, 5);
RAID_SWAP(0, 2);
RAID_SWAP(1, 3);
RAID_SWAP(2, 4);
RAID_SWAP(3, 5);
RAID_SWAP(0, 1);
RAID_SWAP(2, 3);
RAID_SWAP(4, 5);
RAID_SWAP(1, 4);
RAID_SWAP(1, 2);
RAID_SWAP(3, 4);
break;
}
}