Merged obj2buck.h and buck2obj.h to object.h, the number of includes

[libucw.git] / lib / bucket.h

diff --git a/lib/bucket.h b/lib/bucket.h
index 815213ca8ea793e19205e8e45c997d2878503d60..1af677cad8907556efe32502b40efa88ccf461eb 100644 (file)
--- 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;
@@ -82,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));