]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #473 in SNORT/snort3 from ~JOCORNET/snort3:prevent_profiler_reentr...
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 17 May 2016 12:51:09 +0000 (08:51 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 17 May 2016 12:51:09 +0000 (08:51 -0400)
commit83e338fa269d9e35f0651d80aa2c4488328754c1
tree152b42be0402cb88fc98cddd3f11313f0abe3ff3
parentc244baacd58138264de86928a775415ce3e01085
Merge pull request #473 in SNORT/snort3 from ~JOCORNET/snort3:prevent_profiler_reentrance to master

Squashed commit of the following:

commit 82c885365cb68fb0ca4fc920176d790c55f4ef35
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon May 9 17:25:07 2016 -0400

    fixed formatting

commit f25f307aca52a7d48f27ef03740cb68e766fc746
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon May 9 16:09:04 2016 -0400

    removed unused test case

commit a86c9f19a7193375e9b029154db9e0d69d840f3b
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Mon May 9 16:06:49 2016 -0400

    added refcount to profiler context to prevent reentrance
src/detection/detection_options.cc
src/profiler/rule_profiler.cc
src/profiler/rule_profiler_defs.h
src/profiler/time_profiler.cc
src/profiler/time_profiler_defs.h