From: Ian Silvester <iansilvester@fastmail.fm>
Date: Tue, 26 Jan 2016 17:12:14 +0000 (+0000)
Subject: Altered MACH kernel thread id modification to guarantee uniqueness
X-Git-Tag: v_3_0_25~159
X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=commitdiff_plain;h=237e27224819c1c9e121296816a37e2cd3936f60;p=privoxy.git

Altered MACH kernel thread id modification to guarantee uniqueness
---

diff --git a/errlog.c b/errlog.c
index 55040e15..6daf8187 100644
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.123 2016/01/21 13:02:10 diem Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.124 2016/01/21 20:53:01 diem Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -422,11 +422,10 @@ static long get_thread_id(void)
 #ifdef __MACH__
    /*
     * Mac OSX (and perhaps other Mach instances) doesn't have a unique
-    * value at the lowest order 4 bytes of pthread_self()'s return value, a pthread_t.
-    * pthread_t is supposed to be opaque... however it's fairly random.
-    * The following will address these two issues to make it mostly presentable.
+    * value at the lowest order 4 bytes of pthread_self()'s return value, a pthread_t,
+    * so trim the three lowest-order bytes from the value (16^3).
     */
-   this_thread = labs(this_thread % 1000);
+   this_thread = this_thread / 4096;
 #endif /* def __MACH__ */
 #elif defined(_WIN32)
    this_thread = GetCurrentThreadId();