3 files changed, 32 insertions, 14 deletions

diff --git a/src/libstrongswan/threading/thread.c b/src/libstrongswan/threading/thread.c
index 7a243e826..3d87e7fca 100644
--- a/src/libstrongswan/threading/thread.c
+++ b/src/libstrongswan/threading/thread.c
@@ -48,7 +48,7 @@ struct private_thread_t {
 	thread_t public;
 
 	/**
-	 * Human-readable ID of this thread.
+	 * Identificator of this thread (human-readable/thread ID).
 	 */
 	u_int id;
 
@@ -157,6 +157,23 @@ static void thread_destroy(private_thread_t *this)
 	free(this);
 }
 
+/**
+ * Determine the ID of the current thread
+ */
+static u_int get_thread_id()
+{
+	u_int id;
+
+#if defined(USE_THREAD_IDS) && defined(HAVE_GETTID)
+	id = gettid();
+#else
+	id_mutex->lock(id_mutex);
+	id = next_id++;
+	id_mutex->unlock(id_mutex);
+#endif
+	return id;
+}
+
 METHOD(thread_t, cancel, void,
 	private_thread_t *this)
 {
@@ -284,6 +301,8 @@ static void *thread_main(private_thread_t *this)
 {
 	void *res;
 
+	this->id = get_thread_id();
+
 	current_thread->set(current_thread, this);
 	pthread_cleanup_push((thread_cleanup_t)thread_cleanup, this);
 
@@ -315,9 +334,6 @@ thread_t *thread_create(thread_main_t main, void *arg)
 
 	this->main = main;
 	this->arg = arg;
-	id_mutex->lock(id_mutex);
-	this->id = next_id++;
-	id_mutex->unlock(id_mutex);
 
 	if (pthread_create(&this->thread_id, NULL, (void*)thread_main, this) != 0)
 	{
@@ -341,11 +357,7 @@ thread_t *thread_current()
 	if (!this)
 	{
 		this = thread_create_internal();
-
-		id_mutex->lock(id_mutex);
-		this->id = next_id++;
-		id_mutex->unlock(id_mutex);
-
+		this->id = get_thread_id();
 		current_thread->set(current_thread, (void*)this);
 	}
 	return &this->public;
@@ -475,12 +487,12 @@ void threads_init()
 
 	dummy1 = thread_value_create(NULL);
 
-	next_id = 1;
-	main_thread->id = 0;
+	next_id = 0;
 	main_thread->thread_id = pthread_self();
 	current_thread = thread_value_create(NULL);
 	current_thread->set(current_thread, (void*)main_thread);
 	id_mutex = mutex_create(MUTEX_TYPE_DEFAULT);
+	main_thread->id = get_thread_id();
 
 #ifndef HAVE_PTHREAD_CANCEL
 	{	/* install a signal handler for our custom SIG_CANCEL */
diff --git a/src/libstrongswan/threading/thread.h b/src/libstrongswan/threading/thread.h
index c24772839..35da24459 100644
--- a/src/libstrongswan/threading/thread.h
+++ b/src/libstrongswan/threading/thread.h
@@ -97,11 +97,13 @@ thread_t *thread_create(thread_main_t main, void *arg);
 thread_t *thread_current();
 
 /**
- * Get the human-readable ID of the current thread.
+ * Get the ID of the current thread.
  *
- * The IDs are assigned incrementally starting from 1.
+ * Depending on the build configuration thread IDs are either assigned
+ * incrementally starting from 1, or equal the value returned by an appropriate
+ * syscall (like gettid() or GetCurrentThreadId()), if available.
  *
- * @return				human-readable ID
+ * @return				ID of the current thread
  */
 u_int thread_current_id();
 
diff --git a/src/libstrongswan/threading/windows/thread.c b/src/libstrongswan/threading/windows/thread.c
index 610524722..798d75be7 100644
--- a/src/libstrongswan/threading/windows/thread.c
+++ b/src/libstrongswan/threading/windows/thread.c
@@ -516,7 +516,11 @@ thread_t *thread_current()
  */
 u_int thread_current_id()
 {
+#ifdef USE_THREAD_IDS
+	return get_current_thread()->id;
+#else
 	return get_current_thread()->tid;
+#endif
 }
 
 /**