Move DoubleBuffer to its own files.

This commit is contained in:
Andreas Kling 2018-12-03 01:51:44 +01:00
parent aff89d2fd7
commit bbfae19238
Notes: sideshowbarker 2024-07-19 16:08:55 +09:00
5 changed files with 56 additions and 49 deletions

27
Kernel/DoubleBuffer.cpp Normal file
View file

@ -0,0 +1,27 @@
#include "DoubleBuffer.h"
void DoubleBuffer::flip()
{
ASSERT(m_read_buffer_index == m_read_buffer->size());
swap(m_read_buffer, m_write_buffer);
m_write_buffer->clear();
m_read_buffer_index = 0;
}
ssize_t DoubleBuffer::write(const byte* data, size_t size)
{
m_write_buffer->append(data, size);
return size;
}
ssize_t DoubleBuffer::read(byte* data, size_t size)
{
if (m_read_buffer_index >= m_read_buffer->size() && !m_write_buffer->isEmpty())
flip();
if (m_read_buffer_index >= m_read_buffer->size())
return 0;
ssize_t nread = min(m_read_buffer->size() - m_read_buffer_index, size);
memcpy(data, m_read_buffer->data() + m_read_buffer_index, nread);
m_read_buffer_index += nread;
return nread;
}

27
Kernel/DoubleBuffer.h Normal file
View file

@ -0,0 +1,27 @@
#pragma once
#include <AK/Types.h>
#include <AK/Vector.h>
class DoubleBuffer {
public:
DoubleBuffer()
: m_write_buffer(&m_buffer1)
, m_read_buffer(&m_buffer2)
{
}
ssize_t write(const byte*, size_t);
ssize_t read(byte*, size_t);
bool is_empty() const { return m_read_buffer_index >= m_read_buffer->size() && m_write_buffer->isEmpty(); }
private:
void flip();
Vector<byte>* m_write_buffer { nullptr };
Vector<byte>* m_read_buffer { nullptr };
Vector<byte> m_buffer1;
Vector<byte> m_buffer2;
size_t m_read_buffer_index { 0 };
};

View file

@ -21,6 +21,7 @@ KERNEL_OBJS = \
VirtualConsole.o \
FIFO.o \
Scheduler.o \
DoubleBuffer.o \
ELFImage.o \
ELFLoader.o

View file

@ -6,32 +6,6 @@
//#define TTY_DEBUG
void DoubleBuffer::flip()
{
ASSERT(m_read_buffer_index == m_read_buffer->size());
swap(m_read_buffer, m_write_buffer);
m_write_buffer->clear();
m_read_buffer_index = 0;
}
ssize_t DoubleBuffer::write(const byte* data, size_t size)
{
m_write_buffer->append(data, size);
return size;
}
ssize_t DoubleBuffer::read(byte* data, size_t size)
{
if (m_read_buffer_index >= m_read_buffer->size() && !m_write_buffer->isEmpty())
flip();
if (m_read_buffer_index >= m_read_buffer->size())
return 0;
ssize_t nread = min(m_read_buffer->size() - m_read_buffer_index, size);
memcpy(data, m_read_buffer->data() + m_read_buffer_index, nread);
m_read_buffer_index += nread;
return nread;
}
TTY::TTY(unsigned major, unsigned minor)
: CharacterDevice(major, minor)
{

View file

@ -1,33 +1,11 @@
#pragma once
#include "DoubleBuffer.h"
#include <VirtualFileSystem/CharacterDevice.h>
#include <VirtualFileSystem/UnixTypes.h>
class Process;
class DoubleBuffer {
public:
DoubleBuffer()
: m_write_buffer(&m_buffer1)
, m_read_buffer(&m_buffer2)
{
}
ssize_t write(const byte*, size_t);
ssize_t read(byte*, size_t);
bool is_empty() const { return m_read_buffer_index >= m_read_buffer->size() && m_write_buffer->isEmpty(); }
private:
void flip();
Vector<byte>* m_write_buffer { nullptr };
Vector<byte>* m_read_buffer { nullptr };
Vector<byte> m_buffer1;
Vector<byte> m_buffer2;
size_t m_read_buffer_index { 0 };
};
class TTY : public CharacterDevice {
public:
virtual ~TTY() override;