X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fsd-journal.h;h=9978ca9ac0dd2f500fbae691c6e87b843709d72b;hp=13b5f891d71503d8cc60526f973c9c87386e7ac6;hb=8f9b6cd9eb049b00b1e9e669d0e35aa415dc8fb0;hpb=c2373f848dddcc1827cf715c5ef778dc8d475761

diff --git a/src/journal/sd-journal.h b/src/journal/sd-journal.h
index 13b5f891d..9978ca9ac 100644
--- a/src/journal/sd-journal.h
+++ b/src/journal/sd-journal.h
@@ -35,6 +35,8 @@
  *   - implement stdout gateway
  *   - extend hash table/bisect table as we go
  *   - accelerate looking for "all hostnames" and suchlike.
+ *   - throttling
+ *   - enforce limit on open journal files in journald and journalctl
  */
 
 typedef struct sd_journal sd_journal;
@@ -47,30 +49,57 @@ int sd_journal_next(sd_journal *j);
 
 int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret);
 int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret);
-int sd_journal_get_field(sd_journal *j, const char *field, const void **data, size_t *l);
-int sd_journal_iterate_fields(sd_journal *j, const void **data, size_t *l);
+int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *l);
+int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *l);
+void sd_journal_start_data(sd_journal *j);
 
-int sd_journal_add_match(sd_journal *j, const char *field, const void *data, size_t size);
+int sd_journal_add_match(sd_journal *j, const void *data, size_t size);
 void sd_journal_flush_matches(sd_journal *j);
 
 int sd_journal_seek_head(sd_journal *j);
 int sd_journal_seek_tail(sd_journal *j);
 
-int sd_journal_seek_monotonic_usec(sd_journal *j, uint64_t usec);
-int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec);
+int sd_journal_seek_monotonic_usec(sd_journal *j, uint64_t usec);  /* missing */
+int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec);   /* missing */
 
 int sd_journal_get_cursor(sd_journal *j, char **cursor);
-int sd_journal_set_cursor(sd_journal *j, const char *cursor);
+int sd_journal_set_cursor(sd_journal *j, const char *cursor);      /* missing */
 
-int sd_journal_get_fd(sd_journal *j);
+int sd_journal_unique_seek(sd_journal *j, const char *field);      /* missing */
+int sd_journal_unique_enumerate(sd_journal *j, const void **data, size_t *l); /* missing */
 
-#define SD_JOURNAL_FOREACH(j)                   \
-        while (sd_journal_next(j) > 0)
+int sd_journal_get_fd(sd_journal *j);                              /* missing */
 
-#define SD_JOURNAL_FOREACH_BACKWARDS(j)         \
-        while (sd_journal_previous(j) > 0)
+enum {
+        SD_JOURNAL_NOP,
+        SD_JOURNAL_APPEND,
+        SD_JOURNAL_DROP
+};
 
-#define SD_JOURNAL_FOREACH_FIELD(j, data, l)                            \
-        while (sd_journal_iterate_fields((j), &(data), &(l)) > 0)
+int sd_journal_process(sd_journal *j);                             /* missing */
+
+#define SD_JOURNAL_FOREACH_BEGIN(j)             \
+        if (sd_journal_seek_head(j) > 0) do {
+
+#define SD_JOURNAL_FOREACH_END(j)               \
+        } while (sd_journal_next(j) > 0)
+
+#define SD_JOURNAL_FOREACH_CONTINUE(j)          \
+        do {
+
+#define SD_JOURNAL_FOREACH_BACKWARDS_BEGIN(j)   \
+        if (sd_journal_seek_tail(j) > 0) do {
+
+#define SD_JOURNAL_FOREACH_BACKWARDS_END(j)     \
+        } while (sd_journal_previous(j) > 0)
+
+#define SD_JOURNAL_FOREACH_BACKWARDS_CONTINUE(j) \
+        do {
+
+#define SD_JOURNAL_FOREACH_DATA(j, data, l)                             \
+        for (sd_journal_start_data(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; )
+
+#define SD_JOURNAL_FOREACH_UNIQUE(j, data, l)                      \
+        while (sd_journal_enumerate_unique_data((j), &(data), &(l)) > 0)
 
 #endif