From: Nikolay Denev <ndenev@gmail.com>
Date: Mon, 2 Jul 2012 09:47:41 +0000 (+0200)
Subject: Fix SCSetThreadName() macros in threads.h Add FreeBSD thread naming implementation.
X-Git-Tag: suricata-1.3~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50aba06530215b12cdaa6745bb5dc1c84ac9a1d5;p=thirdparty%2Fsuricata.git

Fix SCSetThreadName() macros in threads.h Add FreeBSD thread naming implementation.
---

diff --git a/src/threads.h b/src/threads.h
index c4e9bba549..1b3ef04a29 100644
--- a/src/threads.h
+++ b/src/threads.h
@@ -467,18 +467,26 @@ extern __thread uint64_t spin_lock_cnt;
  * OS specific macro's for setting the thread name. "top" can display
  * this name.
  */
-#ifndef PR_SET_NAME /*PR_SET_NAME */
-#define SCSetThreadName(n)
-#elif defined OS_FREEBSD || __OpenBSD__ /* FreeBSD or OpenBSD */
+#if defined OS_FREEBSD /* FreeBSD */
 /** \todo Add implementation for FreeBSD */
-#define SCSetThreadName(n)
-#elif OS_WIN32 /* Windows */
+#define SCSetThreadName(n) ({ \
+    char tname[16] = ""; \
+    if (strlen(n) > 16) \
+        SCLogDebug("Thread name is too long, truncating it..."); \
+    strlcpy(tname, n, 16); \
+    pthread_set_name_np(pthread_self(), tname); \
+    0; \
+})
+#elif defined __OpenBSD__ /* OpenBSD */
+/** \todo Add implementation for OpenBSD */
+#define SCSetThreadName(n) (0)
+#elif defined OS_WIN32 /* Windows */
 /** \todo Add implementation for Windows */
-#define SCSetThreadName(n)
-#elif OS_DARWIN /* Mac OS X */
+#define SCSetThreadName(n) (0)
+#elif defined OS_DARWIN /* Mac OS X */
 /** \todo Add implementation for MacOS */
-#define SCSetThreadName(n)
-#else /* Linux */
+#define SCSetThreadName(n) (0)
+#elif defined PR_SET_NAME /*PR_SET_NAME */
 /**
  * \brief Set the threads name
  */
@@ -492,6 +500,8 @@ extern __thread uint64_t spin_lock_cnt;
         SCLogDebug("Error setting thread name \"%s\": %s", tname, strerror(errno)); \
     ret; \
 })
+#else
+#define SCSetThreadName(n) (0)
 #endif