profiling: fix app-layer profiling and csv output

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 37c97bda79f0652870b65e7ded24bbecc6df05a8..e61e3db701567a1a2b336a6aa47d227cfb056d0d 100644 (file)
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -1030,6 +1030,7 @@ static int ReassembleUpdateAppLayer (ThreadVars *tv,
     int r = AppLayerHandleTCPData(tv, ra_ctx, p, p->flow, ssn, stream,
             (uint8_t *)mydata, mydata_len,
             StreamGetAppLayerFlags(ssn, stream, p, dir));
+    AppLayerProfilingStore(ra_ctx->app_tctx, p);
 
     /* see if we can update the progress */
     if (r == 0 && mydata_len > 0 &&

diff --git a/src/util-profiling.c b/src/util-profiling.c
index 871ab7a4cea0d5e97dfecdd6910b5f08f0a18189..cc0e095cccc96e5cff26c0afd696f7c085835553 100644 (file)
--- a/src/util-profiling.c
+++ b/src/util-profiling.c
@@ -1182,9 +1182,6 @@ void SCProfilingAddPacket(Packet *p)
     pthread_mutex_lock(&packet_profile_lock);
     {
 
-        if (profiling_packets_csv_enabled)
-            SCProfilingPrintPacketProfile(p);
-
         if (PKT_IS_IPV4(p)) {
             SCProfilePacketData *pd = &packet_profile_data4[p->proto];
 
@@ -1259,6 +1256,9 @@ void SCProfilingAddPacket(Packet *p)
         }
 
         SCProfilingUpdatePrefilterRecords(p);
+        if (profiling_packets_csv_enabled)
+            SCProfilingPrintPacketProfile(p);
+
     }
     pthread_mutex_unlock(&packet_profile_lock);
 }