X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbucket.h;h=24e7ae00d13c1a5d810a2eae38559de8960aa7ab;hb=68fe13e77b7ceaf950289e747281655ddb264576;hp=23ac48bb2f46637d108f9d6f460284ff56adf5c1;hpb=535e4b8371c566d0542be2188d06a5af59bbfdb8;p=libucw.git

diff --git a/lib/bucket.h b/lib/bucket.h
index 23ac48bb..24e7ae00 100644
--- a/lib/bucket.h
+++ b/lib/bucket.h
@@ -2,6 +2,9 @@
  *	Sherlock Library -- Object Buckets
  *
  *	(c) 2001 Martin Mares <mj@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
  */
 
 /*
@@ -16,11 +19,15 @@
  * fork()'ing if you don't have any bucket open is safe.
  */
 
+extern byte *obuck_name;	/* Internal, for use by buckettool only! */
+
 #define OBUCK_SHIFT 7
 #define OBUCK_ALIGN (1<<OBUCK_SHIFT)
 #define OBUCK_MAGIC 0xdeadf00d
+#define OBUCK_INCOMPLETE_MAGIC 0xdeadfeel
 #define OBUCK_TRAILER 0xfeedcafe
 #define OBUCK_OID_DELETED (~(oid_t)0)
+#define OBUCK_OID_FIRST_SPECIAL (~(oid_t)0xffff)
 
 struct obuck_header {
   u32 magic;			/* OBUCK_MAGIC should dwell here */
@@ -35,11 +42,14 @@ struct fastbuf;
 void obuck_init(int writeable);	/* Initialize the bucket module */
 void obuck_cleanup(void);	/* Clean up the bucket module */
 void obuck_sync(void);		/* Flush all buffers to disk */
+void obuck_lock_read(void);	/* Explicit locking to make sure other threads don't touch buckets now */
+void obuck_lock_write(void);
+void obuck_unlock(void);
 
 /* Searching for buckets */
 void obuck_find_by_oid(struct obuck_header *hdrp);
-int obuck_find_first(struct obuck_header *hdrp);
-int obuck_find_next(struct obuck_header *hdrp);
+int obuck_find_first(struct obuck_header *hdrp, int full);
+int obuck_find_next(struct obuck_header *hdrp, int full);
 
 /* Reading current bucket */
 struct fastbuf *obuck_fetch(void);
@@ -51,3 +61,13 @@ void obuck_create_end(struct fastbuf *b, struct obuck_header *hdrp);
 
 /* Deleting buckets */
 void obuck_delete(oid_t oid);
+
+/* Convert bucket ID to file position (for size limitations etc.) */
+
+static inline sh_off_t obuck_get_pos(oid_t oid)
+{
+  return ((sh_off_t) oid) << OBUCK_SHIFT;
+}
+
+/* Shaking down bucket file */
+void obuck_shakedown(int (*kibitz)(struct obuck_header *old, oid_t new, byte *buck));