journal-remote: rework fd and writer reference handling

[elogind.git] / src / journal-remote / journal-remote-write.h

diff --git a/src/journal-remote/journal-remote-write.h b/src/journal-remote/journal-remote-write.h
index 2ea5e6714f839b92f2ba0c8273796541ca36c619..9c5a641d2e01749cf1dc3c77356bad1895b82bb6 100644 (file)
--- a/src/journal-remote/journal-remote-write.h
+++ b/src/journal-remote/journal-remote-write.h
@@ -25,6 +25,8 @@
 
 #include "journal-file.h"
 
 
 #include "journal-file.h"
 

+typedef struct RemoteServer RemoteServer;
+

 struct iovec_wrapper {
         struct iovec *iovec;
         size_t size_bytes;
 struct iovec_wrapper {
         struct iovec *iovec;
         size_t size_bytes;


@@ -38,12 +40,25 @@ size_t iovw_size(struct iovec_wrapper *iovw);
 typedef struct Writer {
         JournalFile *journal;
         JournalMetrics metrics;
 typedef struct Writer {
         JournalFile *journal;
         JournalMetrics metrics;

+

         MMapCache *mmap;
         MMapCache *mmap;

+        RemoteServer *server;
+        char *hashmap_key;
+

         uint64_t seqnum;
         uint64_t seqnum;

+
+        int n_ref;

 } Writer;
 
 } Writer;
 

-int writer_init(Writer *s);
-int writer_close(Writer *s);
+Writer* writer_new(RemoteServer* server);
+Writer* writer_free(Writer *w);
+
+Writer* writer_ref(Writer *w);
+Writer* writer_unref(Writer *w);
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(Writer*, writer_unref);
+#define _cleanup_writer_unref_ _cleanup_(writer_unrefp)
+

 int writer_write(Writer *s,
                  struct iovec_wrapper *iovw,
                  dual_timestamp *ts,
 int writer_write(Writer *s,
                  struct iovec_wrapper *iovw,
                  dual_timestamp *ts,