Author: mturk
Date: Tue Dec 15 10:14:28 2009
New Revision: 890738
URL: http://svn.apache.org/viewvc?rev=890738&view=rev
Log:
Use better thread id logic. Use 4/8 byte alignment
Modified:
tomcat/jk/trunk/native/common/jk_util.c
Modified: tomcat/jk/trunk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_util.c?rev=890738&r1=890737&r2=890738&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_util.c (original)
+++ tomcat/jk/trunk/native/common/jk_util.c Tue Dec 15 10:14:28 2009
@@ -2125,13 +2125,16 @@
pthread_getunique_np(&(u.tid), &tid);
return ((jk_uint32_t)(tid.intId.lo & 0xFFFFFFFF));
#else
- switch(sizeof(pthread_t)) {
- case sizeof(jk_uint32_t):
- return *(jk_uint32_t *)&u.tid;
- case sizeof(jk_uint64_t):
- return (*(jk_uint64_t *)&u.tid) & 0xFFFFFFFF;
- default:
- return 0;
+ switch (sizeof(pthread_t)) {
+ case sizeof(jk_uint32_t):
+ return ((jk_uint32_t)u.tid >> 2);
+ break;
+ case sizeof(jk_uint64_t):
+ return (jk_uint32_t)((((jk_uint64_t)u.tid) >> 3) & 0xFFFFFFFF);
+ break;
+ default:
+ return 0;
+ break;
}
#endif /* AS400 */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
