Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with VFS_PAGES_IO_TRACING. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39566 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2010-11-21 22:28:49 +00:00
parent 12474ac0a5
commit 2757dc8c3a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/system/kernel/fs/vfs.cpp
View File

@ -545,8 +545,8 @@ namespace VFSPagesIOTracing {
class PagesIOTraceEntry : public AbstractTraceEntry {
protected:
PagesIOTraceEntry(struct vnode* vnode, void* cookie, off_t pos,
const iovec* vecs, uint32 count, uint32 flags, size_t bytesRequested,
status_t status, size_t bytesTransferred)
const generic_io_vec* vecs, uint32 count, uint32 flags, generic_size_t bytesRequested,
status_t status, generic_size_t bytesTransferred)
:
fVnode(vnode),
fMountID(vnode->mount->id),
@ -559,26 +559,26 @@ protected:
fStatus(status),
fBytesTransferred(bytesTransferred)
{
fVecs = (iovec*)alloc_tracing_buffer_memcpy(vecs, sizeof(iovec) * count,
fVecs = (generic_io_vec*)alloc_tracing_buffer_memcpy(vecs, sizeof(generic_io_vec) * count,
false);
}
void AddDump(TraceOutput& out, const char* mode)
{
out.Print("vfs pages io %5s: vnode: %p (%ld, %lld), cookie: %p, "
"pos: %lld, size: %lu, vecs: {", mode, fVnode, fMountID, fNodeID,
fCookie, fPos, fBytesRequested);
"pos: %lld, size: %llu, vecs: {", mode, fVnode, fMountID, fNodeID,
fCookie, fPos, (uint64)fBytesRequested);
if (fVecs != NULL) {
for (uint32 i = 0; i < fCount; i++) {
if (i > 0)
out.Print(", ");
out.Print("(%p, %lu)", fVecs[i].iov_base, fVecs[i].iov_len);
out.Print("(%llx, %llu)", (uint64)fVecs[i].base, (uint64)fVecs[i].length);
}
}
out.Print("}, flags: %#lx -> status: %#lx, transferred: %lu",
fFlags, fStatus, fBytesTransferred);
out.Print("}, flags: %#lx -> status: %#lx, transferred: %llu",
fFlags, fStatus, (uint64)fBytesTransferred);
}
protected:
@ -587,20 +587,20 @@ protected:
ino_t fNodeID;
void* fCookie;
off_t fPos;
iovec* fVecs;
generic_io_vec* fVecs;
uint32 fCount;
uint32 fFlags;
size_t fBytesRequested;
generic_size_t fBytesRequested;
status_t fStatus;
size_t fBytesTransferred;
generic_size_t fBytesTransferred;
};
class ReadPages : public PagesIOTraceEntry {
public:
ReadPages(struct vnode* vnode, void* cookie, off_t pos,
const iovec* vecs, uint32 count, uint32 flags, size_t bytesRequested,
status_t status, size_t bytesTransferred)
const generic_io_vec* vecs, uint32 count, uint32 flags, generic_size_t bytesRequested,
status_t status, generic_size_t bytesTransferred)
:
PagesIOTraceEntry(vnode, cookie, pos, vecs, count, flags,
bytesRequested, status, bytesTransferred)
@ -618,8 +618,8 @@ public:
class WritePages : public PagesIOTraceEntry {
public:
WritePages(struct vnode* vnode, void* cookie, off_t pos,
const iovec* vecs, uint32 count, uint32 flags, size_t bytesRequested,
status_t status, size_t bytesTransferred)
const generic_io_vec* vecs, uint32 count, uint32 flags, generic_size_t bytesRequested,
status_t status, generic_size_t bytesTransferred)
:
PagesIOTraceEntry(vnode, cookie, pos, vecs, count, flags,
bytesRequested, status, bytesTransferred)