vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llama_mmap::align_offset : use pointers instead of references for out parameters

Browse source
This commit is contained in:
slaren 2023-12-20 22:07:09 +01:00
parent 6c045a86ed
commit 5834a25345
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
llama.cpp
View file

@ -816,18 +816,18 @@ struct llama_mmap {
llama_mmap(const llama_mmap &) = delete; llama_mmap(const llama_mmap &) = delete;
static void align_offset(size_t & offset, size_t & len, size_t page_size) { static void align_offset(size_t * offset, size_t * len, size_t page_size) {
// align offset to the next page // align offset to the next page
size_t offset_in_page = offset & (page_size - 1); size_t offset_in_page = *offset & (page_size - 1);
size_t offset_to_page = offset_in_page == 0 ? 0 : page_size - offset_in_page; size_t offset_to_page = offset_in_page == 0 ? 0 : page_size - offset_in_page;
offset += offset_to_page; *offset += offset_to_page;
if (offset_to_page >= len) { if (offset_to_page >= *len) {
len = 0; *len = 0;
} else { } else {
len -= offset_to_page; *len -= offset_to_page;
// align len to the previous page // align len to the previous page
len -= len & (page_size - 1); *len -= *len & (page_size - 1);
} }
} }
@ -871,7 +871,7 @@ struct llama_mmap {
void unmap(size_t offset, size_t len) { void unmap(size_t offset, size_t len) {
int page_size = sysconf(_SC_PAGESIZE); int page_size = sysconf(_SC_PAGESIZE);
align_offset(offset, len, page_size); align_offset(&offset, &len, page_size);
if (len < (size_t)page_size) { if (len < (size_t)page_size) {
return; return;
} }
@ -940,7 +940,7 @@ struct llama_mmap {
SYSTEM_INFO si; SYSTEM_INFO si;
GetSystemInfo(&si); GetSystemInfo(&si);
DWORD page_size = si.dwAllocationGranularity; DWORD page_size = si.dwAllocationGranularity;
align_offset(offset, len, page_size); align_offset(&offset, &len, page_size);
if (len < (size_t)page_size) { if (len < (size_t)page_size) {
return; return;