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

OS X does not support write() with shared memory

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-28 16:29:12 +05:30
parent 03dd6e0490
commit b644d4620a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/graphics.c
View File

@ -456,12 +456,20 @@ W(image_for_client_id) {
return image_as_dict(img);
}
W(shm_open) {
char *name;
PA("s", &name);
W(shm_write) {
const char *name, *data;
Py_ssize_t sz;
PA("ss#", &name, &data, &sz);
int fd = shm_open(name, O_CREAT | O_RDWR, S_IROTH | S_IRUSR | S_IRGRP | S_IWUSR);
if (fd == -1) { PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); return NULL; }
return PyLong_FromLong(fd);
int ret = ftruncate(fd, sz);
if (ret != 0) { PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); return NULL; }
void *addr = mmap(0, sz, PROT_WRITE, MAP_SHARED, fd, 0);
if (addr == MAP_FAILED) { PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); return NULL; }
memcpy(addr, data, sz);
if (munmap(addr, sz) != 0) { PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); return NULL; }
close(fd);
Py_RETURN_NONE;
}
W(shm_unlink) {
@ -476,7 +484,7 @@ W(shm_unlink) {
static PyMethodDef methods[] = {
M(image_for_client_id, METH_O),
M(shm_open, METH_VARARGS),
M(shm_write, METH_VARARGS),
M(shm_unlink, METH_VARARGS),
{NULL} /* Sentinel */
};

4
kitty_tests/graphics.py
View File

@ -89,8 +89,6 @@ class TestGraphics(BaseTest):
# Test loading from POSIX SHM
name = '/kitty-test-shm'
fd = g.shm_open(name)
f = os.fdopen(fd, 'wb')
f.write(random_data), f.flush(), f.close()
g.shm_write(name, random_data)
sl(name, s=24, v=32, t='s', expecting_data=random_data)
self.assertRaises(FileNotFoundError, g.shm_unlink, name) # check that file was deleted