December 2011 - Wine-commits

Ken Thomases : libwine: Reap child process to avoid leaving a zombie.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: abe6a13ff1295a8d9290ed2141dd161b5b9b30d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe6a13ff1295a8d9290ed214… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:32 2011 -0600 libwine: Reap child process to avoid leaving a zombie. --- libs/wine/mmap.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 63a597d..1529a85 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -101,7 +101,7 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, { char * volatile result = NULL; int pagesize = getpagesize(); - pid_t pid; + pid_t pid, wret; /* We only try to map to a fixed address if addr is non-NULL and properly aligned, @@ -150,9 +150,10 @@ static int try_mmap_fixed (void *addr, size_t len, int prot, int flags, _exit(1); } - /* vfork() lets the parent continue only after the child - has exited. Furthermore, Wine sets SIGCHLD to SIG_IGN, - so we don't need to wait for the child. */ + /* reap child */ + do { + wret = waitpid(pid, NULL, 0); + } while (wret < 0 && errno == EINTR); return result == addr; }

1 0

Ken Thomases : libport: For spawnvp(_P_DETACH, ...), double-fork to avoid creating zombies.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: fda27ccc1b8357302708601f0618ea9915aa236a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda27ccc1b8357302708601f0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:37 2011 -0600 libport: For spawnvp(_P_DETACH, ...), double-fork to avoid creating zombies. --- libs/port/spawn.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 40efebb..0cdc08c 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -36,7 +36,7 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) { #ifndef HAVE__SPAWNVP - int pid = 0, status, wret; + int pid, status, wret; if (mode == _P_OVERLAY) { @@ -51,20 +51,45 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) pid = fork(); if (pid == 0) { + /* in child */ + if (mode == _P_DETACH) + { + pid = fork(); + if (pid == -1) _exit(1); + else if (pid > 0) _exit(0); + /* else in grandchild */ + } + signal( SIGPIPE, SIG_DFL ); execvp(cmdname, (char **)argv); _exit(1); } - if (pid != -1 && mode == _P_OVERLAY) exit(0); + if (pid == -1) + return -1; + + if (mode == _P_OVERLAY) exit(0); - if (pid != -1 && mode == _P_WAIT) + if (mode == _P_WAIT || mode == _P_DETACH) { while (pid != (wret = waitpid(pid, &status, 0))) if (wret == -1 && errno != EINTR) break; - if (pid == wret && WIFEXITED(status)) pid = WEXITSTATUS(status); - else pid = 255; /* abnormal exit with an abort or an interrupt */ + if (pid == wret && WIFEXITED(status)) + { + if (mode == _P_WAIT) + pid = WEXITSTATUS(status); + else /* mode == _P_DETACH */ + if (WEXITSTATUS(status) != 0) /* child couldn't fork grandchild */ + pid = -1; + } + else + { + if (mode == _P_WAIT) + pid = 255; /* abnormal exit with an abort or an interrupt */ + else /* mode == _P_DETACH */ + pid = -1; + } } return pid;

1 0

Ken Thomases : explorer: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 92298f59feeaf3608c2a1970701c83f7f8156f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92298f59feeaf3608c2a19707… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:41 2011 -0600 explorer: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies. --- programs/explorer/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index b2f7730..bf04d4f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -42,7 +42,7 @@ static BOOL start_screensaver( void ) if (using_root) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = spawnvp( _P_NOWAIT, argv[0], argv ); + int pid = spawnvp( _P_DETACH, argv[0], argv ); if (pid > 0) { WINE_TRACE( "started process %d\n", pid );

1 0

Henri Verbeet : wined3d: Move the surface map counting code to wined3d_surface_map().
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 4a7cbba0ea4eafc1b648529d917f9c4dffe651ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7cbba0ea4eafc1b648529d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:39 2011 +0100 wined3d: Move the surface map counting code to wined3d_surface_map(). --- dlls/wined3d/surface.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ec4daa..b74e8d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -527,19 +527,6 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - /* Performance optimization: Count how often a surface is locked, if it is - * locked regularly do not throw away the system memory copy. This avoids - * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK)) - { - if (++surface->lockCount > MAXLOCKCOUNT) - { - TRACE("Surface is locked regularly, not freeing the system memory copy any more.\n"); - surface->flags |= SFLAG_DYNLOCK; - } - } - /* Create a PBO for dynamically locked surfaces but don't do it for * converted or NPOT surfaces. Also don't create a PBO for systemmem * surfaces. */ @@ -3718,6 +3705,19 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!(surface->flags & SFLAG_LOCKABLE)) WARN("Trying to lock unlockable surface.\n"); + /* Performance optimization: Count how often a surface is mapped, if it is + * mapped regularly do not throw away the system memory copy. This avoids + * the need to download the surface from OpenGL all the time. The surface + * is still downloaded if the OpenGL texture is changed. */ + if (!(surface->flags & SFLAG_DYNLOCK)) + { + if (++surface->lockCount > MAXLOCKCOUNT) + { + TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); + surface->flags |= SFLAG_DYNLOCK; + } + } + surface->surface_ops->surface_map(surface, rect, flags); if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH)

1 0

Henri Verbeet : wined3d: Introduce a separate function to determine if a surface needs a PBO.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 39ebb992f7f961333e0dff796abd8166744629db URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ebb992f7f961333e0dff796… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:40 2011 +0100 wined3d: Introduce a separate function to determine if a surface needs a PBO. --- dlls/wined3d/surface.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b74e8d5..373b443 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -520,6 +520,20 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) return WINED3D_OK; } +static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +{ + if (surface->resource.pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + if (!(surface->flags & SFLAG_DYNLOCK)) + return FALSE; + if (surface->flags & (SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) + return FALSE; + if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) + return FALSE; + + return TRUE; +} + static void surface_prepare_system_memory(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; @@ -527,12 +541,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - /* Create a PBO for dynamically locked surfaces but don't do it for - * converted or NPOT surfaces. Also don't create a PBO for systemmem - * surfaces. */ - if (gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && (surface->flags & SFLAG_DYNLOCK) - && !(surface->flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) - && (surface->resource.pool != WINED3DPOOL_SYSTEMMEM)) + if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) { struct wined3d_context *context; GLenum error;

1 0

Henri Verbeet : wined3d: Create a PBO in surface_load_location() even if SFLAG_INSYSMEM is already set.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 94c0da184e18252ca2df7f9f462e9a4df9c5f2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c0da184e18252ca2df7f9f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:41 2011 +0100 wined3d: Create a PBO in surface_load_location() even if SFLAG_INSYSMEM is already set. In the longer term, sysmem and pbo should be separate resource locations. --- dlls/wined3d/surface.c | 73 ++++++++++++++++++++++++++--------------------- 1 files changed, 40 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 373b443..d5b73e3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -534,49 +534,51 @@ static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct return TRUE; } -static void surface_prepare_system_memory(struct wined3d_surface *surface) +static void surface_load_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + struct wined3d_context *context; + GLenum error; - TRACE("surface %p.\n", surface); + context = context_acquire(surface->resource.device, NULL); + ENTER_GL(); - if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - { - struct wined3d_context *context; - GLenum error; + GL_EXTCALL(glGenBuffersARB(1, &surface->pbo)); + error = glGetError(); + if (!surface->pbo || error != GL_NO_ERROR) + ERR("Failed to create a PBO with error %s (%#x).\n", debug_glerror(error), error); - context = context_acquire(device, NULL); - ENTER_GL(); + TRACE("Binding PBO %u.\n", surface->pbo); - GL_EXTCALL(glGenBuffersARB(1, &surface->pbo)); - error = glGetError(); - if (!surface->pbo || error != GL_NO_ERROR) - ERR("Failed to create a PBO with error %s (%#x).\n", debug_glerror(error), error); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + checkGLcall("glBindBufferARB"); - TRACE("Binding PBO %u.\n", surface->pbo); + GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4, + surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB)); + checkGLcall("glBufferDataARB"); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); - GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4, - surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB)); - checkGLcall("glBufferDataARB"); + /* We don't need the system memory anymore and we can't even use it for PBOs. */ + if (!(surface->flags & SFLAG_CLIENT)) + { + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.heapMemory = NULL; + } + surface->resource.allocatedMemory = NULL; + surface->flags |= SFLAG_PBO; + LEAVE_GL(); + context_release(context); +} - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); +static void surface_prepare_system_memory(struct wined3d_surface *surface) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - /* We don't need the system memory anymore and we can't even use it for PBOs. */ - if (!(surface->flags & SFLAG_CLIENT)) - { - HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); - surface->resource.heapMemory = NULL; - } - surface->resource.allocatedMemory = NULL; - surface->flags |= SFLAG_PBO; - LEAVE_GL(); - context_release(context); - } + TRACE("surface %p.\n", surface); + + if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) + surface_load_pbo(surface, gl_info); else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated @@ -6136,6 +6138,11 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c if (surface->flags & location) { TRACE("Location already up to date.\n"); + + if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) + && surface_need_pbo(surface, gl_info)) + surface_load_pbo(surface, gl_info); + return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_STAGETIMINGS.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: b3b686d9e83d38a352076b9081ec5e7bc2bcfdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b686d9e83d38a352076b908… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:42 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_STAGETIMINGS. --- include/wine/wined3d.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index edab31b..7a15759 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,12 +1696,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_STAGETIMINGS -{ - float MemoryProcessingPercent; - float ComputationProcessingPercent; -} WINED3DDEVINFO_STAGETIMINGS; - typedef struct _WINED3DRASTER_STATUS { BOOL InVBlank;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_RESOURCEMANAGER.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 990786eef5af3ce5c3f063ccc0fae61ebf7d8f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=990786eef5af3ce5c3f063ccc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 1 07:31:43 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_RESOURCEMANAGER. --- include/wine/wined3d.h | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7a15759..89acd0f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1702,26 +1702,6 @@ typedef struct _WINED3DRASTER_STATUS UINT ScanLine; } WINED3DRASTER_STATUS; -typedef struct WINED3DRESOURCESTATS -{ - BOOL bThrashing; - DWORD ApproxBytesDownloaded; - DWORD NumEvicts; - DWORD NumVidCreates; - DWORD LastPri; - DWORD NumUsed; - DWORD NumUsedInVidMem; - DWORD WorkingSet; - DWORD WorkingSetBytes; - DWORD TotalManaged; - DWORD TotalBytes; -} WINED3DRESOURCESTATS; - -typedef struct _WINED3DDEVINFO_RESOURCEMANAGER -{ - WINED3DRESOURCESTATS stats[WINED3DRTYPECOUNT]; -} WINED3DDEVINFO_RESOURCEMANAGER; - typedef struct _WINED3DDEVINFO_VERTEXSTATS { DWORD NumRenderedTriangles;

1 0

Ken Thomases : gdi.exe16: Don't double-close the spool file.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: b035b0bad71ed9003f2984267fcfd3b92cf4cdbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b035b0bad71ed9003f2984267… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 10:06:00 2011 -0600 gdi.exe16: Don't double-close the spool file. FreePrintJob() closes the file descriptor. --- dlls/gdi.exe16/printdrv.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index f00eaa1..6beb996 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -388,8 +388,6 @@ INT16 WINAPI CloseJob16(HPJOB16 hJob) pPrintJob = FindPrintJobFromHandle(hJob); if (pPrintJob != NULL) { - /* Close the spool file */ - close(pPrintJob->fd); FreePrintJob(hJob); nRet = 1; }

1 0

Ken Thomases : ntdll: Don't change SIGCHLD disposition; no automatic reaping of child processes.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 35302a643a36e99505616b56b68c9cd694feb3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35302a643a36e99505616b56b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:48:22 2011 -0600 ntdll: Don't change SIGCHLD disposition; no automatic reaping of child processes. --- dlls/ntdll/server.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 3243f9f..8a01d22 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1076,11 +1076,6 @@ size_t server_init_thread( void *entry_point ) /* ignore SIGPIPE so that we get an EPIPE error instead */ sigaction( SIGPIPE, &sig_act, NULL ); - /* automatic child reaping to avoid zombies */ -#ifdef SA_NOCLDWAIT - sig_act.sa_flags |= SA_NOCLDWAIT; -#endif - sigaction( SIGCHLD, &sig_act, NULL ); /* create the server->client communication pipes */ if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" );

1 0