Merged revisions 76108 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76108 | antoine.pitrou | 2009-11-04 20:25:14 +0100 (mer., 04 nov. 2009) | 6 lines

  Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent
  objects on 64-bit systems.  Patch by Michael Broghton.

  I will revert this checkin if it causes problems on our BSD buildbots.
........

diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py
index 5ba21a2765ea5533ecb4eae03ff4b38f56f963e2..3d0428efa19a79623de2c063e29016cb0d0df8b2 100644 (file)
--- a/Lib/test/test_kqueue.py
+++ b/Lib/test/test_kqueue.py
@@ -71,6 +71,17 @@ class TestKQueue(unittest.TestCase):
         self.assertEqual(ev, ev)
         self.assertNotEqual(ev, other)
 
+        bignum = sys.maxsize * 2 + 1
+        ev = select.kevent(bignum, 1, 2, 3, sys.maxsize, bignum)
+        self.assertEqual(ev.ident, bignum)
+        self.assertEqual(ev.filter, 1)
+        self.assertEqual(ev.flags, 2)
+        self.assertEqual(ev.fflags, 3)
+        self.assertEqual(ev.data, sys.maxsize)
+        self.assertEqual(ev.udata, bignum)
+        self.assertEqual(ev, ev)
+        self.assertNotEqual(ev, other)
+
     def test_queue_event(self):
         serverSocket = socket.socket()
         serverSocket.bind(('127.0.0.1', 0))

diff --git a/Misc/ACKS b/Misc/ACKS
index 2ae8342760f47eee182139e3d7560cdf4eeb5241..7ea387b0167f3d468f66383696861ae6cd4a519c 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -95,6 +95,7 @@ Terrence Brannon
 Dave Brennan
 Tom Bridgman
 Richard Brodie
+Michael Broghton
 Daniel Brotsky
 Jean Brouwers
 Gary S. Brown

diff --git a/Misc/NEWS b/Misc/NEWS
index 1630ee0736755b0c1df853425db2434987aac34c..57a188c0af21eb6135f72feb005209047eb60eea 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,9 @@ C-API
 Library
 -------
 
+- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent
+  objects on 64-bit systems.  Patch by Michael Broghton.
+
 - Issue #6896: mailbox.Maildir now invalidates its internal cache each time
   a modification is done through it.  This fixes inconsistencies and test
   failures on systems with slightly bogus mtime behaviour.

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index bb24f14c047782c3002aedfa4742d8e46c82d603..3820bbbe735ddfb0058739050d3179cc8030d4b7 100644 (file)
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -1199,6 +1199,30 @@ static PyTypeObject kqueue_queue_Type;
 
 #define kqueue_queue_Check(op) (PyObject_TypeCheck((op), &kqueue_queue_Type))
 
+#if (SIZEOF_UINTPTR_T != SIZEOF_VOID_P)
+#   error uintptr_t does not match void *!
+#elif (SIZEOF_UINTPTR_T == SIZEOF_LONG_LONG)
+#   define T_UINTPTRT         T_ULONGLONG
+#   define T_INTPTRT          T_LONGLONG
+#   define PyLong_AsUintptr_t PyLong_AsUnsignedLongLong
+#   define UINTPTRT_FMT_UNIT  "K"
+#   define INTPTRT_FMT_UNIT   "L"
+#elif (SIZEOF_UINTPTR_T == SIZEOF_LONG)
+#   define T_UINTPTRT         T_ULONG
+#   define T_INTPTRT          T_LONG
+#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
+#   define UINTPTRT_FMT_UNIT  "k"
+#   define INTPTRT_FMT_UNIT   "l"
+#elif (SIZEOF_UINTPTR_T == SIZEOF_INT)
+#   define T_UINTPTRT         T_UINT
+#   define T_INTPTRT          T_INT
+#   define PyLong_AsUintptr_t PyLong_AsUnsignedLong
+#   define UINTPTRT_FMT_UNIT  "I"
+#   define INTPTRT_FMT_UNIT   "i"
+#else
+#   error uintptr_t does not match int, long, or long long!
+#endif
+
 /* Unfortunately, we can't store python objects in udata, because
  * kevents in the kernel can be removed without warning, which would
  * forever lose the refcount on the object stored with it.
@@ -1206,12 +1230,12 @@ static PyTypeObject kqueue_queue_Type;
 
 #define KQ_OFF(x) offsetof(kqueue_event_Object, x)
 static struct PyMemberDef kqueue_event_members[] = {
-       {"ident",       T_UINT,         KQ_OFF(e.ident)},
+       {"ident",       T_UINTPTRT,     KQ_OFF(e.ident)},
        {"filter",      T_SHORT,        KQ_OFF(e.filter)},
        {"flags",       T_USHORT,       KQ_OFF(e.flags)},
        {"fflags",      T_UINT,         KQ_OFF(e.fflags)},
-       {"data",        T_INT,          KQ_OFF(e.data)},
-       {"udata",       T_INT,          KQ_OFF(e.udata)},
+       {"data",        T_INTPTRT,      KQ_OFF(e.data)},
+       {"udata",       T_UINTPTRT,     KQ_OFF(e.udata)},
        {NULL} /* Sentinel */
 };
 #undef KQ_OFF
@@ -1222,11 +1246,11 @@ kqueue_event_repr(kqueue_event_Object *s)
        char buf[1024];
        PyOS_snprintf(
                buf, sizeof(buf),
-               "<select.kevent ident=%lu filter=%d flags=0x%x fflags=0x%x "
-               "data=0x%lx udata=%p>",
-               (unsigned long)(s->e.ident), s->e.filter, s->e.flags,
-               s->e.fflags, (long)(s->e.data), s->e.udata);
-       return PyBytes_FromString(buf);
+               "<select.kevent ident=%zu filter=%d flags=0x%x fflags=0x%x "
+               "data=0x%zd udata=%p>",
+               (size_t)(s->e.ident), s->e.filter, s->e.flags,
+               s->e.fflags, (Py_ssize_t)(s->e.data), s->e.udata);
+       return PyUnicode_FromString(buf);
 }
 
 static int
@@ -1235,17 +1259,23 @@ kqueue_event_init(kqueue_event_Object *self, PyObject *args, PyObject *kwds)
        PyObject *pfd;
        static char *kwlist[] = {"ident", "filter", "flags", "fflags",
                                 "data", "udata", NULL};
+       static char *fmt = "O|hhi" INTPTRT_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
 
        EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
        
-       if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|hhiii:kevent", kwlist,
+       if (!PyArg_ParseTupleAndKeywords(args, kwds, fmt, kwlist,
                &pfd, &(self->e.filter), &(self->e.flags),
                &(self->e.fflags), &(self->e.data), &(self->e.udata))) {
                return -1;
        }
 
-       self->e.ident = PyObject_AsFileDescriptor(pfd);
-       if (self->e.ident == -1) {
+       if (PyLong_Check(pfd)) {
+               self->e.ident = PyLong_AsUintptr_t(pfd);
+       }
+       else {
+               self->e.ident = PyObject_AsFileDescriptor(pfd);
+       }
+       if (PyErr_Occurred()) {
                return -1;
        }
        return 0;
@@ -1255,7 +1285,7 @@ static PyObject *
 kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o,
                         int op)
 {
-       int result = 0;
+       Py_intptr_t result = 0;
 
        if (!kqueue_event_Check(o)) {
                if (op == Py_EQ || op == Py_NE) {
@@ -1298,7 +1328,7 @@ kqueue_event_richcompare(kqueue_event_Object *s, kqueue_event_Object *o,
                result = (result > 0);
                break;
        }
-       return PyBool_FromLong(result);
+       return PyBool_FromLong((long)result);
 }
 
 static PyTypeObject kqueue_event_Type = {