X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=store.h;h=580881cff4b1d77ea596a8b4330d54539796b745;hb=dfb3bcd8cbcc6aa8737deddd332884e23d0e4b22;hp=1fd366b6ed24aed9ddfb6cb7ed898b07a4038f26;hpb=82025c010191040717501135d2758db7f5e9fa62;p=cumulus.git

diff --git a/store.h b/store.h
index 1fd366b..580881c 100644
--- a/store.h
+++ b/store.h
@@ -3,14 +3,12 @@
  *
  * Backup data is stored in a collection of objects, which are grouped together
  * into segments for storage purposes.  This implementation of the object store
- * is built on top of libtar, and represents segments as TAR files and objects
- * as files within them. */
+ * represents segments as TAR files and objects as files within them. */
 
 #ifndef _LBS_STORE_H
 #define _LBS_STORE_H
 
 #include <stdint.h>
-#include <libtar.h>
 
 #include <list>
 #include <map>
@@ -19,6 +17,8 @@
 #include <iostream>
 #include <sstream>
 
+#include "localdb.h"
+#include "remote.h"
 #include "sha1.h"
 #include "ref.h"
 
@@ -41,37 +41,63 @@ public:
     std::string getError() const { return error; }
 };
 
+/* Simplified TAR header--we only need to store regular files, don't need to
+ * handle long filenames, etc. */
+static const int TAR_BLOCK_SIZE = 512;
+
+struct tar_header
+{
+    char name[100];
+    char mode[8];
+    char uid[8];
+    char gid[8];
+    char size[12];
+    char mtime[12];
+    char chksum[8];
+    char typeflag;
+    char linkname[100];
+    char magic[8];
+    char uname[32];
+    char gname[32];
+    char devmajor[8];
+    char devminor[8];
+    char prefix[155];
+    char padding[12];
+};
+
 /* A simple wrapper around a single TAR file to represent a segment.  Objects
  * may only be written out all at once, since the tar header must be written
  * first; incremental writing is not supported. */
 class Tarfile {
 public:
-    Tarfile(const std::string &path, const std::string &segment);
+    Tarfile(RemoteFile *file, const std::string &segment);
     ~Tarfile();
 
-    int spawn_filter(int fd_out);
     void write_object(int id, const char *data, size_t len);
 
     // Return an estimate of the size of the file.
     size_t size_estimate();
 
-    void internal_write_object(const std::string &path,
-                               const char *data, size_t len);
-
 private:
     size_t size;
     std::string segment_name;
-    TAR *t;
+
+    RemoteFile *file;
 
     /* Filter support. */
     int real_fd, filter_fd;
     pid_t filter_pid;
+
+    // Write data to the tar file
+    void tar_write(const char *data, size_t size);
 };
 
 class TarSegmentStore {
 public:
     // New segments will be stored in the given directory.
-    TarSegmentStore(const std::string &path) { this->path = path; }
+    TarSegmentStore(RemoteStore *remote,
+                    LocalDb *db = NULL)
+        { this->remote = remote; this->db = db; }
     ~TarSegmentStore() { sync(); }
 
     // Writes an object to segment in the store, and returns the name
@@ -92,10 +118,14 @@ private:
         Tarfile *file;
         std::string name;           // UUID
         int count;                  // Objects written to this segment
+        int size;                   // Combined size of objects written
+        std::string basename;       // Name of segment without directory
+        RemoteFile *rf;
     };
 
-    std::string path;
+    RemoteStore *remote;
     std::map<std::string, struct segment_info *> segments;
+    LocalDb *db;
 
     // Ensure that all segments in the given group have been fully written.
     void close_segment(const std::string &group);
@@ -154,4 +184,12 @@ extern const char *filter_program;
  * included; this adds to it) */
 extern const char *filter_extension;
 
+/* Launch a process to filter data written to a file descriptor.  fd_out is the
+ * file descriptor where the filtered data should be written.  program is the
+ * filter program to execute (a single string which will be interpreted by
+ * /bin/sh).  The return value is a file descriptor to which the data to be
+ * filtered should be written.  The process ID of the filter process is stored
+ * at address filter_pid if non-NULL. */
+int spawn_filter(int fd_out, const char *program, pid_t *filter_pid);
+
 #endif // _LBS_STORE_H