mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
f7f82b81d2
Walking backref tree and btrfs quota rely on ulist very much. This patch tries to use rb_tree to speed up search time. The original code always checks whether an element exists before adding a new element, however it costs O(n). I try to add a rb_tree in the ulist,this is only used to speed up search. I also do some measurements with quota enabled. fsstress -p 4 -n 10000 Without this path: real 0m51.058s 2m4.745s 1m28.222s 1m5.137s user 0m0.035s 0m0.041s 0m0.105s 0m0.100s sys 0m12.009s 0m11.246s 0m10.901s 0m10.999s 0m11.287s With this path: real 0m55.295s 0m50.960s 1m2.214s 0m48.273s user 0m0.053s 0m0.095s 0m0.135s 0m0.107s sys 0m7.766s 0m6.013s 0m6.319s 0m6.030s 0m6.532s After applying the patch,the execute time is down by ~42%.(11.287s->6.532s) Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com> Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> Reviewed-by: Jan Schmidt <list.btrfs@jan-o-sch.net> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
82 lines
2 KiB
C
82 lines
2 KiB
C
/*
|
|
* Copyright (C) 2011 STRATO AG
|
|
* written by Arne Jansen <sensille@gmx.net>
|
|
* Distributed under the GNU GPL license version 2.
|
|
*
|
|
*/
|
|
|
|
#ifndef __ULIST__
|
|
#define __ULIST__
|
|
|
|
#include <linux/list.h>
|
|
#include <linux/rbtree.h>
|
|
|
|
/*
|
|
* ulist is a generic data structure to hold a collection of unique u64
|
|
* values. The only operations it supports is adding to the list and
|
|
* enumerating it.
|
|
* It is possible to store an auxiliary value along with the key.
|
|
*
|
|
* The implementation is preliminary and can probably be sped up
|
|
* significantly. A first step would be to store the values in an rbtree
|
|
* as soon as ULIST_SIZE is exceeded.
|
|
*/
|
|
|
|
/*
|
|
* number of elements statically allocated inside struct ulist
|
|
*/
|
|
#define ULIST_SIZE 16
|
|
|
|
struct ulist_iterator {
|
|
int i;
|
|
};
|
|
|
|
/*
|
|
* element of the list
|
|
*/
|
|
struct ulist_node {
|
|
u64 val; /* value to store */
|
|
u64 aux; /* auxiliary value saved along with the val */
|
|
struct rb_node rb_node; /* used to speed up search */
|
|
};
|
|
|
|
struct ulist {
|
|
/*
|
|
* number of elements stored in list
|
|
*/
|
|
unsigned long nnodes;
|
|
|
|
/*
|
|
* number of nodes we already have room for
|
|
*/
|
|
unsigned long nodes_alloced;
|
|
|
|
/*
|
|
* pointer to the array storing the elements. The first ULIST_SIZE
|
|
* elements are stored inline. In this case the it points to int_nodes.
|
|
* After exceeding ULIST_SIZE, dynamic memory is allocated.
|
|
*/
|
|
struct ulist_node *nodes;
|
|
|
|
struct rb_root root;
|
|
|
|
/*
|
|
* inline storage space for the first ULIST_SIZE entries
|
|
*/
|
|
struct ulist_node int_nodes[ULIST_SIZE];
|
|
};
|
|
|
|
void ulist_init(struct ulist *ulist);
|
|
void ulist_fini(struct ulist *ulist);
|
|
void ulist_reinit(struct ulist *ulist);
|
|
struct ulist *ulist_alloc(gfp_t gfp_mask);
|
|
void ulist_free(struct ulist *ulist);
|
|
int ulist_add(struct ulist *ulist, u64 val, u64 aux, gfp_t gfp_mask);
|
|
int ulist_add_merge(struct ulist *ulist, u64 val, u64 aux,
|
|
u64 *old_aux, gfp_t gfp_mask);
|
|
struct ulist_node *ulist_next(struct ulist *ulist,
|
|
struct ulist_iterator *uiter);
|
|
|
|
#define ULIST_ITER_INIT(uiter) ((uiter)->i = 0)
|
|
|
|
#endif
|