selectmodule.c (original) (raw)

ronald.oussoren python-checkins at python.org
Sun Apr 23 14:36:24 CEST 2006

Previous message: [Python-checkins] r45660 - python/trunk/Modules/posixmodule.c python/trunk/Modules/socketmodule.c python/trunk/Modules/timemodule.c
Next message: [Python-checkins] buildbot warnings in x86 cygwin trunk
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Author: ronald.oussoren Date: Sun Apr 23 14:36:23 2006 New Revision: 45661

Modified: python/trunk/Modules/selectmodule.c Log: Patch 1471761 - test for broken poll at runtime

This patch checks if poll is broken when the select module is loaded instead of doing so at configure-time. This functionality is only active on Mac OS X.

Modified: python/trunk/Modules/selectmodule.c

--- python/trunk/Modules/selectmodule.c (original) +++ python/trunk/Modules/selectmodule.c Sun Apr 23 14:36:23 2006 @@ -8,6 +8,13 @@

#include "Python.h"

+#ifdef APPLE

/* Perform runtime testing for a broken poll on OSX to make it easier

* to use the same binary on multiple releases of the OS.

```
*/
```

+#undef HAVE_BROKEN_POLL +#endif + /* Windows #defines FD_SETSIZE to 64 if FD_SETSIZE isn't already defined. 64 is too small (too many people have bumped into that limit). Here we boost it. @@ -618,7 +625,38 @@ return NULL; return (PyObject )rv; } -#endif / HAVE_POLL && !HAVE_BROKEN_POLL / + +#ifdef APPLE +/

- On some systems poll() sets errno on invalid file descriptors. We test
- for this at runtime because this bug may be fixed or introduced between
- OS releases.
*/ +static int select_have_broken_poll(void) +{
int poll_test;
int filedes[2];
struct pollfd poll_struct = { 0, POLLIN|POLLPRI|POLLOUT, 0 };
/* Create a file descriptor to make invalid */
if (pipe(filedes) < 0) {
```
  return 1;
```
}
poll_struct.fd = filedes[0];
close(filedes[0]);
close(filedes[1]);
poll_test = poll(&poll_struct, 1, 0);
if (poll_test < 0) {
```
  return 1;
```
} else if (poll_test == 0 && poll_struct.revents != POLLNVAL) {
```
  return 1;
```
}
return 0; +} +#endif /* APPLE */
+#endif /* HAVE_POLL */

PyDoc_STRVAR(select_doc, "select(rlist, wlist, xlist[, timeout]) -> (rlist, wlist, xlist)\n\

@@ -645,9 +683,9 @@

static PyMethodDef select_methods[] = { {"select", select_select, METH_VARARGS, select_doc}, -#if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL) +#if defined(HAVE_POLL) {"poll", select_poll, METH_VARARGS, poll_doc}, -#endif /* HAVE_POLL && !HAVE_BROKEN_POLL / +#endif / HAVE_POLL / {0, 0}, / sentinel */ };

@@ -668,29 +706,40 @@ SelectError = PyErr_NewException("select.error", NULL, NULL); Py_INCREF(SelectError); PyModule_AddObject(m, "error", SelectError); -#if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL) - poll_Type.ob_type = &PyType_Type; - PyModule_AddIntConstant(m, "POLLIN", POLLIN); - PyModule_AddIntConstant(m, "POLLPRI", POLLPRI); - PyModule_AddIntConstant(m, "POLLOUT", POLLOUT); - PyModule_AddIntConstant(m, "POLLERR", POLLERR); - PyModule_AddIntConstant(m, "POLLHUP", POLLHUP); - PyModule_AddIntConstant(m, "POLLNVAL", POLLNVAL); +#if defined(HAVE_POLL) + +#ifdef APPLE + if (select_have_broken_poll()) { + if (PyObject_DelAttrString(m, "poll") == -1) { + PyErr_Clear(); + } + } else { +#else + { +#endif + poll_Type.ob_type = &PyType_Type; + PyModule_AddIntConstant(m, "POLLIN", POLLIN); + PyModule_AddIntConstant(m, "POLLPRI", POLLPRI); + PyModule_AddIntConstant(m, "POLLOUT", POLLOUT); + PyModule_AddIntConstant(m, "POLLERR", POLLERR); + PyModule_AddIntConstant(m, "POLLHUP", POLLHUP); + PyModule_AddIntConstant(m, "POLLNVAL", POLLNVAL);

#ifdef POLLRDNORM - PyModule_AddIntConstant(m, "POLLRDNORM", POLLRDNORM); + PyModule_AddIntConstant(m, "POLLRDNORM", POLLRDNORM); #endif #ifdef POLLRDBAND - PyModule_AddIntConstant(m, "POLLRDBAND", POLLRDBAND); + PyModule_AddIntConstant(m, "POLLRDBAND", POLLRDBAND); #endif #ifdef POLLWRNORM - PyModule_AddIntConstant(m, "POLLWRNORM", POLLWRNORM); + PyModule_AddIntConstant(m, "POLLWRNORM", POLLWRNORM); #endif #ifdef POLLWRBAND - PyModule_AddIntConstant(m, "POLLWRBAND", POLLWRBAND); + PyModule_AddIntConstant(m, "POLLWRBAND", POLLWRBAND); #endif #ifdef POLLMSG - PyModule_AddIntConstant(m, "POLLMSG", POLLMSG); + PyModule_AddIntConstant(m, "POLLMSG", POLLMSG); #endif -#endif /* HAVE_POLL && !HAVE_BROKEN_POLL / + } +#endif / HAVE_POLL */ }

Previous message: [Python-checkins] r45660 - python/trunk/Modules/posixmodule.c python/trunk/Modules/socketmodule.c python/trunk/Modules/timemodule.c
Next message: [Python-checkins] buildbot warnings in x86 cygwin trunk
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Python-checkins mailing list