thread names

Author: sy-c

src/ConsumerDataProcessor.cxx

@@ -15,6 +15,9 @@
 #include <thread>
 
 #include "Consumer.h"
+#include "ReadoutUtils.h"
+
+#define CONSUMER_THREAD_NAME "processor"
 
 const bool debug = false;
 
@@ -78,6 +81,7 @@ class processThread
   // the loop which runs in a separate thread and calls fProcess() for each block in input fifo, until stop() is called
   void loop()
   {
+    setThreadName(CONSUMER_THREAD_NAME "-loop");
     // printf("starting thread %d input=%p
     // output=%p\n",threadId,inputFifo.get(),outputFifo.get());
     // printf("processing thread %d starting\n",threadId);
@@ -305,7 +309,7 @@ class ConsumerDataProcessor : public Consumer
   // collector thread loop: handle the output of processing threads
   void loopOutput(void)
   {
-
+    setThreadName(CONSUMER_THREAD_NAME "-out");
     bool isActive = 0;
 
     // lambda function that pushes forward next available bage

src/ConsumerDataSampling.cxx

@@ -18,6 +18,7 @@
 #include <fairmq/FairMQParts.h>
 #include <fairmq/FairMQTransportFactory.h>
 #include <thread>
+#include "ReadoutUtils.h"
 
 class ConsumerDataSampling : public Consumer
 {
@@ -143,7 +144,10 @@ class ConsumerDataSampling : public Consumer
   }
 
  private:
-  void runDevice() { sender.RunStateMachine(); }
+  void runDevice() {
+    setThreadName("fmq-run-ds");
+    sender.RunStateMachine();
+  }
 };
 
 std::unique_ptr<Consumer> getUniqueConsumerDataSampling(ConfigFile& cfg, std::string cfgEntryPoint) { return std::make_unique<ConsumerDataSampling>(cfg, cfgEntryPoint); }

src/ConsumerFMQ.cxx

@@ -17,6 +17,7 @@
 #include <fairmq/FairMQMessage.h>
 #include <fairmq/FairMQTransportFactory.h>
 #include <thread>
+#include "ReadoutUtils.h"
 
 class FMQSender : public FairMQDevice
 {
@@ -142,7 +143,10 @@ class ConsumerFMQ : public Consumer
   }
 
  private:
-  void runDevice() { sender.RunStateMachine(); }
+  void runDevice() {
+      setThreadName("fmq-run-ds");
+      sender.RunStateMachine();
+  }
 };
 
 std::unique_ptr<Consumer> getUniqueConsumerFMQ(ConfigFile& cfg, std::string cfgEntryPoint) { return std::make_unique<ConsumerFMQ>(cfg, cfgEntryPoint); }

src/ConsumerStats.cxx

@@ -221,6 +221,7 @@ class ConsumerStats : public Consumer
   bool periodicUpdateThreadShutdown;                 // flag to stop periodicUpdateThread
   void periodicUpdate()
   {
+    setThreadName("consumer-stats");
     periodicUpdateThreadShutdown = 0;
 
     // periodic update

src/DataBlockAggregator.cxx

@@ -41,6 +41,13 @@ Thread::CallbackResult DataBlockAggregator::threadCallback(void* arg)
     return Thread::CallbackResult::Error;
   }
 
+  if (!dPtr->isThreadNamed) {
+    #ifdef _GNU_SOURCE
+      pthread_setname_np(pthread_self(), "aggregator");
+    #endif
+    dPtr->isThreadNamed = 1;
+  }
+
   if (dPtr->output->isFull()) {
     return Thread::CallbackResult::Idle;
   }

src/DataBlockAggregator.h

@@ -115,6 +115,7 @@ class DataBlockAggregator
   void reset(); // reset all internal buffers, counters and states
 
  private:
+  bool isThreadNamed = 0; // flag to set once thread name
   std::vector<std::shared_ptr<AliceO2::Common::Fifo<DataBlockContainerReference>>> inputs;
   AliceO2::Common::Fifo<DataSetReference>* output; // todo: unique_ptr
 

src/ReadoutStats.cxx

@@ -20,6 +20,7 @@
 #include "ReadoutStats.h"
 
 #include "readoutInfoLogger.h"
+#include "ReadoutUtils.h"
 #include "DataBlock.h"
 #include <string.h>
 #include <Common/Timer.h>
@@ -187,6 +188,8 @@ int ReadoutStats::stopPublish() {
 
 void ReadoutStats::threadLoop() {
 
+  setThreadName("readout-stats");
+
   // loop period in microseconds
   unsigned int loopPeriod = (unsigned int) 100000;
   unsigned long long t0 = 0;

src/SocketRx.cxx

@@ -88,6 +88,10 @@ SocketRx::~SocketRx(){
 }
 
 void SocketRx::run() {
+  #ifdef _GNU_SOURCE
+    pthread_setname_np(pthread_self(), "socket-rx");
+  #endif
+
   int sockfd=-1;
   const char *sType="";
 

src/SocketTx.cxx

@@ -56,6 +56,9 @@ SocketTx::~SocketTx()
 
 void SocketTx::run()
 {
+  #ifdef _GNU_SOURCE
+    pthread_setname_np(pthread_self(), "socket-tx");
+  #endif
 
   // connect remote server
 

src/ZmqClient.cxx

@@ -115,6 +115,9 @@ void ZmqClient::setPause(int pause)
 
 void ZmqClient::run()
 {
+  #ifdef _GNU_SOURCE
+    pthread_setname_np(pthread_self(), "zmq-client");
+  #endif
   for (; !shutdownRequest;) {
     int linerr = 0, zmqerr = 0;
     for (;;) {