Changeset 3198df4

Timestamp:

03/13/07 15:39:44 (14 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

a1b899f

Parents:

509bca2

Message:

RT_CLOSE is now sent at the pause stage, rather than at the finish stage when you no longer have an fd left to send it with.

File:

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

lib/format_rt.c

@@ -248 +248 @@
 
 static int rt_pause_input(libtrace_t *libtrace) {
-        close(RT_INFO->input_fd);
-        return 0;
-}
-
-static int rt_fin_input(libtrace_t *libtrace) {
         rt_header_t close_msg;
 
@@ -265 +260 @@
         
         }
+
+        close(RT_INFO->input_fd);
+        return 0;
+}
+
+static int rt_fin_input(libtrace_t *libtrace) {
         if (RT_INFO->dummy_duck)
                 trace_destroy_dead(RT_INFO->dummy_duck);
@@ -279 +280 @@
         if (RT_INFO->dummy_linux)
                 trace_destroy_dead(RT_INFO->dummy_linux);
-
-        close(RT_INFO->input_fd);
         free(libtrace->format_data);
         return 0;