Re: svn commit: r218695 - stable/8/usr.bin/top
On Tue, 15 Feb 2011 01:33, keramida@ wrote: Author: keramida (doc committer) Date: Tue Feb 15 06:33:35 2011 New Revision: 218695 URL: http://svn.freebsd.org/changeset/base/218695 Log: MFC 217746 from /head/usr.bin/top Touch up the sample memory usage numbers a bit, to avoid wrapping on terminal boundary. While here add definition for 'G' and fix the indentation of 'K' units. Submitted by: plunket PR: docs/153614 -.SH DESCRIPTION OF MEMORY -Mem: 9220K Active, 1032K Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free +.SH DESCRIPTION OF MEMORY +Mem: 9220K Active, 1M Inact, 3284K Wired, 1M Cache, 2M Buf, 1320K Free Swap: 91M Total, 79M Free, 13% Inuse, 80K In, 104K Out Maybe being a little picky here but consistency in this might persuade further questions on why Active is using K but yet Inact being smaller than that is using M. Might be best to just take some active values straight from a running top(1) output rather than blindly adjusting them. -- jhell ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r214343 - stable/8/bin/ps
On 10/25/2010 23:20, jhell wrote: Oops this seems to have been introduced by 214364 rather than the subject listed revision. cc -O2 -pipe -DLAZY_PS -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wno-pointer-sign -c /usr/src/bin/ps/keyword.c /usr/src/bin/ps/keyword.c:190: error: 'struct kinfo_proc' has no member named 'ki_tdaddr' *** Error code 1 ??? -- jhell,v ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r214343 - stable/8/bin/ps
On 10/25/2010 11:01, Attilio Rao wrote: Author: attilio Date: Mon Oct 25 15:01:40 2010 New Revision: 214343 URL: http://svn.freebsd.org/changeset/base/214343 Log: MFC r213012 by emaste: Correct sort order. Sponsored by: Sandvine Incorporated Modified: stable/8/bin/ps/extern.h Directory Properties: stable/8/bin/ps/ (props changed) Modified: stable/8/bin/ps/extern.h == --- stable/8/bin/ps/extern.h Mon Oct 25 14:05:25 2010(r214342) +++ stable/8/bin/ps/extern.h Mon Oct 25 15:01:40 2010(r214343) @@ -79,8 +79,8 @@ int s_uname(KINFO *); void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); -void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); void uname(KINFO *, VARENT *); ___ cc -O2 -pipe -DLAZY_PS -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wno-pointer-sign -c /usr/src/bin/ps/keyword.c /usr/src/bin/ps/keyword.c:190: error: 'struct kinfo_proc' has no member named 'ki_tdaddr' *** Error code 1 ??? -- jhell,v ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r214343 - stable/8/bin/ps
On 10/25/2010 23:20, jhell wrote: On 10/25/2010 11:01, Attilio Rao wrote: Author: attilio Date: Mon Oct 25 15:01:40 2010 New Revision: 214343 URL: http://svn.freebsd.org/changeset/base/214343 Log: MFC r213012 by emaste: Correct sort order. Sponsored by: Sandvine Incorporated Modified: stable/8/bin/ps/extern.h Directory Properties: stable/8/bin/ps/ (props changed) Modified: stable/8/bin/ps/extern.h == --- stable/8/bin/ps/extern.h Mon Oct 25 14:05:25 2010(r214342) +++ stable/8/bin/ps/extern.h Mon Oct 25 15:01:40 2010(r214343) @@ -79,8 +79,8 @@ int s_uname(KINFO *); void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); -void tdnam(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); +void tdnam(KINFO *, VARENT *); void tname(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); void uname(KINFO *, VARENT *); ___ cc -O2 -pipe -DLAZY_PS -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls -Wno-pointer-sign -c /usr/src/bin/ps/keyword.c /usr/src/bin/ps/keyword.c:190: error: 'struct kinfo_proc' has no member named 'ki_tdaddr' *** Error code 1 ??? Ugh! please ignore this. As Ive been here once already now surprised myself by making the same mistake twice! Once, twice, three time a lady! hopefully it won't come to that. -- jhell,v ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r210616 - stable/8/bin/sh
On 07/30/2010 09:56, Jilles Tjoelker wrote: On Thu, Jul 29, 2010 at 07:46:20PM -0400, jhell wrote: So what has been commited here is implicitly stating that instead of using ( trap 'exit 1' 2 ) in a script to catch SIGINT and exit it is now being done on behalf of the user with no way for them to control it ? No, this commit only changes something for interactive mode. It basically tries to create similar behaviour as the lines above (which have been in place for longer) but for the case with job control. The lines above do have an effect in non-interactive mode, for example: sh -c 'ftp; echo continued' Even if ^C has been typed in ftp(1), the shell continues. If a trap has been set on SIGINT, the code has no effect as int_pending is not set in that case. Basically this has the same effect on a script that uses ( ) and to which now have the same meaning. This script should print PRINTME twice when ^C during the sleep. #!/bin/sh sleep 5000; echo PRINTME echo PRINTME No, this script should print nothing. This follows from common sense (users should be able to abort scripts unless those scripts do something to prevent it). A more technical explanation: because job control is not enabled, sh and sleep are in the same process group and therefore both receive terminal signals. Because sleep exited on the SIGINT, sh should exit on it, too. Whereas this script with the old behavior would have done what is trying to be done now for the first line but should still print only the second PRINTME during a ^C of sleep. #!/bin/sh sleep 5000 echo PRINTME echo PRINTME This should not print anything either, for the same reasons. And this script should not print anything when ^C is used during sleep. #!/bin/sh trap 'exit 1' 2 sleep 5000 ; echo PRINTME echo PRINTME Correct. What is being done currently on stable/8 is incorrect... Thank you for you explanation with these. I was confusing the way SIGINT should be handled compared to how ; is supposed to act. I did some tests against some other shells to and to my surprise they confirmed the same behavior that we have now which is correct. Thanks again much appreciated, -- jhell,v ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r210616 - stable/8/bin/sh
So what has been commited here is implicitly stating that instead of using ( trap 'exit 1' 2 ) in a script to catch SIGINT and exit it is now being done on behalf of the user with no way for them to control it ? Basically this has the same effect on a script that uses ( ) and to which now have the same meaning. This script should print PRINTME twice when ^C during the sleep. #!/bin/sh sleep 5000; echo PRINTME echo PRINTME Whereas this script with the old behavior would have done what is trying to be done now for the first line but should still print only the second PRINTME during a ^C of sleep. #!/bin/sh sleep 5000 echo PRINTME echo PRINTME And this script should not print anything when ^C is used during sleep. #!/bin/sh trap 'exit 1' 2 sleep 5000 ; echo PRINTME echo PRINTME What is being done currently on stable/8 is incorrect... On 07/29/2010 12:55, Jilles Tjoelker wrote: Author: jilles Date: Thu Jul 29 16:55:27 2010 New Revision: 210616 URL: http://svn.freebsd.org/changeset/base/210616 Log: MFC r208881: sh: Pass through SIGINT if interactive and job control is enabled. This already worked if without job control. In either case, this depends on it that a process that terminates due to SIGINT exits on it (so not with status 1, or worse, 0). Example: sleep 5; echo continued This does not print continued any more if sleep is aborted via ctrl+c. Modified: stable/8/bin/sh/jobs.c Directory Properties: stable/8/bin/sh/ (props changed) Modified: stable/8/bin/sh/jobs.c == --- stable/8/bin/sh/jobs.cThu Jul 29 16:49:20 2010(r210615) +++ stable/8/bin/sh/jobs.cThu Jul 29 16:55:27 2010(r210616) @@ -862,6 +862,7 @@ waitforjob(struct job *jp, int *origstat { #if JOBS pid_t mypgrp = getpgrp(); + int propagate_int = jp-jobctl jp-foreground; #endif int status; int st; @@ -899,6 +900,11 @@ waitforjob(struct job *jp, int *origstat else CLEAR_PENDING_INT; } +#if JOBS + else if (rootshell iflag propagate_int + WIFSIGNALED(status) WTERMSIG(status) == SIGINT) + kill(getpid(), SIGINT); +#endif INTON; return st; } -- jhell,v ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r209912 - stable/8/bin/pkill
On 07/11/2010 17:50, Brian Somers wrote: Author: brian Date: Sun Jul 11 21:50:05 2010 New Revision: 209912 URL: http://svn.freebsd.org/changeset/base/209912 Log: MFC r209363: Recognise the -l switch in pkill. PR: 143558 Submitted by: eitanadlerlist at gmail dot com Modified: stable/8/bin/pkill/pkill.1 stable/8/bin/pkill/pkill.c Directory Properties: stable/8/bin/pkill/ (props changed) pkill.1 seems to be missing this: Index: bin/pkill/pkill.1 === --- bin/pkill/pkill.1 (revision 209914) +++ bin/pkill/pkill.1 (working copy) @@ -60,7 +60,7 @@ .Ar pattern ... .Nm pkill .Op Fl Ar signal -.Op Fl ILafinovx +.Op Fl ILafilnovx .Op Fl F Ar pidfile .Op Fl G Ar gid .Op Fl M Ar core Regards, -- +-+-+-+-+-+ |j|h|e|l|l| +-+-+-+-+-+ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r202750 - in stable/7/sys: cddl/contrib/opensolaris/uts/common/fs/zfs dev/md fs/cd9660 fs/udf kern sys ufs/ffs
-lk_flags = ~LK_NOSHARE; + VN_LOCK_AREC(vp); vp-v_data = ip; vp-v_bufobj.bo_bsize = fs-fs_bsize; ip-i_vnode = vp; @@ -1518,6 +1518,10 @@ ffs_vgetf(mp, ino, flags, vpp, ffs_flags /* * Finish inode initialization. */ + if (vp-v_type != VFIFO) { + /* FFS supports shared locking for all files except fifos. */ + VN_LOCK_ASHARE(vp); + } /* * Set up a generation number for this inode if it does not ___ svn-src-stabl...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7 To unsubscribe, send any mail to svn-src-stable-7-unsubscr...@freebsd.org -- jhell ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r200714 - in stable/7/sys: amd64/amd64 i386/i386
(cpu_id) = 0xf) + ctl = ~(1UL 10); + } + if (!skip) + wrmsr(MSR_MC_CTL(i), ctl); /* Clear all errors. */ wrmsr(MSR_MC_STATUS(i), 0); } [FYI] Following errors are being generated on stable/7 i386 Intel based machine. If more information is needed, let me know. cc1: warnings being treated as errors /usr/src/sys/i386/i386/mca.c: In function 'mca_init': /usr/src/sys/i386/i386/mca.c:510: warning: implicit declaration of function 'CPUID_TO_FAMILY' /usr/src/sys/i386/i386/mca.c:510: warning: nested extern declaration of 'CPUID_TO_FAMILY' /usr/src/sys/i386/i386/mca.c:511: warning: implicit declaration of function 'CPUID_TO_MODEL' /usr/src/sys/i386/i386/mca.c:511: warning: nested extern declaration of 'CPUID_TO_MODEL' *** Error code 1 - -- Sat Dec 19 14:16:11 2009 -0500 jhell -BEGIN PGP SIGNATURE- iQEcBAEBAgAGBQJLLSdZAAoJEJBXh4mJ2FR++e0H/iWCMNkzAjXOhQUUf24+eiJw 5rC/XcLCOCP8FAeu1LzJ2mnsGswPKnnnQaaT4i8K4g4kZyvaYFOszq8XOSsK4M2G bXWUTN7An6LLtct7tkDj+cOE7icjeTRCXBRhegnBG0IloXNxqbdxd8l/VNbXepGk gJPSSZHBGJ48GC6Um/sXP+XC/3tDSL9UdhCcRAJzBmZxpK1GnNJZbYREeBJo6Ywg uEjDJ29bqEMqwGIykh8CB+9u7CPZ70UcDPfQN4lz/YaWaYXGKMlzCYalbXZNVVUB AmS9PiTUBZ6gJpri0vtykePcWjiY0nESoV+9keNleADCVYzMnT9Hj/dwOiYg25o= =zift -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r198553 - stable/7/share/man/man4
On Wed, 28 Oct 2009 13:46, brueffer@ wrote: Author: brueffer Date: Wed Oct 28 17:46:52 2009 New Revision: 198553 URL: http://svn.freebsd.org/changeset/base/198553 Log: MFC: r198363 List more dependencies for these drivers. While here, convert atapicam(4) to use our standard section 4 SYNOPSIS layout. Modified: stable/7/share/man/man4/ (props changed) stable/7/share/man/man4/atapicam.4 stable/7/share/man/man4/umass.4 -- stage 1: configuring the kernel -- cd /usr/src/sys/i386/conf; PATH=/usr/obj/usr/src/tmp/legacy/usr/sbin:/usr/obj/usr/src/tmp/legacy/usr/bin:/usr/obj/usr/src/tmp/legacy/usr/games:/usr/obj/usr/src/tmp/usr/sbin:/usr/obj/usr/src/tmp/usr/bin:/usr/obj/usr/src/tmp/usr/games:/sbin:/bin:/usr/sbin:/usr/bin config -d /usr/obj/usr/src/sys/SH4500 /usr/src/sys/i386/conf/SH4500 config: Error: device cam is unknown cam is not a device or a option on stable/7 or before. Maybe stable/8 - ? or is this planned to be turned into a device ?. Already included without extra added options here on r198529M stable/7 # kldstat -v |grep cam 41 cam # Best regards. -- ;; dataix.net!jhell 2048R/89D8547E 2009-09-30 ;; BSD since FreeBSD 4.2Linux since Slackware 2.1 ;; 85EF E26B 07BB 3777 76BE B12A 9057 8789 89D8 547E ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org