Changeset 32ee9b2 for lib/format_pcap.c

Timestamp:

06/26/18 18:05:08 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance

Children:

95ca714

Parents:

528a27c

Message:

Add new trace_flush_output() to public API

Can be used to force a libtrace output to dump any buffered output
to disk immediately.

Note that if the file is compressed or the output trace format
requires a trailer, the flushed file will still not be properly
readable afterwards as this will not result in any trailers
being written. You'll still have to close the file for that.

Mainly this is useful for ensuring that output file sizes grow
over time in situations where the amount of output is relatively
small, rather than staying stuck at 0 bytes until we either reach
1MB of output or the file is closed. For instance, you could have
a timer that calls trace_flush_output() every 30 seconds so that
the output file size will grow if any packets were written in the
last 30 seconds.

File:

• lib/format_pcap.c (modified) (3 diffs)

lib/format_pcap.c

@@ -583 +583 @@
 }
 
+static int pcap_flush_output(libtrace_out_t *libtrace) {
+        return pcap_dump_flush(OUTPUT.trace.dump);
+}
+
 static int pcapint_write_packet(libtrace_out_t *libtrace,
                 libtrace_packet_t *packet) 
@@ -779 +783 @@
         NULL,                           /* fin_packet */
         pcap_write_packet,              /* write_packet */
+        pcap_flush_output,              /* flush_output */
         pcap_get_link_type,             /* get_link_type */
         pcapint_get_direction,          /* get_direction */
@@ -823 +828 @@
         NULL,                           /* fin_packet */
         pcapint_write_packet,           /* write_packet */
+        NULL,                           /* flush_output */
         pcap_get_link_type,             /* get_link_type */
         pcapint_get_direction,          /* get_direction */