Attached is a patch to update Test-Simple in the src/gnu/usr.bin/perl/cpan/Test-Simple directory. As this is a src/ patch I don't know if this should go to tech@ or ports@. This update is needed by p5-HTTP-Parser-XS (a port that I'm working on), which in turn is needed by p5-Starman (other 'NEW:'). Patch attached. [demime 1.01d removed an attachment of type application/octet-stream which had a name of cvs-Test-Simple.patch]
ip6s_exthdrtoolong is not used at all so why bother keeping it around?
I guess this was a pre-m_pulldown() counter but is now unused.
Index: sys/netinet6/ip6_var.h
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_var.h,v
retrieving revision 1.37
diff -u -p -r1.37 ip6_var.h
--- sys/netinet6/ip6_var.h 8 Jul 2010 19:42:46 -0000 1.37
+++ sys/netinet6/ip6_var.h 29 Nov 2010 17:26:21 -0000
@@ -196,7 +196,6 @@ struct ip6stat {
u_int64_t ip6s_m2m[32]; /* two or more mbuf */
u_int64_t ip6s_mext1; /* one ext mbuf */
u_int64_t ip6s_mext2m; /* two or more ext mbuf */
- u_int64_t ip6s_exthdrtoolong; /* ext hdr are not continuous */
u_int64_t ip6s_nogif; /* no match gif found */
u_int64_t ip6s_toomanyhdr; /* discarded due to too many headers */
Index: usr.bin/netstat/inet6.c
===================================================================
RCS file: /cvs/src/usr.bin/netstat/inet6.c,v
retrieving revision 1.41
diff -u -p -r1.41 inet6.c
--- usr.bin/netstat/inet6.c 21 Oct 2010 10:51:05 -0000 1.41
+++ usr.bin/netstat/inet6.c 14 Dec 2010 12:34:01 -0000
@@ -413,8 +413,6 @@ ip6_stats(char *name)
}
p(ip6s_mext1, "\t\t%llu one ext mbuf%s\n");
p(ip6s_mext2m, "\t\t%llu two or more ext mbuf%s\n");
- p(ip6s_exthdrtoolong,
- "\t%llu packet%s whose headers are not continuous\n");
p(ip6s_nogif, "\t%llu tunneling packet%s that can't find gif\n");
p(ip6s_toomanyhdr,
"\t%llu packet%s discarded due to too many headers\n");
The diff below completely removes the KERN_PROC sysctl() and the
kvm_getprocs(), kvm_getargv(), and kvm_getenvv() functions. The former
has been superseded by KERN_PROC2 while the later have been superseded by
kvm_getproc2(), kvm_getargv2(), and kvm_getenvv2(). I proposed doing this
back in July and, IIRC, got mildly positive feedback.
This mainly affects ports, so if you guys think we need to wait, please
say so. I'll note again that the whole point of the new calls is that
they are stable ABIs while the kernel changes: the ABIs for the calls
being removed changed at least once before 4.7 and again before 4.8...and
can't even get to the full process information in 4.8!
Note that this bumps the libkvm major.
oks?
Philip Guenther
Index: sys/sys/sysctl.h
===================================================================
RCS file: /cvs/src/sys/sys/sysctl.h,v
retrieving revision 1.106
diff -u -p -r1.106 sysctl.h
--- sys/sys/sysctl.h 19 Aug 2010 18:14:13 -0000 1.106
+++ sys/sys/sysctl.h 24 Oct 2010 07:02:11 -0000
@@ -42,8 +42,6 @@
* These are for the eproc structure defined below.
*/
#ifndef _KERNEL
-#include <sys/time.h>
-#include <sys/ucred.h>
#include <sys/proc.h>
#include <sys/resource.h>
#endif
@@ -126,9 +124,7 @@ struct ctlname {
#define KERN_HOSTID 11 /* int: host identifier */
#define KERN_CLOCKRATE 12 /* struct: struct clockinfo */
#define KERN_VNODE 13 /* struct: vnode structures */
-#if defined(_KERNEL) || defined(_LIBKVM)
-#define KERN_PROC 14 /* struct: process entries */
-#endif
+/*define gap: was KERN_PROC 14 */
#define KERN_FILE 15 /* struct: file entries */
#define KERN_PROF 16 /* node: kernel profiling info */
#define KERN_POSIX1 17 /* int: POSIX.1 version */
@@ -281,7 +277,7 @@ struct ctlname {
/*
- * KERN_PROC subtypes
+ * KERN_PROC2 subtypes
*/
#define KERN_PROC_ALL 0 /* everything but kernel threads */
#define KERN_PROC_PID 1 /* by process id */
@@ -308,42 +304,6 @@ struct ctlname {
...Winux Group:
_________________
Winux soft Ltd:
_________________
1) Domain Registration .com/.net/.org/.info/with .com.bd
2) Web Design Redesign & Development,Website Hosting
3) Software Research & webbase software Development
4) E-commerce Solution
5) Multimedia Brochure
6) CMS & SEO Support
7) PC To Fax Service Worldwide
8) EDGE & GPRS Modem Distributor
9) USA Base Web Hosting
Ready Software Product:
______________________
1) Winux Freight Forwarding Trace Manager Software Solution
2) Winux Sales & Inventory Solution
3) Winux Resume Manager
Winux Travels & Tours:
____________________
1) Airlines Ticket sales & Hotel Reservation Worldwide
2) Visa Processing Service
3) Inbound & Outbound Smooth Comfortable & Reliable Group Tour Package
4) Domestic Air Ticket also available
5) EID Special packages also availabl
Winux Garments Accessories:
___________________________
winux manufacturer & Supplier all kind of garments
accessories woven & printinglabel,poly,Hangtag,bercode stiker,Elastic,Lace etc.
winux Enterprise:
_________________
Distributor of Anik Telecom item.we wholsale all anik item. like..
1.Mobile Battery 2.Mobile charger 3.ACID Battery 4.Stabilizer 5.IPS
6.GAS Genarator 7.Energy saving Lump 8. Mobile Cover 9.GPRS/EDGE Modem(Faster Internet Browser Device).
**We are Manufacturer, Distributor & Importers of Telecommunication Items based in Bangladesh. We are also Distribute & Import various
Types of Telecommunication products for our Customers in Bangladesh.
_____________________________________________________________________
Thanks & Regads
winux group Bangladesh
(Winux Soft Ltd / Winux Tours & Travels / Winux Enterprise/ Winux Accessories)
Corporate Sales Department
Tel:+88-02-9891538 / 8858849 / 9883619/ 8837118
Mobile:+88-01711-336825/ 01720-331144/ 01678-076363
Email: winuxgroup@gmail.com/winuxsoftltd@yahoo.com/winuxtravels@gmail.com
Office Adress: House # ...A quick look shows it is probably not needed to have a "offset" non-terminal,
if you define sensor_offset as
sensor_offset : /* empty */ { $$ = 0; }
| SENSOROFFSET number {
etc
We are searching for communicative, dynamic, honest and respectable people interested in additional earnings and who are ready to learn quickly, to follow the instructions and to show own initiative too. This job is a unique chance to try out in an investment sphere, and also it is a priceless work experience in a financial sphere. Besides, you will substantially increase your income even if you work with us for only several hours a day. We do not require any special education but its presence is appreciated as well as the work experience. We highly appreciate and find very important an ability to follow our instructions and conditions. Benefits of working for Competitive Finances: - High Salary: about $45.000/year - The ability of working for just several hours a day - Priceless work experience in a financial sphere An applicant must: - be capable to work; - be older than 21; - have an opportunity to give not less than 1 hour a day to this work; For immediate consideration, please send resume to: future0001@gmail.com With the best regards, East Europe financial group.
Ifthis message is not displaying properly, visit hereto launch your browser.
Youronline guide to events throughout the Middle East
See the latestinfo on events around the Middle East.
Visit Site
List your Events
Services
JobSite
ContactUs
ExhibitionSearch by Country
Bahrain
Kuwait
Syria
Egypt
Lebanon
Turkey
Iran
Oman
United ArabEmirates
Iraq
Qatar
Jordan
SaudiArabia
AGCC -Conference Search by Country
Bahrain
Kuwait
UnitedArab Emirates
Oman
Qatar
SaudiArabia
To be removed from our lists please unsubscribe by visitinghere
www.expoguidearabia.com
Thanks for the suggestion. At the moment, number is unsigned, because it is only used for the weight and I didn't want to touch it. But if it's OK to change it into a signed variable (which is obviously needed for the offset), then that can be done easily. I'll send in a new patch this evening. Maurice
we're currently cooking a bigger diff wrt number hanlding there, so give it a little slack... -- Henning Brauer, hb@bsws.de, henning@openbsd.org BS Web Services, http://bsws.de Full-Service ISP - Secure Hosting, Mail and DNS Services Dedicated Servers, Rootservers, Application Hosting - Hamburg & Amsterdam
OK, here's a diff against the latest parse.y (with tabs instead of
spaces all over the place like the previous diff, sorry about that).
BTW: it looks like the default value of 1 for the weight is gone,
causing ntpd to never sync to a server or sensor if no explicit weight
value is given.
I tried to change it into something like
weight : /* empty */ { opts.weight = 1; }
| WEIGHT NUMBER {
but yacc keeps complaining about 2 lines never being reduced.
I obviously don't understand the format well enough to fix it properly.
Maurice
Index: ntpd.conf.5
===================================================================
RCS file: /cvs/src/usr.sbin/ntpd/ntpd.conf.5,v
retrieving revision 1.16
diff -u -r1.16 ntpd.conf.5
--- ntpd.conf.5 31 May 2007 19:20:26 -0000 1.16
+++ ntpd.conf.5 12 Sep 2007 18:16:22 -0000
@@ -72,6 +72,7 @@
.Ed
.It Xo Ic sensor Ar device
.Op Ic weight Ar weight-value
+.Op Ic offset Ar milliseconds
.Xc
Specify a timedelta sensor device
.Xr ntpd 8
@@ -91,6 +92,14 @@
.Bd -literal -offset indent
sensor *
sensor udcf0
+.Ed
+.Pp
+An optional offset in milliseconds can be given to compensate
+for the sensors offset.
+For example, if your DCF77 receiver is lagging 15 ms behind
+actual time:
+.Bd -literal -offset indent
+sensor udcf0 offset -15
.Ed
.It Xo Ic server Ar address
.Op Ic weight Ar weight-value
Index: ntpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/ntpd/ntpd.h,v
retrieving revision 1.85
diff -u -r1.85 ntpd.h
--- ntpd.h 4 Aug 2007 02:58:02 -0000 1.85
+++ ntpd.h 12 Sep 2007 18:16:22 -0000
@@ -143,12 +143,14 @@
int sensordevid;
u_int8_t weight;
u_int8_t shift;
+ int32_t sensor_offset;
};
struct ntp_conf_sensor {
TAILQ_ENTRY(ntp_conf_sensor) entry;
char *device;
u_int8_t weight;
+ int32_t sensor_offset;
};
struct ntp_freq {
Index: ...I think we already converted most ports over to using KERN_PROC2, there are some that were missed (I know net-snmp hasn't been done yet), and I think one which was imported since then which probably needs converting, I'll take a look at these. If there are just a couple of standalone ports that need fixing we can do that after committing, but some of the ports using libkvm are dependencies for large numbers of ports so please give us a bit of time to check and make sure we don't take out all of GNOME or something, I'll get back to you. sqlite> select * from wantlib where value='kvm'; databases/pg_top|kvm| devel/libgtop2|kvm| devel/py-openbsd|kvm| net/ifmcstat|kvm| net/net-snmp,-main|kvm| net/ntp|kvm| net/wide-dhcp|kvm| net/wmnet|kvm| net/wmnetload|kvm| net/zabbix,-server,mysql|kvm| net/zabbix,-server,pgsql|kvm| net/zabbix,-main|kvm| net/zabbix,-server,sqlite3|kvm| security/antisniff|kvm| sysutils/collectd,-main|kvm| sysutils/conky|kvm| sysutils/conky,no_x11|kvm| sysutils/consolekit|kvm| sysutils/dtpstree|kvm| sysutils/gkrellm/gkrellm,-main|kvm| sysutils/gkrellm/gkrellm,-client|kvm| sysutils/heartbeat,-snmp|kvm| sysutils/lsof|kvm| sysutils/monit|kvm| sysutils/p5-Proc-ProcessTable|kvm| sysutils/pscpug|kvm| sysutils/whowatch|kvm| sysutils/wmmon|kvm| sysutils/xps|kvm| x11/gdesklets|kvm| x11/gnome/applets2,-main|kvm| x11/gnome/bug-buddy|kvm| x11/gnome/controlcenter2|kvm| x11/gnome/metacity|kvm| x11/gnome/nettool|kvm| x11/gnome/py-gnome-desktop|kvm| x11/gnome/system-monitor|kvm| x11/gnome/utils|kvm| x11/kde/utils3|kvm| x11/xfce4/xfce4-systemload|kvm|
<sigh> I missed that there were a couple other diffs in my tree that were
necessary for building with that change to <sys/sysctl.h>: ps was using
the removed defines for EMULNAMELEN and WMESGLEN.
(This could actually be commited without the other diff: the existing code
is wrong, mixing the old defines with the new structure; it's only by
coincidence that the values line up, so it works everywhere.)
Also, (1) the code tests an array member, which is always true, and (2)
struct kinfo_proc2's p_wmesg is guaranteed to be NUL terminated; that lets
the wchan() function be simplified.
Philip Guenther
Index: bin/ps/keyword.c
===================================================================
RCS file: /cvs/src/bin/ps/keyword.c,v
retrieving revision 1.30
diff -u -p -r1.30 keyword.c
--- bin/ps/keyword.c 14 Feb 2010 00:17:14 -0000 1.30
+++ bin/ps/keyword.c 24 Oct 2010 09:16:26 -0000
@@ -90,7 +90,7 @@ VAR var[] = {
{"cpuid", "CPUID", NULL, 0, pvar, 8, 0, POFF(p_cpuid), UINT64, "lld"},
{"cputime", "", "time"},
{"dsiz", "DSIZ", NULL, 0, dsize, 4},
- {"emul", "EMUL", NULL, LJUST, emulname, EMULNAMELEN},
+ {"emul", "EMUL", NULL, LJUST, emulname, KI_EMULNAMELEN - 1},
{"etime", "", "start"},
{"f", "F", NULL, 0, pvar, 7, 0, POFF(p_flag), INT32, "x"},
{"flags", "", "f"},
@@ -171,7 +171,7 @@ VAR var[] = {
{"usrpri", "", "upr"},
{"vsize", "", "vsz"},
{"vsz", "VSZ", NULL, 0, vsize, 5},
- {"wchan", "WCHAN", NULL, LJUST, wchan, 7},
+ {"wchan", "WCHAN", NULL, LJUST, wchan, KI_WMESGLEN - 1},
{"xstat", "XSTAT", NULL, 0, pvar, 4, 0, POFF(p_xstat), UINT16, "x"},
{""},
};
Index: bin/ps/print.c
===================================================================
RCS file: /cvs/src/bin/ps/print.c,v
retrieving revision 1.46
diff -u -p -r1.46 print.c
--- bin/ps/print.c 14 Feb 2010 00:17:14 -0000 1.46
+++ bin/ps/print.c 24 Oct 2010 09:16:26 -0000
@@ -432,16 +432,7 @@ wchan(const struct kinfo_proc2 *kp, VARE
v = ve->var;
if (kp->p_wchan) {
- int ...Grrr. Ken caught that I had failed to include another diff necessary for the kernel build. To guarantee that I'm not missing others, I've stripped unrelated diffs from my tree and am doing a full build. Once that's done and I've proved to myself that I have all the necessary bits I'll send the complete diff. Sorry about the piece-wise feed folks... Philip Guenther
...and here's the complete diff, tested with a clean build.
Philip Guenther
Index: sys/sys/sysctl.h
===================================================================
RCS file: /cvs/src/sys/sys/sysctl.h,v
retrieving revision 1.106
diff -u -p -r1.106 sysctl.h
--- sys/sys/sysctl.h 19 Aug 2010 18:14:13 -0000 1.106
+++ sys/sys/sysctl.h 24 Oct 2010 11:13:58 -0000
@@ -42,8 +42,6 @@
* These are for the eproc structure defined below.
*/
#ifndef _KERNEL
-#include <sys/time.h>
-#include <sys/ucred.h>
#include <sys/proc.h>
#include <sys/resource.h>
#endif
@@ -126,9 +124,7 @@ struct ctlname {
#define KERN_HOSTID 11 /* int: host identifier */
#define KERN_CLOCKRATE 12 /* struct: struct clockinfo */
#define KERN_VNODE 13 /* struct: vnode structures */
-#if defined(_KERNEL) || defined(_LIBKVM)
-#define KERN_PROC 14 /* struct: process entries */
-#endif
+/*define gap: was KERN_PROC 14 */
#define KERN_FILE 15 /* struct: file entries */
#define KERN_PROF 16 /* node: kernel profiling info */
#define KERN_POSIX1 17 /* int: POSIX.1 version */
@@ -281,7 +277,7 @@ struct ctlname {
/*
- * KERN_PROC subtypes
+ * KERN_PROC2 subtypes
*/
#define KERN_PROC_ALL 0 /* everything but kernel threads */
#define KERN_PROC_PID 1 /* by process id */
@@ -308,42 +304,6 @@ struct ctlname {
#define KERN_PROC_NENV 4
/*
- * KERN_PROC subtype ops return arrays of augmented proc structures:
- */
-struct kinfo_proc {
- struct proc kp_proc; /* proc structure */
- struct eproc {
- struct proc *e_paddr; /* address of proc */
- struct session *e_sess; /* session pointer */
- struct pcred e_pcred; /* process credentials */
- struct ucred e_ucred; /* current credentials */
- struct vmspace e_vm; /* address space */
- struct pstats e_pstats; /* process stats */
- int e_pstats_valid; /* pstats valid? */
- pid_t e_ppid; /* parent process id */
- pid_t e_pgid; /* process group id */
- short e_jobc; /* job control counter ...Always reporting 0 or garbage does seem silly. ok krw@ for what it's worth. .... Ken
Index: gnu/usr.bin/perl/cpan/Test-Simple/Changes =================================================================== RCS file: /cvs/src/gnu/usr.bin/perl/cpan/Test-Simple/Changes,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Changes --- gnu/usr.bin/perl/cpan/Test-Simple/Changes 24 Sep 2010 14:49:05 -0000 1.1.1.1 +++ gnu/usr.bin/perl/cpan/Test-Simple/Changes 2 Jan 2011 22:46:37 -0000 @@ -1,3 +1,45 @@ +0.96 Tue Aug 10 21:13:04 PDT 2010 + Bug Fixes + * You can call done_testing() again after reset() [googlecode 59] + + Other + * Bug tracker moved to github + + +0.95_02 Wed May 19 15:46:52 PDT 2010 + Bug Fixes + * Correct various typos and spelling errors (Nick Cleaton) + * Fix alignment of indented multi-line diagnostics from subtests + (Nick Cleaton) + * Fix incorrect operation when subtest called from within a todo block + (Nick Cleaton) + * Avoid spurious output after a fork within a subtest + (Nick Cleaton) + + +0.95_01 Wed Mar 3 15:36:59 PST 2010 + Bug Fixes + * is_deeply() didn't see a difference in regexes [rt.cpan.org 53469] + * Test::Builder::Tester now sets $tb->todo_output to the output handle and + not the error handle (to be in accordance with the default behaviour of + Test::Builder and allow for testing TODO test behaviour). + * Fixed file/line in failing subtest() diagnostics. (Nick Cleaton) + * Protect against subtests setting $Level (Nick Cleaton) + + New Features + * subtests without a 'plan' or 'no_plan' have an implicit 'done_testing()' + added to them. + * is_deeply() performance boost for large structures consisting of + mostly non-refs (Nick Cleaton) + + Feature Changes + * is() and others will no longer stringify its arguments before + comparing. Overloaded objects will make use of their eq + overload rather than their "" overload. This can break tests of + impolitely string overloaded objects. DateTime prior to 0.54 is + ...
