Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.5
Changeset: r93727:0623757396d5
Date: 2018-01-31 23:31 +0200
http://bitbucket.org/pypy/pypy/changeset/0623757396d5/
Log: implement _multiprocessing for win32, remove _multiprocessing.win32,
tests fail
diff --git a/pypy/module/_multiprocessing/__init__.py
b/pypy/module/_multiprocessing/__init__.py
--- a/pypy/module/_multiprocessing/__init__.py
+++ b/pypy/module/_multiprocessing/__init__.py
@@ -6,13 +6,14 @@
interpleveldefs = {
'SemLock' : 'interp_semaphore.W_SemLock',
- 'sem_unlink' : 'interp_semaphore.semaphore_unlink',
- 'address_of_buffer' : 'interp_memory.address_of_buffer',
}
appleveldefs = {
}
if sys.platform == 'win32':
- interpleveldefs['win32'] = 'interp_win32.win32_namespace(space)'
- del interpleveldefs['sem_unlink']
+ interpleveldefs['closesocket'] =
'interp_win32_py3.multiprocessing_closesocket'
+ interpleveldefs['recv'] = 'interp_win32_py3.multiprocessing_recv'
+ interpleveldefs['send'] = 'interp_win32_py3.multiprocessing_send'
+ else:
+ interpleveldefs['sem_unlink'] = 'interp_semaphore.semaphore_unlink',
diff --git a/pypy/module/_multiprocessing/interp_semaphore.py
b/pypy/module/_multiprocessing/interp_semaphore.py
--- a/pypy/module/_multiprocessing/interp_semaphore.py
+++ b/pypy/module/_multiprocessing/interp_semaphore.py
@@ -19,7 +19,7 @@
if sys.platform == 'win32':
from rpython.rlib import rwin32
- from pypy.module._multiprocessing.interp_win32 import (
+ from pypy.module._multiprocessing.interp_win32_py3 import (
_GetTickCount, handle_w)
SEM_VALUE_MAX = sys.maxint
diff --git a/pypy/module/_multiprocessing/interp_win32.py
b/pypy/module/_multiprocessing/interp_win32.py
deleted file mode 100644
--- a/pypy/module/_multiprocessing/interp_win32.py
+++ /dev/null
@@ -1,220 +0,0 @@
-from rpython.rlib import rwin32
-from rpython.rlib.rarithmetic import r_uint
-from rpython.rtyper.lltypesystem import lltype, rffi
-from rpython.rtyper.tool import rffi_platform
-from rpython.translator.tool.cbuild import ExternalCompilationInfo
-
-from pypy.interpreter.error import oefmt, wrap_oserror
-from pypy.interpreter.function import StaticMethod
-from pypy.interpreter.gateway import interp2app, unwrap_spec
-
-CONSTANTS = """
- PIPE_ACCESS_INBOUND PIPE_ACCESS_DUPLEX
- GENERIC_READ GENERIC_WRITE OPEN_EXISTING
- PIPE_TYPE_MESSAGE PIPE_READMODE_MESSAGE PIPE_WAIT
- PIPE_UNLIMITED_INSTANCES
- NMPWAIT_WAIT_FOREVER
- ERROR_PIPE_CONNECTED ERROR_SEM_TIMEOUT ERROR_PIPE_BUSY
- ERROR_NO_SYSTEM_RESOURCES ERROR_BROKEN_PIPE ERROR_MORE_DATA
- ERROR_ALREADY_EXISTS ERROR_NO_DATA
-""".split()
-
-class CConfig:
- _compilation_info_ = ExternalCompilationInfo(
- includes = ['windows.h'],
- libraries = ['kernel32'],
- )
-
- for name in CONSTANTS:
- locals()[name] = rffi_platform.ConstantInteger(name)
-
-config = rffi_platform.configure(CConfig)
-globals().update(config)
-
-def handle_w(space, w_handle):
- return rffi.cast(rwin32.HANDLE, space.int_w(w_handle))
-
-def w_handle(space, handle):
- return space.newint(rffi.cast(rffi.INTPTR_T, handle))
-
-_CreateNamedPipe = rwin32.winexternal(
- 'CreateNamedPipeA', [
- rwin32.LPCSTR,
- rwin32.DWORD, rwin32.DWORD, rwin32.DWORD,
- rwin32.DWORD, rwin32.DWORD, rwin32.DWORD,
- rffi.VOIDP],
- rwin32.HANDLE,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_ConnectNamedPipe = rwin32.winexternal(
- 'ConnectNamedPipe', [rwin32.HANDLE, rffi.VOIDP], rwin32.BOOL,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_SetNamedPipeHandleState = rwin32.winexternal(
- 'SetNamedPipeHandleState', [
- rwin32.HANDLE,
- rwin32.LPDWORD, rwin32.LPDWORD, rwin32.LPDWORD],
- rwin32.BOOL,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_WaitNamedPipe = rwin32.winexternal(
- 'WaitNamedPipeA', [rwin32.LPCSTR, rwin32.DWORD],
- rwin32.BOOL,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_PeekNamedPipe = rwin32.winexternal(
- 'PeekNamedPipe', [
- rwin32.HANDLE,
- rffi.VOIDP,
- rwin32.DWORD,
- rwin32.LPDWORD, rwin32.LPDWORD, rwin32.LPDWORD],
- rwin32.BOOL,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_CreateFile = rwin32.winexternal(
- 'CreateFileA', [
- rwin32.LPCSTR,
- rwin32.DWORD, rwin32.DWORD, rffi.VOIDP,
- rwin32.DWORD, rwin32.DWORD, rwin32.HANDLE],
- rwin32.HANDLE,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_WriteFile = rwin32.winexternal(
- 'WriteFile', [
- rwin32.HANDLE,
- rffi.VOIDP, rwin32.DWORD,
- rwin32.LPDWORD, rffi.VOIDP],
- rwin32.BOOL,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_ReadFile = rwin32.winexternal(
- 'ReadFile', [
- rwin32.HANDLE,
- rffi.VOIDP, rwin32.DWORD,
- rwin32.LPDWORD, rffi.VOIDP],
- rwin32.BOOL,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_ExitProcess = rwin32.winexternal(
- 'ExitProcess', [rffi.UINT], lltype.Void,
- save_err=rffi.RFFI_SAVE_LASTERROR)
-
-_GetTickCount = rwin32.winexternal(
- 'GetTickCount', [], rwin32.DWORD)
-
-_Sleep = rwin32.winexternal(
- 'Sleep', [rwin32.DWORD], lltype.Void)
-
-def CloseHandle(space, w_handle):
- handle = handle_w(space, w_handle)
- if not rwin32.CloseHandle(handle):
- raise wrap_oserror(space, rwin32.lastSavedWindowsError())
-
-def GetLastError(space):
- """NOTE: don't use this. See issue #2658"""
- return space.newint(rwin32.GetLastError_saved())
-
-# __________________________________________________________
-# functions for the "win32" namespace
-
-@unwrap_spec(name='text', openmode=r_uint, pipemode=r_uint,
maxinstances=r_uint,
- outputsize=r_uint, inputsize=r_uint, timeout=r_uint)
-def CreateNamedPipe(space, name, openmode, pipemode, maxinstances,
- outputsize, inputsize, timeout, w_security):
- security = space.int_w(w_security)
- if security:
- raise oefmt(space.w_NotImplementedError, "expected a NULL pointer")
- handle = _CreateNamedPipe(
- name, openmode, pipemode, maxinstances,
- outputsize, inputsize, timeout, rffi.NULL)
-
- if handle == rwin32.INVALID_HANDLE_VALUE:
- raise wrap_oserror(space, rwin32.lastSavedWindowsError())
-
- return w_handle(space, handle)
-
-def ConnectNamedPipe(space, w_handle, w_overlapped):
- handle = handle_w(space, w_handle)
- overlapped = space.int_w(w_overlapped)
- if overlapped:
- raise oefmt(space.w_NotImplementedError, "expected a NULL pointer")
- if not _ConnectNamedPipe(handle, rffi.NULL):
- raise wrap_oserror(space, rwin32.lastSavedWindowsError())
-
-def SetNamedPipeHandleState(space, w_handle, w_pipemode, w_maxinstances,
- w_timeout):
- handle = handle_w(space, w_handle)
- state = lltype.malloc(rffi.CArrayPtr(rffi.UINT).TO, 3, flavor='raw')
- statep = lltype.malloc(rffi.CArrayPtr(rffi.UINTP).TO, 3, flavor='raw',
- zero=True)
- try:
- if not space.is_w(w_pipemode, space.w_None):
- state[0] = space.uint_w(w_pipemode)
- statep[0] = rffi.ptradd(state, 0)
- if not space.is_w(w_maxinstances, space.w_None):
- state[1] = space.uint_w(w_maxinstances)
- statep[1] = rffi.ptradd(state, 1)
- if not space.is_w(w_timeout, space.w_None):
- state[2] = space.uint_w(w_timeout)
- statep[2] = rffi.ptradd(state, 2)
- if not _SetNamedPipeHandleState(handle, statep[0], statep[1],
- statep[2]):
- raise wrap_oserror(space, rwin32.lastSavedWindowsError())
- finally:
- lltype.free(state, flavor='raw')
- lltype.free(statep, flavor='raw')
-
-@unwrap_spec(name='text', timeout=r_uint)
-def WaitNamedPipe(space, name, timeout):
- # Careful: zero means "default value specified by CreateNamedPipe()"
- if not _WaitNamedPipe(name, timeout):
- raise wrap_oserror(space, rwin32.lastSavedWindowsError())
-
-@unwrap_spec(filename='fsencode', access=r_uint, share=r_uint,
- disposition=r_uint, flags=r_uint)
-def CreateFile(space, filename, access, share, w_security,
- disposition, flags, w_templatefile):
- security = space.int_w(w_security)
- templatefile = space.int_w(w_templatefile)
- if security or templatefile:
- raise oefmt(space.w_NotImplementedError, "expected a NULL pointer")
-
- handle = _CreateFile(filename, access, share, rffi.NULL,
- disposition, flags, rwin32.NULL_HANDLE)
-
- if handle == rwin32.INVALID_HANDLE_VALUE:
- raise wrap_oserror(space, rwin32.lastSavedWindowsError())
-
- return w_handle(space, handle)
-
-@unwrap_spec(code=r_uint)
-def ExitProcess(space, code):
- _ExitProcess(code)
-
-def win32_namespace(space):
- "NOT_RPYTHON"
- w_win32 = space.call_function(space.w_type,
- space.wrap("win32"),
- space.newtuple([]),
- space.newdict())
- # constants
- for name in CONSTANTS:
- space.setattr(w_win32,
- space.wrap(name),
- space.wrap(config[name]))
- space.setattr(w_win32,
- space.wrap('NULL'),
- space.newint(0))
-
- # functions
- for name in ['CloseHandle', 'GetLastError', 'CreateFile',
- 'CreateNamedPipe', 'ConnectNamedPipe',
- 'SetNamedPipeHandleState', 'WaitNamedPipe',
- 'ExitProcess',
- ]:
- function = globals()[name]
- w_function = space.wrap(interp2app(function))
- w_method = space.wrap(StaticMethod(w_function))
- space.setattr(w_win32, space.wrap(name), w_method)
-
- return w_win32
diff --git a/pypy/module/_multiprocessing/interp_win32_py3.py
b/pypy/module/_multiprocessing/interp_win32_py3.py
new file mode 100644
--- /dev/null
+++ b/pypy/module/_multiprocessing/interp_win32_py3.py
@@ -0,0 +1,45 @@
+from rpython.rtyper.lltypesystem import rffi
+from rpython.rlib._rsocket_rffi import socketclose, geterrno, socketrecv, send
+from rpython.rlib import rwin32
+from pypy.interpreter.error import OperationError
+from pypy.interpreter.gateway import unwrap_spec
+
+def getWindowsError(space):
+ errno = geterrno()
+ message = rwin32.FormatErrorW(errno)
+ w_errcode = space.newint(errno)
+ return OperationError(space.w_WindowsError,
+ space.newtuple([w_errcode, space.newunicode(message),
+ space.w_None, w_errcode]))
+
+@unwrap_spec(handle=int)
+def multiprocessing_closesocket(space, handle):
+ res = socketclose(handle)
+ if res != 0:
+ raise getWindowsError(space)
+
+@unwrap_spec(handle=int, buffersize=int)
+def multiprocessing_recv(space, handle, buffersize):
+ with rffi.scoped_alloc_buffer(buffersize) as buf:
+ read_bytes = socketrecv(handle, buf.raw, buffersize, 0)
+ if read_bytes >= 0:
+ return space.newtext(buf.str(read_bytes))
+ raise getWindowsError(space)
+
+@unwrap_spec(handle=int, data='bufferstr')
+def multiprocessing_send(space, handle, data):
+ if data is None:
+ raise OperationError(space.w_ValueError, 'data cannot be None')
+ with rffi.scoped_nonmovingbuffer(data) as dataptr:
+ # rsocket checks for writability of socket with wait_for_data, cpython
does check
+ res = send(handle, dataptr, len(data), 0)
+ if res < 0:
+ raise getWindowsError(space)
+ return space.newint(res)
+
+def handle_w(space, w_handle):
+ return rffi.cast(rwin32.HANDLE, space.int_w(w_handle))
+
+_GetTickCount = rwin32.winexternal(
+ 'GetTickCount', [], rwin32.DWORD)
+
diff --git a/pypy/module/_multiprocessing/test/test_win32.py
b/pypy/module/_multiprocessing/test/test_win32.py
--- a/pypy/module/_multiprocessing/test/test_win32.py
+++ b/pypy/module/_multiprocessing/test/test_win32.py
@@ -9,18 +9,12 @@
if sys.platform != "win32":
py.test.skip("win32 only")
- def test_CloseHandle(self):
- from _multiprocessing import win32
- raises(WindowsError, win32.CloseHandle, -1)
-
- def test_CreateFile(self):
- from _multiprocessing import win32
- err = raises(WindowsError, win32.CreateFile,
- "in/valid", 0, 0, 0, 0, 0, 0)
- assert err.value.winerror == 87 # ERROR_INVALID_PARAMETER
+ def test_closesocket(self):
+ from _multiprocessing import closesocket
+ raises(WindowsError, closesocket, -1)
def test_pipe(self):
- from _multiprocessing import win32
+ import _winapi as win32
import os
address = r'\\.\pipe\pypy-test-%s' % (os.getpid())
openmode = win32.PIPE_ACCESS_INBOUND
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
