profiling: fix app-layer profiling and csv output

pull/2924/head
Victor Julien 8 years ago
parent 62b8431fdd
commit e7428b321d

@ -1030,6 +1030,7 @@ static int ReassembleUpdateAppLayer (ThreadVars *tv,
int r = AppLayerHandleTCPData(tv, ra_ctx, p, p->flow, ssn, stream, int r = AppLayerHandleTCPData(tv, ra_ctx, p, p->flow, ssn, stream,
(uint8_t *)mydata, mydata_len, (uint8_t *)mydata, mydata_len,
StreamGetAppLayerFlags(ssn, stream, p, dir)); StreamGetAppLayerFlags(ssn, stream, p, dir));
AppLayerProfilingStore(ra_ctx->app_tctx, p);
/* see if we can update the progress */ /* see if we can update the progress */
if (r == 0 && mydata_len > 0 && if (r == 0 && mydata_len > 0 &&

@ -1182,9 +1182,6 @@ void SCProfilingAddPacket(Packet *p)
pthread_mutex_lock(&packet_profile_lock); pthread_mutex_lock(&packet_profile_lock);
{ {
if (profiling_packets_csv_enabled)
SCProfilingPrintPacketProfile(p);
if (PKT_IS_IPV4(p)) { if (PKT_IS_IPV4(p)) {
SCProfilePacketData *pd = &packet_profile_data4[p->proto]; SCProfilePacketData *pd = &packet_profile_data4[p->proto];
@ -1259,6 +1256,9 @@ void SCProfilingAddPacket(Packet *p)
} }
SCProfilingUpdatePrefilterRecords(p); SCProfilingUpdatePrefilterRecords(p);
if (profiling_packets_csv_enabled)
SCProfilingPrintPacketProfile(p);
} }
pthread_mutex_unlock(&packet_profile_lock); pthread_mutex_unlock(&packet_profile_lock);
} }

Loading…
Cancel
Save