* Added tracing for vfs_{read,write}_pages).

* {read,write}_pages() use vfs_{read,write}_pages() now, instead of
  invoking the FS {read,write}_pages() hooks.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26750 a95241bf-73f2-0310-859d-f6bbb57e9c96

build/config_headers/tracing_config.h

@@ -38,6 +38,7 @@
 #define TCP_TRACING								0
 #define TEAM_TRACING							0
 #define USER_MALLOC_TRACING						0
+#define VFS_PAGES_IO_TRACING					0
 #define VM_CACHE_TRACING						0
 #define WAIT_FOR_OBJECTS_TRACING				0
 

src/system/kernel/fs/vfs.cpp

@@ -43,6 +43,7 @@
 #include <low_resource_manager.h>
 #include <syscalls.h>
 #include <syscall_restart.h>
+#include <tracing.h>
 #include <util/AutoLock.h>
 #include <util/atomic.h>
 #include <vfs.h>
@@ -496,6 +497,109 @@ private:
 };
 
 
+#if VFS_PAGES_IO_TRACING
+
+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)
+		:
+		fVnode(vnode),
+		fMountID(vnode->mount->id),
+		fNodeID(vnode->id),
+		fCookie(cookie),
+		fPos(pos),
+		fCount(count),
+		fFlags(flags),
+		fBytesRequested(bytesRequested),
+		fStatus(status),
+		fBytesTransferred(bytesTransferred)
+	{
+		fVecs = (iovec*)alloc_tracing_buffer_memcpy(vecs, sizeof(iovec) * 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);
+
+		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("}, flags: %#lx -> status: %#lx, transferred: %lu",
+			fFlags, fStatus, fBytesTransferred);
+	}
+
+protected:
+	struct vnode*	fVnode;
+	dev_t			fMountID;
+	ino_t			fNodeID;
+	void*			fCookie;
+	off_t			fPos;
+	iovec*			fVecs;
+	uint32			fCount;
+	uint32			fFlags;
+	size_t			fBytesRequested;
+	status_t		fStatus;
+	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)
+		:
+		PagesIOTraceEntry(vnode, cookie, pos, vecs, count, flags,
+			bytesRequested, status, bytesTransferred)
+	{
+		Initialized();
+	}
+
+	virtual void AddDump(TraceOutput& out)
+	{
+		PagesIOTraceEntry::AddDump(out, "read");
+	}
+};
+
+
+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)
+		:
+		PagesIOTraceEntry(vnode, cookie, pos, vecs, count, flags,
+			bytesRequested, status, bytesTransferred)
+	{
+		Initialized();
+	}
+
+	virtual void AddDump(TraceOutput& out)
+	{
+		PagesIOTraceEntry::AddDump(out, "write");
+	}
+};
+
+}	// namespace VFSPagesIOTracing
+
+#	define TPIO(x) new(std::nothrow) VFSPagesIOTracing::x;
+#else
+#	define TPIO(x) ;
+#endif	// VFS_PAGES_IO_TRACING
+
+
 static int
 mount_compare(void *_m, const void *_key)
 {
@@ -3321,8 +3425,8 @@ read_pages(int fd, off_t pos, const iovec *vecs, size_t count,
 	if (descriptor == NULL)
 		return B_FILE_ERROR;
 
-	status_t status = FS_CALL(vnode, read_pages, descriptor->cookie, pos, vecs,
+	status_t status = vfs_read_pages(vnode, descriptor->cookie, pos, vecs,
-		count, _numBytes);
+		count, 0, _numBytes);
 
 	put_fd(descriptor);
 	return status;
@@ -3340,8 +3444,8 @@ write_pages(int fd, off_t pos, const iovec *vecs, size_t count,
 	if (descriptor == NULL)
 		return B_FILE_ERROR;
 
-	status_t status = FS_CALL(vnode, write_pages, descriptor->cookie, pos, vecs,
+	status_t status = vfs_write_pages(vnode, descriptor->cookie, pos, vecs,
-		count, _numBytes);
+		count, 0, _numBytes);
 
 	put_fd(descriptor);
 	return status;
@@ -3923,6 +4027,10 @@ vfs_read_pages(struct vnode *vnode, void *cookie, off_t pos, const iovec *vecs,
 	FUNCTION(("vfs_read_pages: vnode %p, vecs %p, pos %Ld\n", vnode, vecs,
 		pos));
 
+#if VFS_PAGES_IO_TRACING
+	size_t bytesRequested = *_numBytes;
+#endif
+
 	IORequest request;
 	status_t status = request.Init(pos, vecs, count, *_numBytes, false, flags);
 	if (status == B_OK) {
@@ -3932,6 +4040,9 @@ vfs_read_pages(struct vnode *vnode, void *cookie, off_t pos, const iovec *vecs,
 		*_numBytes = request.TransferredBytes();
 	}
 
+	TPIO(ReadPages(vnode, cookie, pos, vecs, count, flags, bytesRequested,
+		status, *_numBytes));
+
 	return status;
 }
 
@@ -3943,6 +4054,10 @@ vfs_write_pages(struct vnode *vnode, void *cookie, off_t pos, const iovec *vecs,
 	FUNCTION(("vfs_write_pages: vnode %p, vecs %p, pos %Ld\n", vnode, vecs,
 		pos));
 
+#if VFS_PAGES_IO_TRACING
+	size_t bytesRequested = *_numBytes;
+#endif
+
 	IORequest request;
 	status_t status = request.Init(pos, vecs, count, *_numBytes, true, flags);
 	if (status == B_OK) {
@@ -3952,6 +4067,9 @@ vfs_write_pages(struct vnode *vnode, void *cookie, off_t pos, const iovec *vecs,
 		*_numBytes = request.TransferredBytes();
 	}
 
+	TPIO(WritePages(vnode, cookie, pos, vecs, count, flags, bytesRequested,
+		status, *_numBytes));
+
 	return status;
 }