svn commit: r225726 - stable/8/libexec/rtld-elf
Author: kib Date: Thu Sep 22 08:39:20 2011 New Revision: 225726 URL: http://svn.freebsd.org/changeset/base/225726 Log: MFC r225582: Use the proper dynamic tls block to calculate the tls variable address in case tls data generation was updated. PR: misc/160721 Modified: stable/8/libexec/rtld-elf/rtld.c Directory Properties: stable/8/libexec/rtld-elf/ (props changed) Modified: stable/8/libexec/rtld-elf/rtld.c == --- stable/8/libexec/rtld-elf/rtld.cThu Sep 22 08:24:33 2011 (r225725) +++ stable/8/libexec/rtld-elf/rtld.cThu Sep 22 08:39:20 2011 (r225726) @@ -3126,7 +3126,7 @@ tls_get_addr_common(Elf_Addr** dtvp, int newdtv[1] = tls_max_index; free(dtv); wlock_release(rtld_bind_lock, lockstate); - *dtvp = newdtv; + dtv = *dtvp = newdtv; } /* Dynamically allocate module TLS if necessary */ ___ 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
svn commit: r225728 - stable/8/sys/kern
Author: attilio
Date: Thu Sep 22 11:07:11 2011
New Revision: 225728
URL: http://svn.freebsd.org/changeset/base/225728
Log:
MFC r225516:
Return ENOSPC rather than ENXIO when dump_write() cannot proceed in
order to correctl deal with consumers.
Sponsored by: Sandvine Incorporated
Modified:
stable/8/sys/kern/kern_shutdown.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/kern/kern_shutdown.c
==
--- stable/8/sys/kern/kern_shutdown.c Thu Sep 22 10:52:14 2011
(r225727)
+++ stable/8/sys/kern/kern_shutdown.c Thu Sep 22 11:07:11 2011
(r225728)
@@ -712,8 +712,11 @@ dump_write(struct dumperinfo *di, void *
if (length != 0 (offset di-mediaoffset ||
offset - di-mediaoffset + length di-mediasize)) {
- printf(Attempt to write outside dump device boundaries.\n);
- return (ENXIO);
+ printf(Attempt to write outside dump device boundaries.\n
+ offset(%jd), mediaoffset(%jd), length(%ju), mediasize(%jd).\n,
+ (intmax_t)offset, (intmax_t)di-mediaoffset,
+ (uintmax_t)length, (intmax_t)di-mediasize);
+ return (ENOSPC);
}
return (di-dumper(di-priv, virtual, physical, offset, length));
}
___
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
svn commit: r225730 - svnadmin/tools
Author: simon Date: Thu Sep 22 17:51:09 2011 New Revision: 225730 URL: http://svn.freebsd.org/changeset/base/225730 Log: - Add 9.0 (stable and releng) branches to svn2cvs mapping. [1] - Checkpoint current list of hacks mainly to handle support for 'Replaced' files. Requested by: kensmith Modified: svnadmin/tools/export.py Modified: svnadmin/tools/export.py == --- svnadmin/tools/export.pyThu Sep 22 12:53:27 2011(r225729) +++ svnadmin/tools/export.pyThu Sep 22 17:51:09 2011(r225730) @@ -175,6 +175,7 @@ maptable = [ ( 'stable/6/', 'RELENG_6' ), ( 'stable/7/', 'RELENG_7' ), ( 'stable/8/', 'RELENG_8' ), + ( 'stable/9/', 'RELENG_9' ), # errata / security / releng branches ( 'releng/ALPHA_2_0/','ALPHA_2_0' ), ( 'releng/BETA_2_0/', 'BETA_2_0' ), @@ -209,6 +210,7 @@ maptable = [ ( 'releng/8.1/', 'RELENG_8_1' ), ( 'releng/8.2/', 'RELENG_8_2' ), ( 'releng/8.3/', 'RELENG_8_3' ), + ( 'releng/9.0/', 'RELENG_9_0' ), ] def map2cvs(svnpath): @@ -336,6 +338,54 @@ def exportrev(pool, fs_ptr, rev, cvspath # continue #if p == 'stable/8/release/picobsd/floppy.tree/sbin' and k == 'D': # continue +#if p == 'head/contrib/llvm/tools/clang/www/demo/what is this directory.txt.' and k == 'A': +# continue +#if p == 'head/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp' and k == 'D' and rev == 210299: +# continue +#if p == 'head/contrib/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.h' and k == 'D' and rev == 210299: +# continue +#if p == 'head/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S' and k == 'D' and rev == 215990: +# continue +#if p == 'head/sys/contrib/octeon-sdk/cvmx-log-arc.S' and k == 'D' and rev == 215990: +# continue +#if p == 'head/contrib/binutils/ld/emultempl/mipself.em' and k == 'D' and rev == 218822: +# continue +#if p == 'head/contrib/binutils/libiberty/pexecute.c' and k == 'D' and rev == 218822: +# continue +#if p == 'head/sys/modules/cxgbe/Makefile' and k == 'D' and rev == 220231: +# continue +if p == 'head/share/man/man4/geom_map.4' and k == 'D' and rev == 222813: + continue +if p == 'head/sys/dev/iicbus/ad7417.c' and k == 'D' and rev == 222813: + continue +if p == 'head/sys/nfs/nfs_kdtrace.h' and k == 'D' and rev == 222813: + continue +if p == 'head/sys/sys/_stdint.h' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/build/options/WITHOUT_GPIO' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/build/options/WITH_OFED' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/builtins/set1.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote1.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote2.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote3.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote4.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote5.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote6.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote7.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote8.0' and k == 'D' and rev == 222813: + continue +if p == 'head/tools/regression/bin/sh/parser/dollar-quote9.0' and k == 'D' and rev == 222813: + continue makedirs(workpath, _dirname(path), 'src') # Now the directory for the files must exist, and branch tag will be sticky assert os.path.isdir(os.path.join(workpath, _dirname(path))) @@ -380,6 +430,7 @@ def export(pool, repos_path, cvspath): print '== export rev ' + rev exportrev(pool, fs_ptr, last_rev + 1, cvspath) fs.change_rev_prop(fs_ptr, 0, 'fbsd:lastexp', rev) + #return continue print . time.sleep(15) ___ 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
svn commit: r225731 - stable/8/etc/defaults
Author: jh Date: Thu Sep 22 17:59:33 2011 New Revision: 225731 URL: http://svn.freebsd.org/changeset/base/225731 Log: MFC r225587: Expose log in the default devfs rules. /etc/rc.d/jail creates /dev/log as a symbolic link. PR: conf/160711 Modified: stable/8/etc/defaults/devfs.rules Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/defaults/devfs.rules == --- stable/8/etc/defaults/devfs.rules Thu Sep 22 17:51:09 2011 (r225730) +++ stable/8/etc/defaults/devfs.rules Thu Sep 22 17:59:33 2011 (r225731) @@ -26,6 +26,7 @@ add hide # Requires: devfsrules_hide_all # [devfsrules_unhide_basic=2] +add path log unhide add path null unhide add path zero unhide add path crypto unhide ___ 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
svn commit: r225732 - stable/7/etc/defaults
Author: jh Date: Thu Sep 22 18:21:15 2011 New Revision: 225732 URL: http://svn.freebsd.org/changeset/base/225732 Log: MFC r225587: Expose log in the default devfs rules. /etc/rc.d/jail creates /dev/log as a symbolic link. PR: conf/160711 Modified: stable/7/etc/defaults/devfs.rules Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/defaults/devfs.rules == --- stable/7/etc/defaults/devfs.rules Thu Sep 22 17:59:33 2011 (r225731) +++ stable/7/etc/defaults/devfs.rules Thu Sep 22 18:21:15 2011 (r225732) @@ -26,6 +26,7 @@ add hide # Requires: devfsrules_hide_all # [devfsrules_unhide_basic=2] +add path log unhide add path null unhide add path zero unhide add path crypto unhide ___ 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
svn commit: r225733 - stable/8/lib/libc/nls
Author: gabor
Date: Thu Sep 22 22:08:09 2011
New Revision: 225733
URL: http://svn.freebsd.org/changeset/base/225733
Log:
MFC r202992:
Cache failing and opened catalogs in catopen() and related functions.
Continuous catopen() calls cause 4 failig stat(2) each, which means a lot
of overhead. It is also a good idea to keep the opened catalogs in the memory
to speed up further catopen() calls to the same catalog since these catalogs
are not big at all. In this case, we count references and only free() the
allocated space when the reference count reaches 0. The reads and writes to
the cache are syncronized with an rwlock when these functions are called from
a threaded program.
MFC r202993, r203174, r203719, r204110:
Small fixes and style nits for the above change.
Approved by: delphij (mentor)
Modified:
stable/8/lib/libc/nls/msgcat.c
Directory Properties:
stable/8/lib/libc/ (props changed)
stable/8/lib/libc/stdtime/ (props changed)
Modified: stable/8/lib/libc/nls/msgcat.c
==
--- stable/8/lib/libc/nls/msgcat.c Thu Sep 22 18:21:15 2011
(r225732)
+++ stable/8/lib/libc/nls/msgcat.c Thu Sep 22 22:08:09 2011
(r225733)
@@ -1,5 +1,6 @@
/***
Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
+Copyright 2010, Gabor Kovesdan ga...@freebsd.org
All Rights Reserved
@@ -39,6 +40,7 @@ __FBSDID($FreeBSD$);
#include sys/types.h
#include sys/stat.h
#include sys/mman.h
+#include sys/queue.h
#include arpa/inet.h /* for ntohl() */
@@ -47,6 +49,7 @@ __FBSDID($FreeBSD$);
#include limits.h
#include locale.h
#include nl_types.h
+#include pthread.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -57,38 +60,109 @@ __FBSDID($FreeBSD$);
#define _DEFAULT_NLS_PATH
/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L
+#define RLOCK(fail){ int ret;
\
+ if (__isthreaded
\
+ ((ret = _pthread_rwlock_rdlock(rwlock)) != 0)) {
\
+ errno = ret;
\
+ return (fail);
\
+ }}
+#define WLOCK(fail){ int ret;
\
+ if (__isthreaded
\
+ ((ret = _pthread_rwlock_wrlock(rwlock)) != 0)) {
\
+ errno = ret;
\
+ return (fail);
\
+ }}
+#define UNLOCK { if (__isthreaded)
\
+ _pthread_rwlock_unlock(rwlock); }
+
#defineNLERR ((nl_catd) -1)
#define NLRETERR(errc) { errno = errc; return (NLERR); }
+#define SAVEFAIL(n, l, e) { WLOCK(NLERR);
\
+ np = malloc(sizeof(struct catentry));
\
+ if (np != NULL) {
\
+ np-name = strdup(n);
\
+ np-path = NULL;
\
+ np-lang = (l == NULL) ? NULL :
\
+ strdup(l);
\
+ np-caterrno = e;
\
+ SLIST_INSERT_HEAD(cache, np, list);
\
+ }
\
+ UNLOCK;
\
+ errno = e;
\
+ }
+
+static nl_catd load_msgcat(const char *, const char *, const char *);
-static nl_catd load_msgcat(const char *);
+static pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
+
+struct catentry {
+ SLIST_ENTRY(catentry)list;
+ char*name;
+ char*path;
+ int caterrno;
+ nl_catd catd;
+ char*lang;
+ int refcount;
+};
+
+SLIST_HEAD(listhead, catentry) cache =
+SLIST_HEAD_INITIALIZER(cache);
nl_catd
catopen(const char *name, int type)
{
- int spcleft, saverr;
- charpath[PATH_MAX];
- char*nlspath, *lang, *base, *cptr,
svn commit: r225735 - svnadmin/conf
Author: kensmith Date: Fri Sep 23 00:50:36 2011 New Revision: 225735 URL: http://svn.freebsd.org/changeset/base/225735 Log: Add stable/9 to approvers and paths in preparation for creating stable/9 as part of the 9.0-RELEASE release cycle. Approved by: re (implicit) Modified: svnadmin/conf/approvers svnadmin/conf/paths Modified: svnadmin/conf/approvers == --- svnadmin/conf/approvers Thu Sep 22 22:52:24 2011(r225734) +++ svnadmin/conf/approvers Fri Sep 23 00:50:36 2011(r225735) @@ -17,6 +17,7 @@ # $FreeBSD$ # ^head/ re +^stable/8/ re #^stable/8/re #^stable/7/re ^releng/8.[0-2]/ (security-officer|so) Modified: svnadmin/conf/paths == --- svnadmin/conf/paths Thu Sep 22 22:52:24 2011(r225734) +++ svnadmin/conf/paths Fri Sep 23 00:50:36 2011(r225735) @@ -16,6 +16,7 @@ ^stable/6/ ^stable/7/ ^stable/8/ +^stable/9/ # Feature branches. Not open until we're certain we're not reverting to cvs. ^user/ ___ 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
svn commit: r225736 - stable/9
Author: kensmith Date: Fri Sep 23 00:51:37 2011 New Revision: 225736 URL: http://svn.freebsd.org/changeset/base/225736 Log: Copy head to stable/9 as part of 9.0-RELEASE release cycle. Approved by: re (implicit) Added: - copied from r225735, head/ Directory Properties: stable/9/ (props changed) ___ 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
svn commit: r225737 - svnadmin/conf
Author: kensmith Date: Fri Sep 23 02:58:59 2011 New Revision: 225737 URL: http://svn.freebsd.org/changeset/base/225737 Log: Do the change from 8 to 9 that was supposed to follow copying the line. It's been one of those nights... Approved by: re (implicit) Modified: svnadmin/conf/approvers Modified: svnadmin/conf/approvers == --- svnadmin/conf/approvers Fri Sep 23 00:51:37 2011(r225736) +++ svnadmin/conf/approvers Fri Sep 23 02:58:59 2011(r225737) @@ -17,7 +17,7 @@ # $FreeBSD$ # ^head/ re -^stable/8/ re +^stable/9/ re #^stable/8/re #^stable/7/re ^releng/8.[0-2]/ (security-officer|so) ___ 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
svn commit: r225738 - in stable/8: . share/man/man4 share/man/man7 share/man/man9
Author: lstewart Date: Fri Sep 23 05:28:09 2011 New Revision: 225738 URL: http://svn.freebsd.org/changeset/base/225738 Log: MFC r225583: Rename the cc.4 and cc.9 modular congestion control related man pages to mod_cc.4 and mod_cc.9 respectively to avoid any possible confusion with the cc.1 gcc man page. Update references to these man pages where required. Requested by: Grenville Armitage Added: stable/8/share/man/man4/mod_cc.4 - copied unchanged from r225583, head/share/man/man4/mod_cc.4 stable/8/share/man/man9/mod_cc.9 - copied unchanged from r225583, head/share/man/man9/mod_cc.9 Deleted: stable/8/share/man/man4/cc.4 stable/8/share/man/man9/cc.9 Modified: stable/8/ObsoleteFiles.inc (contents, props changed) stable/8/share/man/man4/Makefile stable/8/share/man/man4/cc_chd.4 stable/8/share/man/man4/cc_cubic.4 stable/8/share/man/man4/cc_hd.4 stable/8/share/man/man4/cc_htcp.4 stable/8/share/man/man4/cc_newreno.4 stable/8/share/man/man4/cc_vegas.4 stable/8/share/man/man4/h_ertt.4 stable/8/share/man/man4/tcp.4 stable/8/share/man/man9/Makefile Directory Properties: stable/8/ (props changed) stable/8/COPYRIGHT (props changed) stable/8/LOCKS (props changed) stable/8/MAINTAINERS (props changed) stable/8/Makefile (props changed) stable/8/Makefile.inc1 (props changed) stable/8/README (props changed) stable/8/UPDATING (props changed) stable/8/share/man/ (props changed) stable/8/share/man/man1/ (props changed) stable/8/share/man/man3/ (props changed) stable/8/share/man/man4/ (props changed) stable/8/share/man/man5/ (props changed) stable/8/share/man/man7/ (props changed) stable/8/share/man/man7/ports.7 (props changed) stable/8/share/man/man8/ (props changed) stable/8/share/man/man9/ (props changed) Modified: stable/8/ObsoleteFiles.inc == --- stable/8/ObsoleteFiles.inc Fri Sep 23 02:58:59 2011(r225737) +++ stable/8/ObsoleteFiles.inc Fri Sep 23 05:28:09 2011(r225738) @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20110915: rename congestion control manpages +OLD_FILES+=usr/share/man/man4/cc.4.gz +OLD_FILES+=usr/share/man/man9/cc.9.gz # 20101123: removed subblock.h from liblzma OLD_FILES+=usr/include/lzma/subblock.h # 20101114: Remove long-obsolete MAKEDEV.8 Modified: stable/8/share/man/man4/Makefile == --- stable/8/share/man/man4/MakefileFri Sep 23 02:58:59 2011 (r225737) +++ stable/8/share/man/man4/MakefileFri Sep 23 05:28:09 2011 (r225738) @@ -67,7 +67,6 @@ MAN= aac.4 \ cardbus.4 \ carp.4 \ cas.4 \ - cc.4 \ cc_chd.4 \ cc_cubic.4 \ cc_hd.4 \ @@ -225,6 +224,8 @@ MAN=aac.4 \ mmc.4 \ mmcsd.4 \ mn.4 \ + mod_cc.4 \ + mos.4 \ mouse.4 \ mps.4 \ mpt.4 \ Modified: stable/8/share/man/man4/cc_chd.4 == --- stable/8/share/man/man4/cc_chd.4Fri Sep 23 02:58:59 2011 (r225737) +++ stable/8/share/man/man4/cc_chd.4Fri Sep 23 05:28:09 2011 (r225738) @@ -29,7 +29,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_CHD 4 .Os .Sh NAME @@ -86,16 +86,16 @@ is used. Default is 1. .El .Sh SEE ALSO -.Xr cc 4 , .Xr cc_cubic 4 , .Xr cc_hd 4 , .Xr cc_htcp 4 , .Xr cc_newreno 4 , .Xr cc_vegas 4 , .Xr h_ertt 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 , -.Xr khelp 9 +.Xr khelp 9 , +.Xr mod_cc 9 .Rs .%A D. A. Hayes .%A G. Armitage Modified: stable/8/share/man/man4/cc_cubic.4 == --- stable/8/share/man/man4/cc_cubic.4 Fri Sep 23 02:58:59 2011 (r225737) +++ stable/8/share/man/man4/cc_cubic.4 Fri Sep 23 05:28:09 2011 (r225738) @@ -30,7 +30,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_CUBIC 4 .Os .Sh NAME @@ -62,14 +62,14 @@ section below. .Sh MIB Variables There are currently no tunable MIB variables. .Sh SEE ALSO -.Xr cc 4 , .Xr cc_chd 4 , .Xr cc_hd 4 , .Xr cc_htcp 4 , .Xr cc_newreno 4 , .Xr cc_vegas 4 , +.Xr mod_cc 4 , .Xr tcp 4 , -.Xr cc 9 +.Xr mod_cc 9 .Rs .%A Sangtae Ha .%A Injong Rhee Modified: stable/8/share/man/man4/cc_hd.4 == --- stable/8/share/man/man4/cc_hd.4 Fri Sep 23 02:58:59 2011 (r225737) +++ stable/8/share/man/man4/cc_hd.4 Fri Sep 23 05:28:09 2011 (r225738) @@ -29,7 +29,7 @@ .\ .\ $FreeBSD$ .\ -.Dd February 15, 2011 +.Dd September 15, 2011 .Dt CC_HD 4 .Os .Sh NAME @@ -69,16 +69,16 @@ Minimum queuing delay threshold (qmin) i Default is 5. .El .Sh SEE
svn commit: r225739 - stable/8/share/man/man4
Author: lstewart Date: Fri Sep 23 05:35:24 2011 New Revision: 225739 URL: http://svn.freebsd.org/changeset/base/225739 Log: Follow up to r225738 to fix the mismerge of share/man/man4/Makefile. This is an intentional direct commit to the 8-STABLE branch. Modified: stable/8/share/man/man4/Makefile Modified: stable/8/share/man/man4/Makefile == --- stable/8/share/man/man4/MakefileFri Sep 23 05:28:09 2011 (r225738) +++ stable/8/share/man/man4/MakefileFri Sep 23 05:35:24 2011 (r225739) @@ -225,7 +225,6 @@ MAN=aac.4 \ mmcsd.4 \ mn.4 \ mod_cc.4 \ - mos.4 \ mouse.4 \ mps.4 \ mpt.4 \ ___ 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
