Mercurial > hg
view setup_osutil_cffi.py @ 30102:a8c948ee3668
pathencode: use Py_SIZE directly
On Python 2, PyBytes_GET_SIZE is the same as PyString_GET_SIZE which
is the same as Py_SIZE which resolves to a struct member.
On Python 3, PyBytes_GET_SIZE is
"(assert(PyBytes_Check(op)),Py_SIZE(op))". The compiler barfs when
assigning to this version.
This patch simply changes PyBytes_GET_SIZE to Py_SIZE. On Python 2,
there is no effective change in behavior. On Python 3, we drop the
PyBytes_Check(). However, in all cases we have explicitly created
a PyBytesObject in the same function, so the PyBytes_Check() is
guaranteed to be true. Despite this, code changes over time, so
I've added added assert() in all callers so we can catch this in
debug builds.
With this patch, all mercurial.* C extensions now compile on Python 3
on my OS X machine. There are several compiler warnings and I'm sure
there are incompatibilities with Python 3, including possibly
segfaults. But it is a milestone.
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sat, 08 Oct 2016 22:21:22 +0200 |
parents | a043c6d372db |
children |
line wrap: on
line source
from __future__ import absolute_import import cffi ffi = cffi.FFI() ffi.set_source("_osutil_cffi", """ #include <sys/attr.h> #include <sys/vnode.h> #include <unistd.h> #include <fcntl.h> #include <time.h> typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; fsobj_type_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; } __attribute__((aligned(4), packed)) val_attrs_t; """, include_dirs=['mercurial']) ffi.cdef(''' typedef uint32_t attrgroup_t; typedef struct attrlist { uint16_t bitmapcount; /* number of attr. bit sets in list */ uint16_t reserved; /* (to maintain 4-byte alignment) */ attrgroup_t commonattr; /* common attribute group */ attrgroup_t volattr; /* volume attribute group */ attrgroup_t dirattr; /* directory attribute group */ attrgroup_t fileattr; /* file attribute group */ attrgroup_t forkattr; /* fork attribute group */ ...; }; typedef struct attribute_set { ...; } attribute_set_t; typedef struct attrreference { int attr_dataoffset; int attr_length; ...; } attrreference_t; typedef int ... off_t; typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; uint32_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; ...; } val_attrs_t; /* the exact layout of the above struct will be figured out during build time */ typedef int ... time_t; typedef struct timespec { time_t tv_sec; ...; }; int getattrlist(const char* path, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, unsigned int options); int getattrlistbulk(int dirfd, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, uint64_t options); #define ATTR_BIT_MAP_COUNT ... #define ATTR_CMN_NAME ... #define ATTR_CMN_OBJTYPE ... #define ATTR_CMN_MODTIME ... #define ATTR_CMN_ACCESSMASK ... #define ATTR_CMN_ERROR ... #define ATTR_CMN_RETURNED_ATTRS ... #define ATTR_FILE_DATALENGTH ... #define VREG ... #define VDIR ... #define VLNK ... #define VBLK ... #define VCHR ... #define VFIFO ... #define VSOCK ... #define S_IFMT ... int open(const char *path, int oflag, int perm); int close(int); #define O_RDONLY ... ''') if __name__ == '__main__': ffi.compile()