svn commit: r293477 - in stable/10/sys: amd64/linux32 i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Sat Jan  9 14:31:03 2016
New Revision: 293477
URL: https://svnweb.freebsd.org/changeset/base/293477

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

Modified:
  stable/10/sys/amd64/linux32/linux.h
  stable/10/sys/i386/linux/linux.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/linux32/linux.h
==============================================================================
--- stable/10/sys/amd64/linux32/linux.h	Sat Jan  9 14:24:11 2016	(r293476)
+++ stable/10/sys/amd64/linux32/linux.h	Sat Jan  9 14:31:03 2016	(r293477)
@@ -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: stable/10/sys/i386/linux/linux.h
==============================================================================
--- stable/10/sys/i386/linux/linux.h	Sat Jan  9 14:24:11 2016	(r293476)
+++ stable/10/sys/i386/linux/linux.h	Sat Jan  9 14:31:03 2016	(r293477)
@@ -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