From owner-svn-src-stable-10@freebsd.org Sat Jan 9 17:05:02 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06DA8A68641; Sat, 9 Jan 2016 17:05:02 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BF19C10C8; Sat, 9 Jan 2016 17:05:01 +0000 (UTC) (envelope-from dchagin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u09H50Vv051371; Sat, 9 Jan 2016 17:05:00 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u09H50fO051369; Sat, 9 Jan 2016 17:05:00 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201601091705.u09H50fO051369@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Sat, 9 Jan 2016 17:05:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r293560 - stable/10/sys/compat/linux X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jan 2016 17:05:02 -0000 Author: dchagin Date: Sat Jan 9 17:05:00 2016 New Revision: 293560 URL: https://svnweb.freebsd.org/changeset/base/293560 Log: MFC r283456: Improve ktr(9) records in thread managment code. Modified: stable/10/sys/compat/linux/linux_emul.c stable/10/sys/compat/linux/linux_fork.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/compat/linux/linux_emul.c ============================================================================== --- stable/10/sys/compat/linux/linux_emul.c Sat Jan 9 17:03:53 2016 (r293559) +++ stable/10/sys/compat/linux/linux_emul.c Sat Jan 9 17:05:00 2016 (r293560) @@ -147,6 +147,9 @@ linux_proc_exit(void *arg __unused, stru if (__predict_false(SV_CURPROC_ABI() != SV_ABI_LINUX)) return; + LINUX_CTR3(proc_exit, "thread(%d) proc(%d) p %p", + td->td_tid, p->p_pid, p); + pem = pem_find(p); if (pem == NULL) return; @@ -249,7 +252,7 @@ linux_thread_dtor(void *arg __unused, st return; td->td_emuldata = NULL; - LINUX_CTR1(exit, "thread dtor(%d)", em->em_tid); + LINUX_CTR1(thread_dtor, "thread(%d)", em->em_tid); free(em, M_TEMP); } @@ -271,8 +274,8 @@ linux_schedtail(struct thread *td) if (child_set_tid != NULL) { error = copyout(&em->em_tid, child_set_tid, sizeof(em->em_tid)); - LINUX_CTR4(clone, "schedtail(%d) %p stored %d error %d", + LINUX_CTR4(schedtail, "thread(%d) %p stored %d error %d", td->td_tid, child_set_tid, em->em_tid, error); } else - LINUX_CTR1(clone, "schedtail(%d)", em->em_tid); + LINUX_CTR1(schedtail, "thread(%d)", em->em_tid); } Modified: stable/10/sys/compat/linux/linux_fork.c ============================================================================== --- stable/10/sys/compat/linux/linux_fork.c Sat Jan 9 17:03:53 2016 (r293559) +++ stable/10/sys/compat/linux/linux_fork.c Sat Jan 9 17:05:00 2016 (r293560) @@ -275,7 +275,7 @@ linux_clone_thread(struct thread *td, st } #endif - LINUX_CTR4(clone, "thread(%d) flags %x ptid %p ctid %p", + LINUX_CTR4(clone_thread, "thread(%d) flags %x ptid %p ctid %p", td->td_tid, (unsigned)args->flags, args->parent_tidptr, args->child_tidptr); @@ -352,7 +352,7 @@ linux_clone_thread(struct thread *td, st (int)newtd->td_tid, args->stack); #endif - LINUX_CTR2(clone, "thread(%d) successful clone to %d", + LINUX_CTR2(clone_thread, "thread(%d) successful clone to %d", td->td_tid, newtd->td_tid); if (args->flags & LINUX_CLONE_PARENT_SETTID) { @@ -435,7 +435,7 @@ linux_thread_detach(struct thread *td) em = em_find(td); KASSERT(em != NULL, ("thread_detach: emuldata not found.\n")); - LINUX_CTR1(exit, "thread detach(%d)", em->em_tid); + LINUX_CTR1(thread_detach, "thread(%d)", em->em_tid); release_futexes(td, em); @@ -443,7 +443,7 @@ linux_thread_detach(struct thread *td) if (child_clear_tid != NULL) { - LINUX_CTR2(exit, "thread detach(%d) %p", + LINUX_CTR2(thread_detach, "thread(%d) %p", em->em_tid, child_clear_tid); error = suword32(child_clear_tid, 0);