RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:28:11 +00:00
Code Issues Activity Actions

SynthFS: Remove unused create_text_file() feature

Browse source 
We don't need to support static text files in SynthFS, it's better to
always use generators for everything.
This commit is contained in:
Andreas Kling 2019-08-05 22:37:50 +02:00
parent 151e6a1818
commit 2d7a993db3
2 changed files with 3 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Kernel/FileSystem/SyntheticFileSystem.cpp
View file

@ -45,19 +45,6 @@ NonnullRefPtr<SynthFSInode> SynthFS::create_directory(String&& name)
return file; return file;
} }
NonnullRefPtr<SynthFSInode> SynthFS::create_text_file(String&& name, ByteBuffer&& contents, mode_t mode)
{
auto file = adopt(*new SynthFSInode(*this, generate_inode_index()));
file->m_data = contents;
file->m_name = move(name);
file->m_metadata.size = file->m_data.value().size();
file->m_metadata.uid = 100;
file->m_metadata.gid = 200;
file->m_metadata.mode = mode;
file->m_metadata.mtime = mepoch;
return file;
}
NonnullRefPtr<SynthFSInode> SynthFS::create_generated_file(String&& name, Function<ByteBuffer(SynthFSInode&)>&& generator, mode_t mode) NonnullRefPtr<SynthFSInode> SynthFS::create_generated_file(String&& name, Function<ByteBuffer(SynthFSInode&)>&& generator, mode_t mode)
{ {
auto file = adopt(*new SynthFSInode(*this, generate_inode_index())); auto file = adopt(*new SynthFSInode(*this, generate_inode_index()));
@ -205,15 +192,9 @@ ssize_t SynthFSInode::read_bytes(off_t offset, ssize_t count, u8* buffer, FileDe
} }
} }
const KBuffer* data_to_use = nullptr; ASSERT(generated_data.has_value());
if (generated_data.has_value()) ssize_t nread = min(static_cast<off_t>(generated_data.value().size() - offset), static_cast<off_t>(count));
data_to_use = &generated_data.value(); memcpy(buffer, generated_data.value().data() + offset, nread);
else if (m_data.has_value())
data_to_use = &m_data.value();
else
ASSERT_NOT_REACHED();
ssize_t nread = min(static_cast<off_t>(data_to_use->size() - offset), static_cast<off_t>(count));
memcpy(buffer, data_to_use->data() + offset, nread);
if (nread == 0 && description && description->generator_cache()) if (nread == 0 && description && description->generator_cache())
description->generator_cache().clear(); description->generator_cache().clear();
return nread; return nread;

2
Kernel/FileSystem/SyntheticFileSystem.h
View file

@ -29,7 +29,6 @@ protected:
SynthFS(); SynthFS();
NonnullRefPtr<SynthFSInode> create_directory(String&& name); NonnullRefPtr<SynthFSInode> create_directory(String&& name);
NonnullRefPtr<SynthFSInode> create_text_file(String&& name, ByteBuffer&&, mode_t = 0010644);
NonnullRefPtr<SynthFSInode> create_generated_file(String&& name, Function<ByteBuffer(SynthFSInode&)>&&, mode_t = 0100644); NonnullRefPtr<SynthFSInode> create_generated_file(String&& name, Function<ByteBuffer(SynthFSInode&)>&&, mode_t = 0100644);
NonnullRefPtr<SynthFSInode> create_generated_file(String&& name, Function<ByteBuffer(SynthFSInode&)>&&, Function<ssize_t(SynthFSInode&, const ByteBuffer&)>&&, mode_t = 0100644); NonnullRefPtr<SynthFSInode> create_generated_file(String&& name, Function<ByteBuffer(SynthFSInode&)>&&, Function<ssize_t(SynthFSInode&, const ByteBuffer&)>&&, mode_t = 0100644);
@ -76,7 +75,6 @@ private:
String m_name; String m_name;
InodeIdentifier m_parent; InodeIdentifier m_parent;
Optional<KBuffer> m_data;
Function<KBuffer(SynthFSInode&)> m_generator; Function<KBuffer(SynthFSInode&)> m_generator;
Function<ssize_t(SynthFSInode&, const ByteBuffer&)> m_write_callback; Function<ssize_t(SynthFSInode&, const ByteBuffer&)> m_write_callback;
Vector<SynthFSInode*> m_children; Vector<SynthFSInode*> m_children;