X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbucket.h;h=1af677cad8907556efe32502b40efa88ccf461eb;hb=2771551e0dbfc9517ca6fd68f0db362434ceddbb;hp=ac14a6ddb01c99c070054b023140dd1798bb850d;hpb=eefcb6d5ecc617a2cb2e35a220848e187585ff14;p=libucw.git

diff --git a/lib/bucket.h b/lib/bucket.h
index ac14a6dd..1af677ca 100644
--- a/lib/bucket.h
+++ b/lib/bucket.h
@@ -1,7 +1,7 @@
 /*
  *	Sherlock Library -- Object Buckets
  *
- *	(c) 2001--2003 Martin Mares <mj@ucw.cz>
+ *	(c) 2001--2004 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -17,7 +17,9 @@
  *
  * Locking: Each operation on the pool is protected by a flock.
  *
- * The buckets emulate non-seekable fastbuf streams.
+ * The buckets emulate fastbuf streams. Read streams act as normal files,
+ * but there can be only one write stream which is non-seekable and you
+ * also shouldn't open new read streams when writing.
  *
  * fork()'ing if you don't have any bucket open is safe.
  */
@@ -44,7 +46,8 @@ enum bucket_type {
   BUCKET_TYPE_COMPAT = 0x7fffffff,	/* and less -- buckets created by older versions of Sherlock */
   BUCKET_TYPE_PLAIN = 0x80000000,	/* plain textual buckets */
   BUCKET_TYPE_V30 = 0x80000001,		/* v3.0 uncompressed buckets */
-  BUCKET_TYPE_V30C = 0x80000002		/* v3.0 compressed buckets */
+  BUCKET_TYPE_V33 = 0x80000002,		/* v3.3 uncompressed buckets */
+  BUCKET_TYPE_V33_LIZARD = 0x80000003	/* v3.3 buckets compressed by lizard */
 };
 
 struct fastbuf;
@@ -64,7 +67,6 @@ int obuck_find_next(struct obuck_header *hdrp, int full);
 
 /* Reading current bucket */
 struct fastbuf *obuck_fetch(void);
-void obuck_fetch_end(struct fastbuf *b);
 
 /* Creating buckets */
 struct fastbuf *obuck_create(u32 type);
@@ -83,6 +85,13 @@ static inline sh_off_t obuck_get_pos(oid_t oid)
   return ((sh_off_t) oid) << OBUCK_SHIFT;
 }
 
+/* Calculate size of bucket which contains given amount of data */
+
+static inline uns obuck_bucket_size(uns len)
+{
+  return ALIGN(sizeof(struct obuck_header) + len + 4, OBUCK_ALIGN);
+}
+
 /* Shaking down bucket file */
 void obuck_shakedown(int (*kibitz)(struct obuck_header *old, oid_t new, byte *buck));