X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsorter%2Fcommon.h;h=8affa6300c34a8504e7c3016360bd05feba97bbf;hb=6d00600fd0121cd3361843ca803fab0b2b76a7d8;hp=15083663f3cb03aead02787bdba87d2b7ae4982b;hpb=baa9f9a3368c8d318b9711340727f822d8fc8a34;p=libucw.git

diff --git a/lib/sorter/common.h b/lib/sorter/common.h
index 15083663..8affa630 100644
--- a/lib/sorter/common.h
+++ b/lib/sorter/common.h
@@ -14,27 +14,18 @@
 
 /* Configuration, some of the variables are used by the old sorter, too. */
 extern uns sorter_trace, sorter_presort_bufsize, sorter_stream_bufsize;
+extern uns sorter_debug;
 extern u64 sorter_bufsize;
 
 #define SORT_TRACE(x...) do { if (sorter_trace) log(L_DEBUG, x); } while(0)
 #define SORT_XTRACE(x...) do { if (sorter_trace > 1) log(L_DEBUG, x); } while(0)
 
-struct sort_bucket {
-  cnode n;
-  uns flags;
-  struct fastbuf *fb;
-  byte *name;
-  u64 size;				// Size in bytes
-  uns runs;				// Number of runs, 0 if not sorted
-  uns hash_bits;			// Remaining bits of the hash function
-  byte *ident;				// Identifier used in debug messages
+enum sort_debug {
+  SORT_DEBUG_NO_PRESORT = 1,
+  SORT_DEBUG_NO_JOIN = 2,
 };
 
-enum sort_bucket_flags {
-  SBF_FINAL = 1,			// This bucket corresponds to the final output file (always 1 run)
-  SBF_SOURCE = 2,			// Contains the source file (always 0 runs)
-  SBF_CUSTOM_PRESORT = 4,		// Contains source to read via custom presorter
-};
+struct sort_bucket;
 
 struct sort_context {
   struct fastbuf *in_fb;
@@ -46,7 +37,7 @@ struct sort_context {
   void *big_buf, *big_buf_half;
   size_t big_buf_size, big_buf_half_size;
 
-  int (*custom_presort)(struct fastbuf *dest, byte *buf, size_t bufsize);
+  int (*custom_presort)(struct fastbuf *dest, void *buf, size_t bufsize);
   // Take as much as possible from the source bucket, sort it in memory and dump to destination bucket.
   // Return 1 if there is more data available in the source bucket.
   int (*internal_sort)(struct sort_context *ctx, struct sort_bucket *in, struct sort_bucket *out, struct sort_bucket *out_only);
@@ -61,17 +52,43 @@ struct sort_context {
 
 void sorter_run(struct sort_context *ctx);
 
+/* Buffers */
+
 void *sorter_alloc(struct sort_context *ctx, uns size);
 void sorter_alloc_buf(struct sort_context *ctx);
 void sorter_free_buf(struct sort_context *ctx);
 
-// Operations on buckets
+/* Buckets */
+
+struct sort_bucket {
+  cnode n;
+  struct sort_context *ctx;
+  uns flags;
+  struct fastbuf *fb;
+  byte *filename;
+  u64 size;				// Size in bytes (not valid when writing)
+  uns runs;				// Number of runs, 0 if not sorted
+  uns hash_bits;			// Remaining bits of the hash function
+  byte *ident;				// Identifier used in debug messages
+};
+
+enum sort_bucket_flags {
+  SBF_FINAL = 1,			// This bucket corresponds to the final output file (always 1 run)
+  SBF_SOURCE = 2,			// Contains the source file (always 0 runs)
+  SBF_CUSTOM_PRESORT = 4,		// Contains source to read via custom presorter
+  SBF_OPEN_WRITE = 256,			// We are currently writing to the fastbuf
+  SBF_OPEN_READ = 512,			// We are reading from the fastbuf
+  SBF_DESTROYED = 1024,			// Already done with, no further references allowed
+  SBF_SWAPPED_OUT = 2048,		// Swapped out to a named file
+};
+
 struct sort_bucket *sbuck_new(struct sort_context *ctx);
 void sbuck_drop(struct sort_bucket *b);
-int sbuck_can_read(struct sort_bucket *b);
-struct fastbuf *sbuck_open_read(struct sort_bucket *b);
-struct fastbuf *sbuck_open_write(struct sort_bucket *b);
-void sbuck_close_read(struct sort_bucket *b);
-void sbuck_close_write(struct sort_bucket *b);
+int sbuck_have(struct sort_bucket *b);
+int sbuck_has_file(struct sort_bucket *b);
+sh_off_t sbuck_size(struct sort_bucket *b);
+struct fastbuf *sbuck_read(struct sort_bucket *b);
+struct fastbuf *sbuck_write(struct sort_bucket *b);
+void sbuck_swap_out(struct sort_bucket *b);
 
 #endif