Date: Wed, 12 Jul 2006 14:03:35 GMT From: Roman Divacky <rdivacky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 101381 for review Message-ID: <200607121403.k6CE3Z7Q040943@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101381 Change 101381 by rdivacky@rdivacky_witten on 2006/07/12 14:02:49 Make linux_futex.c compilable with -DDEBUG. Similar changes were made to linux_machdep.c but I cannot commit them because I have other changes pending there. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#3 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#3 (text+ko) ==== @@ -107,9 +107,9 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT %d.%d: val = %d, uaddr = %p, " + printf("FUTEX_WAIT %d: val = %d, uaddr = %p, " "*uaddr = %d, timeout = %d.%09ld\n", - l->l_proc->p_pid, l->l_lid, args->val, + td->td_proc->p_pid, args->val, args->uaddr, val, timeout.tv_sec, timeout.tv_nsec); #endif tv.tv_usec = timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000; @@ -121,9 +121,8 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT %d.%d: uaddr = %p, " - "ret = %d\n", l->l_proc->p_pid, l->l_lid, - args->uaddr, ret); + printf("FUTEX_WAIT %d: uaddr = %p, " + "ret = %d\n", td->td_proc->p_pid, args->uaddr, ret); #endif switch (ret) { @@ -136,8 +135,8 @@ case 0: /* FUTEX_WAKE received */ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAIT %d.%d: uaddr = %p, got FUTEX_WAKE\n", - l->l_proc->p_pid, l->l_lid, args->uaddr); + printf("FUTEX_WAIT %d: uaddr = %p, got FUTEX_WAKE\n", + td->td_proc->p_pid, args->uaddr); #endif return 0; break; @@ -160,9 +159,8 @@ */ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX_WAKE %d.%d: uaddr = %p, val = %d\n", - l->l_proc->p_pid, l->l_lid, - args->uaddr, args->val); + printf("FUTEX_WAKE %d: uaddr = %p, val = %d\n", + td->td_proc->p_pid, args->uaddr, args->val); #endif f = futex_get(args->uaddr); td->td_retval[0] = futex_wake(f, args->val, NULL); @@ -256,8 +254,8 @@ #ifdef DEBUG if (ldebug(sys_futex)) - printf("FUTEX --> %d.%d tlseep timeout = %ld\n", l->l_proc->p_pid, - l->l_lid, timeout); + printf("FUTEX --> %d tlseep timeout = %ld\n", td->td_proc->p_pid, + timeout); #endif ret = tsleep(wp, PCATCH|PZERO, "linuxfutex", timeout);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607121403.k6CE3Z7Q040943>