Merged revisions 64104,64117 via svnmerge from

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

........
  r64104 | benjamin.peterson | 2008-06-10 21:40:25 -0500 (Tue, 10 Jun 2008) | 2 lines

  add the multiprocessing package to fulfill PEP 371
........
  r64117 | benjamin.peterson | 2008-06-11 07:26:31 -0500 (Wed, 11 Jun 2008) | 2 lines

  fix import of multiprocessing by juggling imports
........

1 files changed, 163 insertions, 0 deletions

diff --git a/Modules/_multiprocessing/multiprocessing.h b/Modules/_multiprocessing/multiprocessing.h
new file mode 100644
index 0000000..40f2c08
--- /dev/null
+++ b/Modules/_multiprocessing/multiprocessing.h
@@ -0,0 +1,163 @@
+#ifndef MULTIPROCESSING_H

+#define MULTIPROCESSING_H

+

+#define PY_SSIZE_T_CLEAN

+

+#include "Python.h"

+#include "structmember.h"

+#include "pythread.h"

+

+/*

+ * Platform includes and definitions

+ */

+

+#ifdef MS_WINDOWS

+#  define WIN32_LEAN_AND_MEAN

+#  include <windows.h>

+#  include <winsock2.h>

+#  include <process.h>		     /* getpid() */

+#  define SEM_HANDLE HANDLE

+#  define SEM_VALUE_MAX LONG_MAX

+#else

+#  include <fcntl.h>                 /* O_CREAT and O_EXCL */

+#  include <sys/socket.h>

+#  include <arpa/inet.h>             /* htonl() and ntohl() */

+#  if HAVE_SEM_OPEN

+#    include <semaphore.h>

+     typedef sem_t *SEM_HANDLE;

+#  endif

+#  define HANDLE int

+#  define SOCKET int

+#  define BOOL int

+#  define UINT32 uint32_t

+#  define INT32 int32_t

+#  define TRUE 1

+#  define FALSE 0

+#  define INVALID_HANDLE_VALUE (-1)

+#endif

+

+/*

+ * Make sure Py_ssize_t available

+ */

+

+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)

+   typedef int Py_ssize_t;

+#  define PY_SSIZE_T_MAX INT_MAX

+#  define PY_SSIZE_T_MIN INT_MIN

+#  define F_PY_SSIZE_T "i"

+#  define PY_FORMAT_SIZE_T ""

+#  define PyInt_FromSsize_t(n) PyInt_FromLong((long)n)

+#else

+#  define F_PY_SSIZE_T "n"

+#endif

+

+/*

+ * Format codes

+ */

+

+#if SIZEOF_VOID_P == SIZEOF_LONG

+#  define F_POINTER "k"

+#  define T_POINTER T_ULONG

+#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P == SIZEOF_LONG_LONG)

+#  define F_POINTER "K"

+#  define T_POINTER T_ULONGLONG

+#else

+#  error "can't find format code for unsigned integer of same size as void*"

+#endif

+

+#ifdef MS_WINDOWS

+#  define F_HANDLE F_POINTER

+#  define T_HANDLE T_POINTER

+#  define F_SEM_HANDLE F_HANDLE

+#  define T_SEM_HANDLE T_HANDLE

+#  define F_DWORD "k"

+#  define T_DWORD T_ULONG

+#else

+#  define F_HANDLE "i"

+#  define T_HANDLE T_INT

+#  define F_SEM_HANDLE F_POINTER

+#  define T_SEM_HANDLE T_POINTER

+#endif

+

+#if PY_VERSION_HEX >= 0x03000000

+#  define F_RBUFFER "y"

+#else

+#  define F_RBUFFER "s"

+#endif

+

+/*

+ * Error codes which can be returned by functions called without GIL

+ */

+

+#define MP_SUCCESS (0)

+#define MP_STANDARD_ERROR (-1)

+#define MP_MEMORY_ERROR (-1001)

+#define MP_END_OF_FILE (-1002)

+#define MP_EARLY_END_OF_FILE (-1003)

+#define MP_BAD_MESSAGE_LENGTH (-1004)

+#define MP_SOCKET_ERROR (-1005)

+#define MP_EXCEPTION_HAS_BEEN_SET (-1006)

+

+PyObject *mp_SetError(PyObject *Type, int num);

+

+/*

+ * Externs - not all will really exist on all platforms

+ */

+

+extern PyObject *pickle_dumps;

+extern PyObject *pickle_loads;

+extern PyObject *pickle_protocol;

+extern PyObject *BufferTooShort;

+extern PyTypeObject SemLockType;

+extern PyTypeObject ConnectionType;

+extern PyTypeObject PipeConnectionType;

+extern HANDLE sigint_event;

+

+/*

+ * Py3k compatibility

+ */

+

+#if PY_VERSION_HEX >= 0x03000000

+#  define PICKLE_MODULE "pickle"

+#  define FROM_FORMAT PyUnicode_FromFormat

+#  define PyInt_FromLong PyLong_FromLong

+#  define PyInt_FromSsize_t PyLong_FromSsize_t

+#else

+#  define PICKLE_MODULE "cPickle"

+#  define FROM_FORMAT PyString_FromFormat

+#endif

+

+#ifndef PyVarObject_HEAD_INIT

+#  define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,

+#endif

+

+#ifndef Py_TPFLAGS_HAVE_WEAKREFS

+#  define Py_TPFLAGS_HAVE_WEAKREFS 0

+#endif

+

+/*

+ * Connection definition

+ */

+

+#define CONNECTION_BUFFER_SIZE 1024

+

+typedef struct {

+	PyObject_HEAD

+	HANDLE handle;

+	int flags;

+	PyObject *weakreflist;

+	char buffer[CONNECTION_BUFFER_SIZE];

+} ConnectionObject;

+

+/*

+ * Miscellaneous

+ */

+

+#define MAX_MESSAGE_LENGTH 0x7fffffff

+

+#ifndef MIN

+#  define MIN(x, y) ((x) < (y) ? x : y)

+#  define MAX(x, y) ((x) > (y) ? x : y)

+#endif

+

+#endif /* MULTIPROCESSING_H */