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

Kernel: Merge the shbuf_get_size() syscall into shbuf_get()

Browse source 
Add an extra out-parameter to shbuf_get() that receives the size of the
shared buffer. That way we don't need to make a separate syscall to
get the size, which we always did immediately after.
This commit is contained in:
Andreas Kling 2020-02-28 12:29:14 +01:00
parent a1514369d7
commit dcd619bd46
6 changed files with 13 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Kernel/Process.cpp
View file

@ -3634,9 +3634,11 @@ int Process::sys$shbuf_release(int shbuf_id)
return 0;
}
void* Process::sys$shbuf_get(int shbuf_id)
void* Process::sys$shbuf_get(int shbuf_id, size_t* user_size)
{
REQUIRE_PROMISE(shared_buffer);
if (user_size && !validate_write_typed(user_size))
return (void*)-EFAULT;
LOCKER(shared_buffers().lock());
auto it = shared_buffers().resource().find(shbuf_id);
if (it == shared_buffers().resource().end())
@ -3647,6 +3649,10 @@ void* Process::sys$shbuf_get(int shbuf_id)
#ifdef SHARED_BUFFER_DEBUG
kprintf("%s(%u): Retaining shared buffer %d, buffer count: %u\n", name().characters(), pid(), shbuf_id, shared_buffers().resource().size());
#endif
if (user_size) {
size_t size = shared_buffer.size();
copy_to_user(user_size, &size);
}
return shared_buffer.ref_for_process_and_get_address(*this);
}
@ -3667,22 +3673,6 @@ int Process::sys$shbuf_seal(int shbuf_id)
return 0;
}
int Process::sys$shbuf_get_size(int shbuf_id)
{
REQUIRE_PROMISE(shared_buffer);
LOCKER(shared_buffers().lock());
auto it = shared_buffers().resource().find(shbuf_id);
if (it == shared_buffers().resource().end())
return -EINVAL;
auto& shared_buffer = *(*it).value;
if (!shared_buffer.is_shared_with(m_pid))
return -EPERM;
#ifdef SHARED_BUFFER_DEBUG
kprintf("%s(%u): Get shared buffer %d size: %u\n", name().characters(), pid(), shbuf_id, shared_buffers().resource().size());
#endif
return shared_buffer.size();
}
int Process::sys$shbuf_set_volatile(int shbuf_id, bool state)
{
REQUIRE_PROMISE(shared_buffer);