From: Nirmala Venkata Subbaiah -X (nirmvenk - XORIANT CORPORATION at Cisco) <nirmvenk@cisco.com>
Date: Fri, 24 Jan 2025 21:49:37 +0000 (+0000)
Subject: Pull request #4583: main: Add thread_id in instance_mapping output file
X-Git-Tag: 3.6.3.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1496e2d571b5b6532e61dc2068af70cdc39e692;p=thirdparty%2Fsnort3.git

Pull request #4583: main: Add thread_id in instance_mapping output file

Merge in SNORT/snort3 from ~NIRMVENK/snort3:instance_thread_id_master to master

Squashed commit of the following:

commit 33420792595efbdfb901fb9cc2a20a2f49b4afae
Author: Nirmala Subbaiah <nirmvenk@cisco.com>
Date:   Wed Jan 22 12:28:03 2025 -0500

    main: Add thread_id in instance_mapping output file
---

diff --git a/src/main/thread.cc b/src/main/thread.cc
index 4ff0e3038..3998575c5 100644
--- a/src/main/thread.cc
+++ b/src/main/thread.cc
@@ -69,9 +69,10 @@ void populate_instance_maps()
     std::ofstream inst_file;
     inst_file.open(path);
 
-    inst_file << "pid, snort process number, instance_id, relative_instance_id, max_instances\n";
+    inst_file << "pid, snort process number, thread_id, instance_id, relative_instance_id, max_instances\n";
     inst_file << getpid() << ", ";
     inst_file << Snort::get_process_id() << ", ";
+    inst_file << ThreadConfig::get_instance_tid(instance_id) << ", ";
     inst_file << instance_id << ", ";
     inst_file << get_relative_instance_number() << ", ";
     inst_file << ThreadConfig::get_instance_max();