Date: Sun, 28 Mar 2004 00:55:49 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 49832 for review Message-ID: <200403280855.i2S8tnX7030744@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49832 Change 49832 by marcel@marcel_nfs on 2004/03/28 00:55:18 IFC @49828 Affected files ... .. //depot/projects/gdb/bin/ps/ps.c#5 integrate .. //depot/projects/gdb/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/gdb/sys/rpc/rpcclnt.c#5 integrate .. //depot/projects/gdb/sys/sys/proc.h#7 integrate Differences ... ==== //depot/projects/gdb/bin/ps/ps.c#5 (text+ko) ==== @@ -51,7 +51,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.71 2004/03/27 22:14:42 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.72 2004/03/28 03:00:56 gad Exp $"); #include <sys/param.h> #include <sys/user.h> @@ -497,7 +497,7 @@ */ nentries = -1; kp = kvm_getprocs(kd, what, flag, &nentries); - if ((kp == 0 && nentries != 0) || nentries < 0) + if ((kp == 0 && nentries > 0) || (kp != 0 && nentries < 0)) errx(1, "%s", kvm_geterr(kd)); nkept = 0; if (nentries > 0) { ==== //depot/projects/gdb/sys/nfsclient/nfs_socket.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.104 2004/03/25 21:48:08 rees Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.105 2004/03/28 05:55:27 kan Exp $"); /* * Socket operations for use by nfs @@ -1188,6 +1188,7 @@ } } splx(s); + callout_reset(&nfs_callout, nfs_ticks, nfs_timer, NULL); } /* ==== //depot/projects/gdb/sys/rpc/rpcclnt.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.8 2004/03/25 21:48:09 rees Exp $ */ +/* $FreeBSD: src/sys/rpc/rpcclnt.c,v 1.9 2004/03/28 05:55:27 kan Exp $ */ /* $Id: rpcclnt.c,v 1.9 2003/11/05 14:59:03 rees Exp $ */ /* @@ -1478,6 +1478,8 @@ #ifdef __OpenBSD__ timeout_add(rpcclnt_timer, to, rpcclnt_ticks); +#else + callout_reset(&rpcclnt_callout, rpcclnt_ticks, rpcclnt_timer, NULL); #endif } ==== //depot/projects/gdb/sys/sys/proc.h#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.370 2004/03/27 14:30:43 mtm Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.371 2004/03/28 04:17:36 bde Exp $ */ #ifndef _SYS_PROC_H_ @@ -341,7 +341,8 @@ struct mdthread td_md; /* (k) Any machine-dependent fields. */ struct td_sched *td_sched; /* (*) Scheduler-specific data. */ }; -/* flags kept in td_flags */ + +/* Flags kept in td_flags: */ #define TDF_INPANIC 0x000002 /* Caused a panic, let it drive crashdump. */ #define TDF_CAN_UNBIND 0x000004 /* Only temporarily bound. */ #define TDF_SINTR 0x000008 /* Sleep is interruptible. */ @@ -352,16 +353,16 @@ #define TDF_ASTPENDING 0x000800 /* Thread has some asynchronous events. */ #define TDF_TIMOFAIL 0x001000 /* Timeout from sleep after we were awake. */ #define TDF_INTERRUPT 0x002000 /* Thread is marked as interrupted. */ -#define TDF_USTATCLOCK 0x004000 /* Stat clock hits in userland. */ +#define TDF_USTATCLOCK 0x004000 /* Finish user statclock hit at next AST. */ #define TDF_OWEUPC 0x008000 /* Owe thread an addupc() call at next AST. */ #define TDF_NEEDRESCHED 0x010000 /* Thread needs to yield. */ #define TDF_NEEDSIGCHK 0x020000 /* Thread may need signal delivery. */ #define TDF_SA 0x040000 /* A scheduler activation based thread. */ -#define TDF_UMTXWAKEUP 0x080000 /* Libthr thread must not sleep on a umtx. */ -#define TDF_THRWAKEUP 0x100000 /* Libthr thread must not suspend itself. */ +#define TDF_UMTXWAKEUP 0x080000 /* Libthr thread must not sleep on a umtx. */ +#define TDF_THRWAKEUP 0x100000 /* Libthr thread must not suspend itself. */ #define TDF_DEADLKTREAT 0x800000 /* Lock aquisition - deadlock treatment. */ -/* "private" flags kept in td_pflags */ +/* "Private" flags kept in td_pflags: */ #define TDP_OLDMASK 0x0001 /* Need to restore mask after suspend. */ #define TDP_INKTR 0x0002 /* Thread is currently in KTR code. */ #define TDP_INKTRACE 0x0004 /* Thread is currently in KTRACE code. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403280855.i2S8tnX7030744>