d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Track three new sendfile-related statistics:

Browse Source 
- The number of times sendfile had to do disk I/O
- The number of times sfbuf allocation failed
- The number of times sfbuf allocation had to wait
This commit is contained in:
silby 2003-12-28 08:57:09 +00:00
parent 385bda819c
commit 653da52535
9 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/alpha/alpha/vm_machdep.c
View File

@ -415,6 +415,7 @@ sf_buf_alloc(struct vm_page *m)
mtx_lock(&sf_freelist.sf_lock);
while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
sf_buf_alloc_want++;
mbstat.sf_allocwait++;
error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
"sfbufa", 0);
sf_buf_alloc_want--;

1
sys/amd64/amd64/vm_machdep.c
View File

@ -460,6 +460,7 @@ sf_buf_alloc(struct vm_page *m)
mtx_lock(&sf_freelist.sf_lock);
while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
sf_buf_alloc_want++;
mbstat.sf_allocwait++;
error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
"sfbufa", 0);
sf_buf_alloc_want--;

1
sys/i386/i386/vm_machdep.c
View File

@ -621,6 +621,7 @@ sf_buf_alloc(struct vm_page *m)
}
while ((sf = TAILQ_FIRST(&sf_buf_freelist)) == NULL) {
sf_buf_alloc_want++;
mbstat.sf_allocwait++;
error = msleep(&sf_buf_freelist, &sf_buf_lock, PVM|PCATCH,
"sfbufa", 0);
sf_buf_alloc_want--;

1
sys/ia64/ia64/vm_machdep.c
View File

@ -354,6 +354,7 @@ sf_buf_alloc(struct vm_page *m)
mtx_lock(&sf_freelist.sf_lock);
while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
sf_buf_alloc_want++;
mbstat.sf_allocwait++;
error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
"sfbufa", 0);
sf_buf_alloc_want--;

2
sys/kern/uipc_syscalls.c
View File

@ -1866,6 +1866,7 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
sbunlock(&so->so_snd);
goto done;
}
mbstat.sf_iocnt++;
} else
VM_OBJECT_UNLOCK(obj);
vm_page_unlock_queues();
@ -1875,6 +1876,7 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
* but this wait can be interrupted.
*/
if ((sf = sf_buf_alloc(pg)) == NULL) {
mbstat.sf_allocfail++;
vm_page_lock_queues();
vm_page_unwire(pg, 0);
if (pg->wire_count == 0 && pg->object == NULL)

1
sys/powerpc/aim/vm_machdep.c
View File

@ -269,6 +269,7 @@ sf_buf_alloc(struct vm_page *m)
mtx_lock(&sf_freelist.sf_lock);
while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
sf_buf_alloc_want++;
mbstat.sf_allocwait++;
error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
"sfbufa", 0);
sf_buf_alloc_want--;

1
sys/powerpc/powerpc/vm_machdep.c
View File

@ -269,6 +269,7 @@ sf_buf_alloc(struct vm_page *m)
mtx_lock(&sf_freelist.sf_lock);
while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
sf_buf_alloc_want++;
mbstat.sf_allocwait++;
error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
"sfbufa", 0);
sf_buf_alloc_want--;

1
sys/sparc64/sparc64/vm_machdep.c
View File

@ -396,6 +396,7 @@ sf_buf_alloc(struct vm_page *m)
mtx_lock(&sf_freelist.sf_lock);
while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
sf_buf_alloc_want++;
mbstat.sf_allocwait++;
error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH,
"sfbufa", 0);
sf_buf_alloc_want--;

4
sys/sys/mbuf.h
View File

@ -261,6 +261,10 @@ struct mbstat {
u_int m_clperbuck; /* number of clusters per "bucket" */
/* Number of mbtypes (gives # elems in mbpstat's mb_mbtypes[] array: */
short m_numtypes;
/* XXX: Sendfile stats should eventually move to their own struct */
u_long sf_iocnt; /* times sendfile had to do disk I/O */
u_long sf_allocfail; /* times sfbuf allocation failed */
u_long sf_allocwait; /* times sfbuf allocation had to wait */
};
/*