October 2013 - Wine-Commits

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSAMPLER_TEXTURE_TYPE typedef.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 540054eb3e8f9db79c7956e67c0c7dc5a3c8cacb URL: http://source.winehq.org/git/wine.git/?a=commit;h=540054eb3e8f9db79c7956e67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 08:54:14 2013 +0200 d3dcompiler: Get rid of the BWRITERSAMPLER_TEXTURE_TYPE typedef. --- dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index c0e0793..5948d57 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -97,7 +97,7 @@ int asmshader_lex(void); DWORD dclusage; unsigned int regnum; } declaration; - BWRITERSAMPLER_TEXTURE_TYPE samplertype; + enum bwritersampler_texture_type samplertype; struct rel_reg rel_reg; struct src_regs sregs; } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 0d40664..361845f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -502,13 +502,14 @@ enum bwritershader_param_dstmod_type BWRITERSPDM_MSAMPCENTROID = 4, }; -typedef enum _BWRITERSAMPLER_TEXTURE_TYPE { +enum bwritersampler_texture_type +{ BWRITERSTT_UNKNOWN = 0, BWRITERSTT_1D = 1, BWRITERSTT_2D = 2, BWRITERSTT_CUBE = 3, BWRITERSTT_VOLUME = 4, -} BWRITERSAMPLER_TEXTURE_TYPE; +}; #define BWRITERSI_TEXLD_PROJECT 1 #define BWRITERSI_TEXLD_BIAS 2

1 0

Henri Verbeet : wined3d: Send stream frequency updates through the command stream.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 264256970b8cde073987cb19258fb35596becb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=264256970b8cde073987cb192… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 08:54:11 2013 +0200 wined3d: Send stream frequency updates through the command stream. --- dlls/wined3d/cs.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6919e91..5add94d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -34,6 +34,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_DEPTH_STENCIL, WINED3D_CS_OP_SET_VERTEX_DECLARATION, WINED3D_CS_OP_SET_STREAM_SOURCE, + WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, }; struct wined3d_cs_present @@ -108,6 +109,14 @@ struct wined3d_cs_set_stream_source UINT stride; }; +struct wined3d_cs_set_stream_source_freq +{ + enum wined3d_cs_op opcode; + UINT stream_idx; + UINT frequency; + UINT flags; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -355,6 +364,31 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, cs->ops->submit(cs); } +static void wined3d_cs_exec_set_stream_source_freq(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_stream_source_freq *op = data; + struct wined3d_stream_state *stream; + + stream = &cs->state.streams[op->stream_idx]; + stream->frequency = op->frequency; + stream->flags = op->flags; + + device_invalidate_state(cs->device, STATE_STREAMSRC); +} + +void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) +{ + struct wined3d_cs_set_stream_source_freq *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ; + op->stream_idx = stream_idx; + op->frequency = frequency; + op->flags = flags; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -366,6 +400,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_DEPTH_STENCIL */ wined3d_cs_exec_set_depth_stencil, /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, + /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b6234b..603e5f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1308,7 +1308,7 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic if (device->recording) device->recording->changed.streamFreq |= 1 << stream_idx; else if (stream->frequency != old_freq || stream->flags != old_flags) - device_invalidate_state(device, STATE_STREAMSRC); + wined3d_cs_emit_set_stream_source_freq(device->cs, stream_idx, stream->frequency, stream->flags); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 719aa87..c7b014e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2492,6 +2492,8 @@ void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, + UINT frequency, UINT flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;

1 0

Francois Gouget : wined3d: Fix compilation on systems that don' t define INFINITY or NAN.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: b0ccc355c39bf63d9fb79cbbfbd64fb238e55fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ccc355c39bf63d9fb79cbbf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 3 16:03:17 2013 +0200 wined3d: Fix compilation on systems that don't define INFINITY or NAN. --- dlls/wined3d/cs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 176f36b..e4ec0e8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -17,6 +17,7 @@ */ #include "config.h" +#include "wine/port.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d);

1 0

Henri Verbeet : wined3d: Send texture binding updates through the command stream.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 052a86301080912e79b5316d69d30f0ab508a0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=052a86301080912e79b5316d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 08:54:13 2013 +0200 wined3d: Send texture binding updates through the command stream. --- dlls/wined3d/cs.c | 78 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 63 +------------------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 81 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0f060b4..176f36b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -36,6 +36,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_STREAM_SOURCE, WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, WINED3D_CS_OP_SET_INDEX_BUFFER, + WINED3D_CS_OP_SET_TEXTURE, }; struct wined3d_cs_present @@ -125,6 +126,13 @@ struct wined3d_cs_set_index_buffer enum wined3d_format_id format_id; }; +struct wined3d_cs_set_texture +{ + enum wined3d_cs_op opcode; + UINT stage; + struct wined3d_texture *texture; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -427,6 +435,75 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff cs->ops->submit(cs); } +static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; + const struct wined3d_cs_set_texture *op = data; + struct wined3d_texture *prev; + + prev = cs->state.textures[op->stage]; + cs->state.textures[op->stage] = op->texture; + + if (op->texture) + { + if (InterlockedIncrement(&op->texture->resource.bind_count) == 1) + op->texture->sampler = op->stage; + + if (!prev || op->texture->target != prev->target) + device_invalidate_state(cs->device, STATE_PIXELSHADER); + + if (!prev && op->stage < d3d_info->limits.ffp_blend_stages) + { + /* The source arguments for color and alpha ops have different + * meanings when a NULL texture is bound, so the COLOR_OP and + * ALPHA_OP have to be dirtified. */ + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_COLOR_OP)); + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_ALPHA_OP)); + } + } + + if (prev) + { + if (InterlockedDecrement(&prev->resource.bind_count) && prev->sampler == op->stage) + { + unsigned int i; + + /* Search for other stages the texture is bound to. Shouldn't + * happen if applications bind textures to a single stage only. */ + TRACE("Searching for other stages the texture is bound to.\n"); + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (cs->state.textures[i] == prev) + { + TRACE("Texture is also bound to stage %u.\n", i); + prev->sampler = i; + break; + } + } + } + + if (!op->texture && op->stage < d3d_info->limits.ffp_blend_stages) + { + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_COLOR_OP)); + device_invalidate_state(cs->device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_ALPHA_OP)); + } + } + + device_invalidate_state(cs->device, STATE_SAMPLER(op->stage)); +} + +void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) +{ + struct wined3d_cs_set_texture *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_TEXTURE; + op->stage = stage; + op->texture = texture; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -440,6 +517,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, + /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index acca498..0c2f3e8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3164,7 +3164,6 @@ DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device * HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture) { - const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_texture *prev; TRACE("device %p, stage %u, texture %p.\n", device, stage, texture); @@ -3200,70 +3199,12 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, TRACE("Setting new texture to %p.\n", texture); device->update_state->textures[stage] = texture; - if (device->recording) - { - TRACE("Recording... not performing anything\n"); - - if (texture) wined3d_texture_incref(texture); - if (prev) wined3d_texture_decref(prev); - - return WINED3D_OK; - } - if (texture) - { - LONG bind_count = InterlockedIncrement(&texture->resource.bind_count); - wined3d_texture_incref(texture); - - if (!prev || texture->target != prev->target) - device_invalidate_state(device, STATE_PIXELSHADER); - - if (!prev && stage < d3d_info->limits.ffp_blend_stages) - { - /* The source arguments for color and alpha ops have different - * meanings when a NULL texture is bound, so the COLOR_OP and - * ALPHA_OP have to be dirtified. */ - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP)); - } - - if (bind_count == 1) - texture->sampler = stage; - } - + if (!device->recording) + wined3d_cs_emit_set_texture(device->cs, stage, texture); if (prev) - { - LONG bind_count = InterlockedDecrement(&prev->resource.bind_count); - - if (!texture && stage < d3d_info->limits.ffp_blend_stages) - { - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_COLOR_OP)); - device_invalidate_state(device, STATE_TEXTURESTAGE(stage, WINED3D_TSS_ALPHA_OP)); - } - - if (bind_count && prev->sampler == stage) - { - unsigned int i; - - /* Search for other stages the texture is bound to. Shouldn't - * happen if applications bind textures to a single stage only. */ - TRACE("Searching for other stages the texture is bound to.\n"); - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - if (device->update_state->textures[i] == prev) - { - TRACE("Texture is also bound to stage %u.\n", i); - prev->sampler = i; - break; - } - } - } - wined3d_texture_decref(prev); - } - - device_invalidate_state(device, STATE_SAMPLER(stage)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45ead88..6cde5b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2496,6 +2496,7 @@ void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : gdiplus: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 70bc6d5f7854b55a9febacb8f3883afaca6e6162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bc6d5f7854b55a9febacb8f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 3 00:08:58 2013 +0200 gdiplus: Use BOOL type where appropriate. --- dlls/gdiplus/graphics.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bd9b70b..1b9d0e9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -621,7 +621,7 @@ static ARGB transform_color(ARGB color, const ColorMatrix *matrix) return (a << 24) | (r << 16) | (g << 8) | b; } -static int color_is_gray(ARGB color) +static BOOL color_is_gray(ARGB color) { unsigned char r, g, b; @@ -944,12 +944,12 @@ static REAL intersect_line_scanline(const GpPointF *p1, const GpPointF *p2, REAL return (p1->X - p2->X) * (p2->Y - y) / (p2->Y - p1->Y) + p2->X; } -static INT brush_can_fill_path(GpBrush *brush) +static BOOL brush_can_fill_path(GpBrush *brush) { switch (brush->bt) { case BrushTypeSolidColor: - return 1; + return TRUE; case BrushTypeHatchFill: { GpHatch *hatch = (GpHatch*)brush; @@ -960,7 +960,7 @@ static INT brush_can_fill_path(GpBrush *brush) case BrushTypeTextureFill: /* Gdi32 isn't much help with these, so we should use brush_fill_pixels instead. */ default: - return 0; + return FALSE; } } @@ -1012,7 +1012,7 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) } } -static INT brush_can_fill_pixels(GpBrush *brush) +static BOOL brush_can_fill_pixels(GpBrush *brush) { switch (brush->bt) { @@ -1021,9 +1021,9 @@ static INT brush_can_fill_pixels(GpBrush *brush) case BrushTypeLinearGradient: case BrushTypeTextureFill: case BrushTypePathGradient: - return 1; + return TRUE; default: - return 0; + return FALSE; } }

1 0

Frédéric Delanoy : itss: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 239c160452dd8494a739b3bf9074a1539504b4aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=239c160452dd8494a739b3bf9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 3 00:08:56 2013 +0200 itss: Use BOOL type where appropriate. --- dlls/itss/chm_lib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index c9bbcdf..c1be36e 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -1424,8 +1424,8 @@ int chm_enumerate_dir(struct chmFile *h, UChar *cur; unsigned int lenRemain; - /* set to 1 once we've started */ - int it_has_begun=0; + /* set to TRUE once we've started */ + BOOL it_has_begun = FALSE; /* the current ui */ struct chmUnitInfo ui; @@ -1493,7 +1493,7 @@ int chm_enumerate_dir(struct chmFile *h, if (! it_has_begun) { if (ui.length == 0 && strncmpiW(ui.path, prefixRectified, prefixLen) == 0) - it_has_begun = 1; + it_has_begun = TRUE; else continue;

1 0

Francois Gouget : testbot: Restrict the use of WineTestBot:: Log in the Jobs module.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: tools Branch: master Commit: 67333a424676b24d86b12e8a669b79a52f62a580 URL: http://source.winehq.org/git/tools.git/?a=commit;h=67333a424676b24d86b12e8a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 3 12:18:19 2013 +0200 testbot: Restrict the use of WineTestBot::Log in the Jobs module. --- testbot/lib/WineTestBot/Jobs.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 48e74f9..86bb0c3 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -54,7 +54,6 @@ use WineTestBot::Config; use WineTestBot::Branches; use WineTestBot::Engine::Notify; use WineTestBot::WineTestBotObjects; -use WineTestBot::Log; use vars qw(@ISA @EXPORT); @@ -206,7 +205,8 @@ sub Cancel } elsif (defined $Task->ChildPid) { - LogMsg "Canceling the ". join("/", $self->Id, $Step->No, $Task->No) . " task\n"; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Canceling the " . join("/", $self->Id, $Step->No, $Task->No) . " task\n"); kill("TERM", $Task->ChildPid); $Task->Status("canceled"); $Task->ChildPid(undef);

1 0

Francois Gouget : testbot: Rework the job scheduler and add an 'off' VM state.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: tools Branch: master Commit: 2ab859b9a8dbba9a5ab8c7d295aebecfdd31fdc5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ab859b9a8dbba9a5ab8c7d2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 3 12:23:54 2013 +0200 testbot: Rework the job scheduler and add an 'off' VM state. The old scheduler would limit the number of VMs in the running state to $MaxRunningVMs but would allow dirty base VMs to accumulate without bound. The new scheduler makes sure that no more than $MaxActiveVMs VMs are using memory, CPU or I/O resources, whether they are reverting, sleeping, running or dirty. Furthermore the new scheduler will power off any dirty VM that it cannot revert right away to make sure it won't waste resources. The run tasks also no longer power off the VMs when done. They now leave that task to the scheduler which will decide what to do with the VM. The new scheduler can revert VMs while others are running. This case gets its own limit, $MaxRevertWhileRunningVMs, so the reverts do not disturb the tests. To better exploit this it can look ahead and prepare the VMs needed for a job's next steps. And like the previous scheduler, when idle it will start a set of VMs for the next job, trying to pick the most likely to be needed: first the build VM, then base VMs, etc. This can also gets its own limit, $MaxVMsWhenIdle, so developpers can set the TestBot to not use resources unless needed. This can lead to having idle VMs that turn out to not be needed, for instance if the new job targets non base VMs. When that happens the scheduler can shut down some idle VMs to make room for more useful ones. --- testbot/bin/Engine.pl | 12 +- testbot/bin/WineRunTask.pl | 2 - testbot/ddl/update26.sql | 4 + testbot/lib/WineTestBot/Config.pm | 17 ++- testbot/lib/WineTestBot/Jobs.pm | 262 +++++++++++++++++++++++++++---------- testbot/lib/WineTestBot/VMs.pm | 16 ++- 6 files changed, 221 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=2ab859b9a8dbba9a5ab8…

1 0

Francois Gouget : testbot: Some spelling fixes and wording tweaks.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: tools Branch: master Commit: 0c79e60d6777279b311d8adc34cca0afd2aa6c87 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0c79e60d6777279b311d8adc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 3 12:16:48 2013 +0200 testbot: Some spelling fixes and wording tweaks. --- testbot/bin/Engine.pl | 4 ++-- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2438298..03575f6 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -73,7 +73,7 @@ It has to contend with three main scenarios: - The Engine being restarted. Any task started just before that is still running should still have its process and powered on VM and should be left alone so it can complete normally. If a task died unexpectedly while the - Engine was done it's ok to requeue it. + Engine was down it's ok to requeue it. - The Engine startup after a reboot. All task processes will be dead and need to be requeued. But the VMs are likely to be hosted on a separate machine so it is quite possible that they will still be running. Hopefully any running @@ -82,7 +82,7 @@ It has to contend with three main scenarios: - A shutdown of the Engine and its tasks / VMs. In this case it's used to kill the running tasks and requeue them, and/or shut down the VMs. -In all cases we only trust that a VM status field is still valid: +In all cases we only trust that a VM status field is still valid if: - It is 'running' and used by a task that is still running. - It is 'reverting' or 'sleeping', is powered on and the revert process is still running. diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 35514a7..48e74f9 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -399,7 +399,7 @@ VM Statuses. The number of VMs running on the host must be kept under $MaxRunningVMs. The rational behind this limit is that the host may not be able to run more VMs simultaneously, typically due to memory or CPU constraints. Also note that -this limit must be respected even if there are more than one hypervisor running +this limit must be respected even if there is more than one hypervisor running on the host. =item * diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 37d1c4f..8069c90 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -535,7 +535,7 @@ sub RunRevert # Note that if the child process completes quickly (typically due to some # error), it may set ChildPid to undef before we get here. So we may end up - # with non-reverting VM for which ChildPid is set. That's ok because + # with non-reverting VMs for which ChildPid is set. That's ok because # ChildPid should be ignored anyway if Status is not 'reverting' or # 'sleeping'. $self->ChildPid($Pid);

1 0

Francois Gouget : patches: Remove bits that are unneeded now that it is integrated with the WineTestBot .
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: tools Branch: master Commit: 3a572e9fdedb04bf355111b3dbb5b13af3124ebd URL: http://source.winehq.org/git/tools.git/?a=commit;h=3a572e9fdedb04bf355111b3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 3 12:18:04 2013 +0200 patches: Remove bits that are unneeded now that it is integrated with the WineTestBot. --- patches/doc/INSTALL.txt | 12 +------ patches/filter-testbot | 83 ----------------------------------------------- patches/notify-bot | 35 -------------------- 3 files changed, 2 insertions(+), 128 deletions(-) diff --git a/patches/doc/INSTALL.txt b/patches/doc/INSTALL.txt index 86b3dca..c1570ac 100644 --- a/patches/doc/INSTALL.txt +++ b/patches/doc/INSTALL.txt @@ -58,16 +58,8 @@ Apache setup: - Run expire regularly to delete old patches: 0 0 * * * $HOME/tools/patches/expire -v $HOME/patches -To integrate with the WineTestBot also do the following: -- Run the notify-bot script regularly to notify the WineTestBot when there are - new patches to test. - */5 * * * * $HOME/tools/patches/notify-bot <winetestbot-email-address> -- Arrange for the filter-testbot script to be fed the WineTestBot emails. One - way to do so is to add the following lines to the .procmailrc file: - :0 bfw - * ^X-TestBot-Results: - | $HOME/tools/patches/filter-testbot - +For integration with the WineTestBot, see the corresponding section in the +WineTestBot documentation. 5. Setup for the regressions site diff --git a/patches/filter-testbot b/patches/filter-testbot deleted file mode 100755 index 844090c..0000000 --- a/patches/filter-testbot +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/perl -w -# -# Process a testbot result email and generate the .testfail and .testbot -# result files that the patches site uses / links to. -# -# Copyright 2010 Alexandre Julliard -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -use strict; - -my $step = 0; -my $patch = 0; -my $failed = 0; - -while (<>) -{ - if (/^--- BEGIN GENERAL ---$/) - { - $step = 1; - next; - } - if (/^--- BEGIN NEW_ERRORS ---$/) - { - $step = 2; - next; - } - if (/^--- BEGIN FULL_LOGS ---$/) - { - $step = 3; - next; - } - if (/^--- END GENERAL ---$/) - { - die "no patch id found" unless $patch > 0; - if ($failed) - { - open TESTFAIL, ">patches/$patch.testfail" or die "cannot create $patch.testfail"; - } - open TESTBOT, ">patches/$patch.testbot" or die "cannot create $patch.testbot"; - $step = 0; - next; - } - if (/^--- END/) - { - $step = 0; - next; - } - if ($step == 1 && /^Patch: (\d+)/) - { - $patch = $1; - next; - } - if ($step == 1 && /^Test-Result:\s+Failed/) - { - $failed = 1; - next; - } - if ($step == 2 && $failed) - { - print TESTFAIL $_; - next; - } - if ($step == 3) - { - print TESTBOT $_; - next; - } -} -close TESTFAIL if $failed; -close TESTBOT; diff --git a/patches/notify-bot b/patches/notify-bot deleted file mode 100755 index 9676c42..0000000 --- a/patches/notify-bot +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Send an email to the WineTestBot to let it know of new patches. -# -# Copyright 2010 Alexandre Julliard -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -notify_addr="$1" -subject="New patches available at http://source.winehq.org/patches" -test -n "$notify_addr" || exit 0 - -old=`cat $HOME/.next-patch` -next=$old -while test -f /home/winehq/opt/source/patches/data/$next -do - next=`expr $next + 1` -done -if test $next -gt $old -then - echo $next >$HOME/.next-patch - echo "The latest patch is `expr $next - 1`" | Mail -s "$subject" "$notify_addr" -fi

1 0