KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Free the mapped file early if possible

Browse Source
This commit is contained in:
Kovid Goyal
2017-09-28 16:58:28 +05:30
parent ef91f9dc8f
commit 898136dbdc
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kitty/graphics.c
View File

@@ -137,11 +137,10 @@ static inline bool
mmap_img_file(GraphicsManager UNUSED *self, Image *img) { mmap_img_file(GraphicsManager UNUSED *self, Image *img) {
struct stat s; struct stat s;
if (fstat(img->load_data.fd, &s) != 0) ABRT(EBADF, "Failed to fstat() SHM file with error: [%d] %s", errno, strerror(errno)); if (fstat(img->load_data.fd, &s) != 0) ABRT(EBADF, "Failed to fstat() SHM file with error: [%d] %s", errno, strerror(errno));
off_t file_sz = s.st_size; void *addr = mmap(0, s.st_size, PROT_READ, MAP_PRIVATE, img->load_data.fd, 0);
void *addr = mmap(0, file_sz, PROT_READ, MAP_PRIVATE, img->load_data.fd, 0);
if (addr == MAP_FAILED) ABRT(EBADF, "Failed to map image file with error: [%d] %s", errno, strerror(errno)); if (addr == MAP_FAILED) ABRT(EBADF, "Failed to map image file with error: [%d] %s", errno, strerror(errno));
img->load_data.mapped_file = addr; img->load_data.mapped_file = addr;
img->load_data.mapped_file_sz = file_sz; img->load_data.mapped_file_sz = s.st_size;
return true; return true;
err: err:
return false; return false;
@@ -378,6 +377,10 @@ handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_
ABRT(ENODATA, "Insufficient image data: %zu < %zu", img->load_data.buf_used, img->load_data.data_sz); ABRT(ENODATA, "Insufficient image data: %zu < %zu", img->load_data.buf_used, img->load_data.data_sz);
img->data_loaded = false; img->data_loaded = false;
} }
if (img->load_data.mapped_file) {
munmap(img->load_data.mapped_file, img->load_data.mapped_file_sz);
img->load_data.mapped_file = NULL; img->load_data.mapped_file_sz = 0;
}
} else { } else {
if (tt == 'd') { if (tt == 'd') {
if (img->load_data.buf_used < img->load_data.data_sz) { if (img->load_data.buf_used < img->load_data.data_sz) {