darlinghq/darlingserver
1
0
Fork 0
mirror of https://github.com/darlinghq/darlingserver.git synced 2024-11-23 12:29:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Thread: Add mapFile call

Browse Source
This commit is contained in:
Ariel Abreu 2022-04-01 02:04:55 -04:00
parent fe6df7af56
commit b4fccbd6dd
No known key found for this signature in database
GPG Key ID: D67AE16CCEA85B70
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal-include/darlingserver/thread.hpp
View File

@ -220,6 +220,7 @@ namespace DarlingServer {
uintptr_t allocatePages(size_t pageCount, int protection, uintptr_t addressHint, bool fixed, bool overwrite);
void freePages(uintptr_t address, size_t pageCount);
uintptr_t mapFile(int fd, size_t pageCount, int protection, uintptr_t addressHint, size_t pageOffset, bool fixed, bool overwrite);
void changeProtection(uintptr_t address, size_t pageCount, int protection);
void defer(bool wait = false);

30
src/thread.cpp
View File

@ -964,7 +964,7 @@ uintptr_t DarlingServer::Thread::_mmap(uintptr_t address, size_t length, int pro
}
#endif
Message callMessage(sizeof(dserver_s2c_call_mmap_t), 0);
Message callMessage(sizeof(dserver_s2c_call_mmap_t), (fd < 0) ? 0 : 1);
auto call = reinterpret_cast<dserver_s2c_call_mmap_t*>(callMessage.data().data());
call->header.call_number = dserver_callnum_s2c;
@ -973,10 +973,19 @@ uintptr_t DarlingServer::Thread::_mmap(uintptr_t address, size_t length, int pro
call->length = length;
call->protection = protection;
call->flags = flags;
call->fd = fd;
call->fd = (fd < 0) ? -1 : 0;
call->offset = offset;
s2cLog.debug() << "Performing _mmap with address=" << call->address << ", length=" << call->length << ", protection=" << call->protection << ", flags=" << call->flags << ", fd=" << call->fd << ", offset=" << call->offset << s2cLog.endLog;
if (fd >= 0) {
auto dupfd = dup(fd);
if (dupfd < 0) {
outErrno = errno;
return (uintptr_t)MAP_FAILED;
}
callMessage.pushDescriptor(dupfd);
}
s2cLog.debug() << "Performing _mmap with address=" << call->address << ", length=" << call->length << ", protection=" << call->protection << ", flags=" << call->flags << ", fd=" << call->fd << " (" << fd << ")" << ", offset=" << call->offset << s2cLog.endLog;
auto replyMessage = _s2cPerform(std::move(callMessage), dserver_s2c_msgnum_mmap, sizeof(dserver_s2c_reply_mmap_t));
auto reply = reinterpret_cast<dserver_s2c_reply_mmap_t*>(replyMessage.data().data());
@ -1050,6 +1059,21 @@ void DarlingServer::Thread::freePages(uintptr_t address, size_t pageCount) {
}
};
uintptr_t DarlingServer::Thread::mapFile(int fd, size_t pageCount, int protection, uintptr_t addressHint, size_t pageOffset, bool fixed, bool overwrite) {
int err = 0;
int flags = MAP_SHARED;
if (fixed && overwrite) {
flags |= MAP_FIXED;
} else if (fixed) {
flags |= MAP_FIXED_NOREPLACE;
}
auto result = _mmap(addressHint, pageCount * sysconf(_SC_PAGESIZE), protection, flags, fd, pageOffset * sysconf(_SC_PAGESIZE), err);
if (result == (uintptr_t)MAP_FAILED) {
throw std::system_error(err, std::generic_category(), "S2C mmap call failed");
}
return result;
};
void DarlingServer::Thread::changeProtection(uintptr_t address, size_t pageCount, int protection) {
int err = 0;
if (_mprotect(address, pageCount * sysconf(_SC_PAGESIZE), protection, err) < 0) {