RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:37:45 +00:00
Code Issues Activity Actions

Greatly improve /proc/PID/stack by tracing the ebp frame chain.

Browse source 
I also added a generator cache to FileHandle. This way, multiple
reads to a generated file (i.e in a synthfs) can transparently
handle multiple calls to read() without the contents changing
between calls.

The cache is discarded at EOF (or when the FileHandle is destroyed.)
This commit is contained in:
Andreas Kling 2018-10-27 00:14:24 +02:00
parent c928b06218
commit 2716a9e2d7
22 changed files with 210 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

3
VirtualFileSystem/Ext2FileSystem.cpp
View file

@ -268,7 +268,7 @@ Vector<unsigned> Ext2FileSystem::blockListForInode(const ext2_inode& e2inode) co
return list;
}
Unix::ssize_t Ext2FileSystem::readInodeBytes(InodeIdentifier inode, Unix::off_t offset, Unix::size_t count, byte* buffer) const
Unix::ssize_t Ext2FileSystem::readInodeBytes(InodeIdentifier inode, Unix::off_t offset, Unix::size_t count, byte* buffer, FileHandle*) const
{
ASSERT(offset >= 0);
ASSERT(inode.fileSystemID() == id());
@ -293,6 +293,7 @@ Unix::ssize_t Ext2FileSystem::readInodeBytes(InodeIdentifier inode, Unix::off_t
static const unsigned maxInlineSymlinkLength = 60;
if (isSymbolicLink(e2inode->i_mode) && e2inode->i_size < maxInlineSymlinkLength) {
Unix::ssize_t nread = min((Unix::off_t)e2inode->i_size - offset, static_cast<Unix::off_t>(count));
kprintf("nread = %d\n", nread);
memcpy(buffer, e2inode->i_block + offset, nread);
return nread;
}

2
VirtualFileSystem/Ext2FileSystem.h
View file

@ -44,7 +44,7 @@ private:
virtual InodeMetadata inodeMetadata(InodeIdentifier) const override;
virtual bool setModificationTime(InodeIdentifier, dword timestamp) override;
virtual InodeIdentifier createInode(InodeIdentifier parentInode, const String& name, Unix::mode_t, unsigned size) override;
virtual Unix::ssize_t readInodeBytes(InodeIdentifier, Unix::off_t offset, Unix::size_t count, byte* buffer) const override;
virtual Unix::ssize_t readInodeBytes(InodeIdentifier, Unix::off_t offset, Unix::size_t count, byte* buffer, FileHandle*) const override;
virtual InodeIdentifier makeDirectory(InodeIdentifier parentInode, const String& name, Unix::mode_t) override;
bool isDirectoryInode(unsigned) const;

4
VirtualFileSystem/FileHandle.cpp
View file

@ -102,7 +102,7 @@ Unix::ssize_t FileHandle::read(byte* buffer, Unix::size_t count)
// FIXME: What should happen to m_currentOffset?
return m_vnode->characterDevice()->read(buffer, count);
}
Unix::ssize_t nread = m_vnode->fileSystem()->readInodeBytes(m_vnode->inode, m_currentOffset, count, buffer);
Unix::ssize_t nread = m_vnode->fileSystem()->readInodeBytes(m_vnode->inode, m_currentOffset, count, buffer, this);
m_currentOffset += nread;
return nread;
}
@ -125,7 +125,7 @@ ByteBuffer FileHandle::readEntireFile()
return buffer;
}
return m_vnode->fileSystem()->readEntireInode(m_vnode->inode);
return m_vnode->fileSystem()->readEntireInode(m_vnode->inode, this);
}
bool FileHandle::isDirectory() const

4
VirtualFileSystem/FileHandle.h
View file

@ -32,6 +32,8 @@ public:
void setBlocking(bool b) { m_isBlocking = b; }
#endif
ByteBuffer& generatorCache() { return m_generatorCache; }
private:
friend class VirtualFileSystem;
@ -39,6 +41,8 @@ private:
Unix::off_t m_currentOffset { 0 };
ByteBuffer m_generatorCache;
#ifdef SERENITY
int m_fd { -1 };
bool m_isBlocking { true };

4
VirtualFileSystem/FileSystem.cpp
View file

@ -50,7 +50,7 @@ InodeIdentifier FileSystem::childOfDirectoryInodeWithName(InodeIdentifier inode,
return foundInode;
}
ByteBuffer FileSystem::readEntireInode(InodeIdentifier inode) const
ByteBuffer FileSystem::readEntireInode(InodeIdentifier inode, FileHandle* handle) const
{
ASSERT(inode.fileSystemID() == id());
@ -67,7 +67,7 @@ ByteBuffer FileSystem::readEntireInode(InodeIdentifier inode) const
byte* out = contents.pointer();
Unix::off_t offset = 0;
for (;;) {
nread = readInodeBytes(inode, offset, sizeof(buffer), buffer);
nread = readInodeBytes(inode, offset, sizeof(buffer), buffer, handle);
if (nread <= 0)
break;
memcpy(out, buffer, nread);

6
VirtualFileSystem/FileSystem.h
View file

@ -16,6 +16,8 @@
static const dword mepoch = 476763780;
class FileHandle;
class FileSystem : public Retainable<FileSystem> {
public:
static void initializeGlobals();
@ -30,7 +32,7 @@ public:
virtual bool writeInode(InodeIdentifier, const ByteBuffer&) = 0;
virtual InodeMetadata inodeMetadata(InodeIdentifier) const = 0;
virtual Unix::ssize_t readInodeBytes(InodeIdentifier, Unix::off_t offset, Unix::size_t count, byte* buffer) const = 0;
virtual Unix::ssize_t readInodeBytes(InodeIdentifier, Unix::off_t offset, Unix::size_t count, byte* buffer, FileHandle*) const = 0;
struct DirectoryEntry {
String name;
@ -44,7 +46,7 @@ public:
virtual InodeIdentifier makeDirectory(InodeIdentifier parentInode, const String& name, Unix::mode_t) = 0;
InodeIdentifier childOfDirectoryInodeWithName(InodeIdentifier, const String& name) const;
ByteBuffer readEntireInode(InodeIdentifier) const;
ByteBuffer readEntireInode(InodeIdentifier, FileHandle* = nullptr) const;
protected:
FileSystem();

2
VirtualFileSystem/InodeIdentifier.cpp
View file

@ -5,5 +5,5 @@ ByteBuffer InodeIdentifier::readEntireFile() const
{
if (!fileSystem())
return { };
return fileSystem()->readEntireInode(*this);
return fileSystem()->readEntireInode(*this, nullptr);
}

16
VirtualFileSystem/SyntheticFileSystem.cpp
View file

@ -1,4 +1,5 @@
#include "SyntheticFileSystem.h"
#include "FileHandle.h"
#include <AK/StdLib.h>
//#define SYNTHFS_DEBUG
@ -188,7 +189,7 @@ bool SyntheticFileSystem::writeInode(InodeIdentifier, const ByteBuffer&)
return false;
}
Unix::ssize_t SyntheticFileSystem::readInodeBytes(InodeIdentifier inode, Unix::off_t offset, Unix::size_t count, byte* buffer) const
Unix::ssize_t SyntheticFileSystem::readInodeBytes(InodeIdentifier inode, Unix::off_t offset, Unix::size_t count, byte* buffer, FileHandle* handle) const
{
InterruptDisabler disabler;
@ -204,12 +205,21 @@ Unix::ssize_t SyntheticFileSystem::readInodeBytes(InodeIdentifier inode, Unix::o
return false;
const File& file = *(*it).value;
ByteBuffer generatedData;
if (file.generator)
generatedData = file.generator();
if (file.generator) {
if (!handle) {
generatedData = file.generator();
} else {
if (!handle->generatorCache())
handle->generatorCache() = file.generator();
generatedData = handle->generatorCache();
}
}
auto* data = generatedData ? &generatedData : &file.data;
Unix::ssize_t nread = min(static_cast<Unix::off_t>(data->size() - offset), static_cast<Unix::off_t>(count));
memcpy(buffer, data->pointer() + offset, nread);
if (nread == 0 && handle && handle->generatorCache())
handle->generatorCache().clear();
return nread;
}

2
VirtualFileSystem/SyntheticFileSystem.h
View file

@ -17,7 +17,7 @@ public:
virtual InodeMetadata inodeMetadata(InodeIdentifier) const override;
virtual bool setModificationTime(InodeIdentifier, dword timestamp) override;
virtual InodeIdentifier createInode(InodeIdentifier parentInode, const String& name, Unix::mode_t, unsigned size) override;
virtual Unix::ssize_t readInodeBytes(InodeIdentifier, Unix::off_t offset, Unix::size_t count, byte* buffer) const override;
virtual Unix::ssize_t readInodeBytes(InodeIdentifier, Unix::off_t offset, Unix::size_t count, byte* buffer, FileHandle*) const override;
virtual InodeIdentifier makeDirectory(InodeIdentifier parentInode, const String& name, Unix::mode_t) override;
protected: