svn commit: r247168 - in user/dchagin/lemul/sys: amd64/linux32 i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Sat Feb 23 07:51:33 2013
New Revision: 247168
URL: http://svnweb.freebsd.org/changeset/base/247168

Log:
      In preparation for switching linuxulator to the use the native 1:1
      threads print out thread id in the debug messages.

Modified:
  user/dchagin/lemul/sys/amd64/linux32/linux.h
  user/dchagin/lemul/sys/i386/linux/linux.h

Modified: user/dchagin/lemul/sys/amd64/linux32/linux.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux.h	Sat Feb 23 04:51:20 2013	(r247167)
+++ user/dchagin/lemul/sys/amd64/linux32/linux.h	Sat Feb 23 07:51:33 2013	(r247168)
@@ -40,8 +40,10 @@
  */
 extern u_char linux_debug_map[];
 #define	ldebug(name)	isclr(linux_debug_map, LINUX_SYS_linux_ ## name)
-#define	ARGS(nm, fmt)	"linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid
-#define	LMSG(fmt)	"linux(%ld): "fmt"\n", (long)td->td_proc->p_pid
+#define	ARGS(nm, fmt)	"linux(%ld (%ld)): "#nm"("fmt")\n",			\
+			(long)td->td_proc->p_pid, (long)td->td_tid
+#define	LMSG(fmt)	"linux(%ld (%ld)): "fmt"\n",				\
+			(long)td->td_proc->p_pid, (long)td->td_tid
 #define	LINUX_DTRACE	linuxulator32
 
 #ifdef MALLOC_DECLARE

Modified: user/dchagin/lemul/sys/i386/linux/linux.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux.h	Sat Feb 23 04:51:20 2013	(r247167)
+++ user/dchagin/lemul/sys/i386/linux/linux.h	Sat Feb 23 07:51:33 2013	(r247168)
@@ -40,8 +40,10 @@
  */
 extern u_char linux_debug_map[];
 #define	ldebug(name)	isclr(linux_debug_map, LINUX_SYS_linux_ ## name)
-#define	ARGS(nm, fmt)	"linux(%ld): "#nm"("fmt")\n", (long)td->td_proc->p_pid
-#define	LMSG(fmt)	"linux(%ld): "fmt"\n", (long)td->td_proc->p_pid
+#define	ARGS(nm, fmt)	"linux(%ld (%ld)): "#nm"("fmt")\n",			\
+			(long)td->td_proc->p_pid, (long)td->td_tid
+#define	LMSG(fmt)	"linux(%ld (%ld)): "fmt"\n",				\
+			(long)td->td_proc->p_pid, (long)td->td_tid
 #define	LINUX_DTRACE	linuxulator
 
 #ifdef MALLOC_DECLARE