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

Paper over a race in DoubleBuffer.

Browse source 
I'm still somewhat okay throwing InterruptDisabler at races as they screw me.
Eventually I'm gonna have to devise a different strategy though.
This commit is contained in:
Andreas Kling 2019-01-12 23:23:35 +01:00
parent 2e2d883c09
commit 3ac977f50b
4 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/DoubleBuffer.cpp
View file

@ -2,9 +2,13 @@
void DoubleBuffer::flip()
{
InterruptDisabler disabler;
ASSERT(m_read_buffer_index == m_read_buffer->size());
swap(m_read_buffer, m_write_buffer);
m_write_buffer->clear();
if (m_write_buffer->capacity() < 32)
m_write_buffer->clear_with_capacity();
else
m_write_buffer->clear();
m_read_buffer_index = 0;
}

2
Kernel/kmalloc.cpp
View file

@ -90,7 +90,7 @@ void* kmalloc_page_aligned(size_t size)
return ptr;
}
void* kmalloc(dword size)
void* kmalloc_impl(dword size)
{
InterruptDisabler disabler;

10
Kernel/kmalloc.h
View file

@ -1,7 +1,7 @@
#pragma once
void kmalloc_init();
void *kmalloc(dword size) __attribute__ ((malloc));
void* kmalloc_impl(dword size) __attribute__ ((malloc));
void* kmalloc_eternal(size_t) __attribute__ ((malloc));
void* kmalloc_page_aligned(size_t) __attribute__ ((malloc));
void* kmalloc_aligned(size_t, size_t alignment) __attribute__ ((malloc));
@ -17,3 +17,11 @@ extern volatile size_t kmalloc_sum_page_aligned;
inline void* operator new(size_t, void* p) { return p; }
inline void* operator new[](size_t, void* p) { return p; }
ALWAYS_INLINE void* kmalloc(size_t size)
{
// Any kernel allocation >= 32K is very suspicious, catch them.
if (size >= 0x8000)
asm volatile("cli;hlt");
return kmalloc_impl(size);
}