X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fsorter%2Fsort-test.c;h=b7a0dbd614c5b6b2ac6cfb83d906ac5c85014b20;hb=6efdc514c193f18c9ef840096750c37e78a01bf6;hp=fcd782a84f238f85291ac86db325c0d7e02f0827;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git diff --git a/ucw/sorter/sort-test.c b/ucw/sorter/sort-test.c index fcd782a8..b7a0dbd6 100644 --- a/ucw/sorter/sort-test.c +++ b/ucw/sorter/sort-test.c @@ -7,15 +7,16 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/getopt.h" -#include "ucw/conf.h" -#include "ucw/fastbuf.h" -#include "ucw/ff-binary.h" -#include "ucw/hashfunc.h" -#include "ucw/md5.h" -#include "ucw/string.h" -#include "ucw/prime.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -63,7 +64,7 @@ struct key1 { #define SORT_INT(k) (k).x #define SORT_DELETE_INPUT 0 -#include "ucw/sorter/sorter.h" +#include static void test_int(int mode, u64 size) @@ -112,7 +113,7 @@ static inline void s2_write_merged(struct fastbuf *f, struct key2 **k, void **d #define SORT_UNIFY #define SORT_INT(k) (k).x -#include "ucw/sorter/sorter.h" +#include static void test_counted(int mode, u64 size) @@ -180,7 +181,7 @@ static inline uns s3_hash(struct key3 *x) #define SORT_OUTPUT_FB #define SORT_HASH_BITS 32 -#include "ucw/sorter/sorter.h" +#include static void gen_hash_key(int mode, struct key3 *k, uns i) @@ -288,7 +289,7 @@ static inline void s4_write_key(struct fastbuf *f, struct key4 *x) #define SORT_INPUT_FB #define SORT_OUTPUT_FB -#include "ucw/sorter/sorter.h" +#include #define s4b_compare s4_compare #define s4b_read_key s4_read_key @@ -306,7 +307,7 @@ static inline uns s4_data_size(struct key4 *x) #define SORT_INPUT_FB #define SORT_OUTPUT_FB -#include "ucw/sorter/sorter.h" +#include static void gen_key4(struct key4 *k) @@ -409,7 +410,7 @@ static int s5_gen(struct s5_pair *p) #define ASORT_PREFIX(x) s5m_##x #define ASORT_KEY_TYPE u32 -#include "ucw/sorter/array-simple.h" +#include static void s5_write_merged(struct fastbuf *f, struct key5 **keys, void **data, uns n, void *buf) { @@ -461,7 +462,7 @@ static inline int s5p_lt(struct s5_pair x, struct s5_pair y) #define ASORT_PREFIX(x) s5p_##x #define ASORT_KEY_TYPE struct s5_pair #define ASORT_LT(x,y) s5p_lt(x,y) -#include "ucw/sorter/array.h" +#include static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize) { @@ -496,7 +497,7 @@ static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize) #define SORT_OUTPUT_THIS_FB #define SORT_INT(k) (k).x -#include "ucw/sorter/sorter.h" +#include #define SORT_KEY_REGULAR struct key5 #define SORT_PREFIX(x) s5b_##x @@ -509,7 +510,7 @@ static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize) #define s5b_write_merged s5_write_merged #define s5b_copy_merged s5_copy_merged -#include "ucw/sorter/sorter.h" +#include static void test_graph(uns mode, u64 size) @@ -578,7 +579,7 @@ struct key6 { #define SORT_UNIQUE #define SORT_INT64(k) (k).x -#include "ucw/sorter/sorter.h" +#include static void test_int64(int mode, u64 size)