Commit 7add17be authored by David Sterba's avatar David Sterba

btrfs: heuristic: open code copy_call callback of radix sort

The callback is trivial and we don't need the abstraction for our
purposes. Let's open code it.
Reviewed-by: default avatarTimofey Titovets <nefelim4ag@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 23ae8c63
...@@ -1311,13 +1311,6 @@ static u8 get4bits(u64 num, int shift) { ...@@ -1311,13 +1311,6 @@ static u8 get4bits(u64 num, int shift) {
return low4bits; return low4bits;
} }
static void copy_cell(void *dst, int dest_i, void *src, int src_i)
{
struct bucket_item *dstv = (struct bucket_item *)dst;
struct bucket_item *srcv = (struct bucket_item *)src;
dstv[dest_i] = srcv[src_i];
}
/* /*
* Use 4 bits as radix base * Use 4 bits as radix base
* Use 16 u32 counters for calculating new possition in buf array * Use 16 u32 counters for calculating new possition in buf array
...@@ -1326,13 +1319,10 @@ static void copy_cell(void *dst, int dest_i, void *src, int src_i) ...@@ -1326,13 +1319,10 @@ static void copy_cell(void *dst, int dest_i, void *src, int src_i)
* @array_buf - buffer array to store sorting results * @array_buf - buffer array to store sorting results
* must be equal in size to @array * must be equal in size to @array
* @num - array size * @num - array size
* @copy_cell - function to copy data from array to array_buf and vice versa
* @get4bits - function to get 4 bits from number at specified offset * @get4bits - function to get 4 bits from number at specified offset
*/ */
static void radix_sort(struct bucket_item *array, struct bucket_item *array_buf, static void radix_sort(struct bucket_item *array, struct bucket_item *array_buf,
int num, int num,
void (*copy_cell)(void *dest, int dest_i,
void* src, int src_i),
u8 (*get4bits)(u64 num, int shift)) u8 (*get4bits)(u64 num, int shift))
{ {
u64 max_num; u64 max_num;
...@@ -1376,7 +1366,7 @@ static void radix_sort(struct bucket_item *array, struct bucket_item *array_buf, ...@@ -1376,7 +1366,7 @@ static void radix_sort(struct bucket_item *array, struct bucket_item *array_buf,
addr = get4bits(buf_num, shift); addr = get4bits(buf_num, shift);
counters[addr]--; counters[addr]--;
new_addr = counters[addr]; new_addr = counters[addr];
copy_cell(array_buf, new_addr, array, i); array_buf[new_addr] = array[i];
} }
shift += RADIX_BASE; shift += RADIX_BASE;
...@@ -1403,7 +1393,7 @@ static void radix_sort(struct bucket_item *array, struct bucket_item *array_buf, ...@@ -1403,7 +1393,7 @@ static void radix_sort(struct bucket_item *array, struct bucket_item *array_buf,
addr = get4bits(buf_num, shift); addr = get4bits(buf_num, shift);
counters[addr]--; counters[addr]--;
new_addr = counters[addr]; new_addr = counters[addr];
copy_cell(array, new_addr, array_buf, i); array[new_addr] = array_buf[i];
} }
shift += RADIX_BASE; shift += RADIX_BASE;
...@@ -1437,8 +1427,7 @@ static int byte_core_set_size(struct heuristic_ws *ws) ...@@ -1437,8 +1427,7 @@ static int byte_core_set_size(struct heuristic_ws *ws)
struct bucket_item *bucket = ws->bucket; struct bucket_item *bucket = ws->bucket;
/* Sort in reverse order */ /* Sort in reverse order */
radix_sort(ws->bucket, ws->bucket_b, BUCKET_SIZE, copy_cell, radix_sort(ws->bucket, ws->bucket_b, BUCKET_SIZE, get4bits);
get4bits);
for (i = 0; i < BYTE_CORE_SET_LOW; i++) for (i = 0; i < BYTE_CORE_SET_LOW; i++)
coreset_sum += bucket[i].count; coreset_sum += bucket[i].count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment