Squeeze extra blank lines when dumping metadata logs.

[cumulus.git] / store.h

diff --git a/store.h b/store.h
index a959cce..580881c 100644 (file)
--- a/store.h
+++ b/store.h
@@ -18,6 +18,7 @@
 #include <sstream>
 
 #include "localdb.h"
+#include "remote.h"
 #include "sha1.h"
 #include "ref.h"
 
@@ -69,22 +70,20 @@ struct tar_header
  * 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;
 
+    RemoteFile *file;
+
     /* Filter support. */
     int real_fd, filter_fd;
     pid_t filter_pid;
@@ -96,9 +95,9 @@ private:
 class TarSegmentStore {
 public:
     // New segments will be stored in the given directory.
-    TarSegmentStore(const std::string &path,
+    TarSegmentStore(RemoteStore *remote,
                     LocalDb *db = NULL)
-        { this->path = path; this->db = db; }
+        { this->remote = remote; this->db = db; }
     ~TarSegmentStore() { sync(); }
 
     // Writes an object to segment in the store, and returns the name
@@ -119,11 +118,12 @@ 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
-        std::string fullname;       // Full path to stored segment
+        RemoteFile *rf;
     };
 
-    std::string path;
+    RemoteStore *remote;
     std::map<std::string, struct segment_info *> segments;
     LocalDb *db;
 
@@ -184,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