June 2022 - Wine-Devel - list.winehq.org

[PATCH 3/3] jscript: Correctly handle deleted entries in iterate_map.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Based on patch by Gabriel Ivăncescu. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 12 +++++++++--- dlls/mshtml/tests/documentmode.js | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 0ef014b86d0..c64a5598026 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -183,7 +183,7 @@ static HRESULT set_map_entry(MapInstance *map, jsval_t key, jsval_t value, jsval static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, jsval_t *argv, jsval_t *r) { - struct jsval_map_entry *entry; + struct list *iter = list_head(&map->entries); IDispatch *context_obj = NULL; HRESULT hres; @@ -200,16 +200,22 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j context_obj = get_object(argv[1]); } - LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { + while(iter) { + struct jsval_map_entry *entry = LIST_ENTRY(iter, struct jsval_map_entry, list_entry); jsval_t args[3], v; - if(entry->deleted) + + if(entry->deleted) { + iter = list_next(&map->entries, iter); continue; + } + args[0] = entry->value; args[1] = entry->key; args[2] = jsval_obj(&map->dispex); grab_map_entry(entry); hres = disp_call_value(ctx, get_object(argv[0]), context_obj, DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); + iter = list_next(&map->entries, iter); release_map_entry(entry); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index f2da8113e18..299d46e5727 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1019,6 +1019,18 @@ sync_test("set_obj", function() { s = new Set([1, 2, 3]); ok(s.size === 0, "size = " + s.size); + + s = new Set(); + s.add(1); + s.add(2); + s.add(3); + r = 0; + s.forEach(function(value, key, obj) { + r++; + s.clear(); + ok(s.size === 0, "size = " + s.size); + }); + ok(r === 1, "r = " + r); }); sync_test("map_obj", function() { @@ -1161,6 +1173,18 @@ sync_test("map_obj", function() { }catch(e) { ok(e.number === 0xa13fc - 0x80000000, "e.number = " + e.number); } + + s = new Map(); + s.set(1, 10); + s.set(2, 20); + s.set(3, 30); + r = 0; + s.forEach(function(value, key) { + r++; + s.clear(); + ok(s.size === 0, "size = " + s.size); + }); + ok(r === 1, "r = " + r); }); sync_test("elem_attr", function() { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/199

June 7, 2022

[PATCH 2/3] jscript: Use LIST_FOR_EACH_ENTRY_SAFE to clear Map and Set objects.

by Gabriel Ivăncescu

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index d1ea6637956..0ef014b86d0 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -223,6 +223,7 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *map; HRESULT hres; @@ -232,10 +233,8 @@ static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", map); - while(!list_empty(&map->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &map->entries, struct jsval_map_entry, list_entry) delete_map_entry(map, entry); - } if(r) *r = jsval_undefined(); return S_OK; @@ -443,6 +442,7 @@ static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *set; HRESULT hres; @@ -452,10 +452,8 @@ static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", set); - while(!list_empty(&set->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&set->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &set->entries, struct jsval_map_entry, list_entry) delete_map_entry(set, entry); - } if(r) *r = jsval_undefined(); return S_OK; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/199

June 7, 2022

[PATCH 1/3] jscript/tests: Add test for releasing script context objects.

by Jacek Caban

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 78 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ec054f03d0d..f40ffb3a84e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -114,6 +114,7 @@ DEFINE_EXPECT(testobj_newenum); DEFINE_EXPECT(testobj_getidfail_d); DEFINE_EXPECT(testobj_tolocalestr_d); DEFINE_EXPECT(testobj_tolocalestr_i); +DEFINE_EXPECT(testdestrobj); DEFINE_EXPECT(enumvariant_next_0); DEFINE_EXPECT(enumvariant_next_1); DEFINE_EXPECT(enumvariant_reset); @@ -172,6 +173,7 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_VDATE 0x1023 #define DISPID_GLOBAL_VCY 0x1024 #define DISPID_GLOBAL_TODOWINE 0x1025 +#define DISPID_GLOBAL_TESTDESTROBJ 0x1026 #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -342,6 +344,7 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -626,6 +629,40 @@ static IDispatchExVtbl testObjVtbl = { static IDispatchEx testObj = { &testObjVtbl }; +static LONG test_destr_ref; + +static ULONG WINAPI testDestrObj_AddRef(IDispatchEx *iface) +{ + return ++test_destr_ref; +} + +static ULONG WINAPI testDestrObj_Release(IDispatchEx *iface) +{ + if (!--test_destr_ref) + CHECK_EXPECT(testdestrobj); + return test_destr_ref; +} + +static IDispatchExVtbl testDestrObjVtbl = { + DispatchEx_QueryInterface, + testDestrObj_AddRef, + testDestrObj_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testDestrObj = { &testDestrObjVtbl }; + static HRESULT WINAPI dispexFunc_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *res, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1065,6 +1102,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!lstrcmpW(bstrName, L"testDestrObj")) { + *pid = DISPID_GLOBAL_TESTDESTROBJ; + return S_OK; + } + if(strict_dispid_check && lstrcmpW(bstrName, L"t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1268,6 +1310,22 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + case DISPID_GLOBAL_TESTDESTROBJ: + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testDestrObj; + IDispatch_AddRef(V_DISPATCH(pvarRes)); + return S_OK; + case DISPID_GLOBAL_PUREDISP: ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); @@ -3386,6 +3444,25 @@ static void test_invokeex(void) IActiveScript_Release(script); } +static void test_destructors(void) +{ + IActiveScript *script; + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_EMPTY; + hres = parse_script_expr(L"Math.ref = testDestrObj, isNaN.ref = testDestrObj, true", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + SET_EXPECT(testdestrobj); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + CHECK_CALLED(testdestrobj); + + IActiveScript_Release(script); +} + static void test_eval(void) { IActiveScriptParse *parser; @@ -3914,6 +3991,7 @@ static BOOL run_tests(void) test_script_exprs(); test_invokeex(); + test_destructors(); test_eval(); test_error_reports(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/199

June 7, 2022

[PATCH 0/3] MR199: jscript: Set and Map object fixes

by Jacek Caban (＠jacek)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/199

June 7, 2022

[tools 4/4] testbot/cgi: Don't pass the master columns to the list page.

by Francois Gouget

ItemPage ignores any master column parameter that it might receive so RedirectToList() has nothing to pass on. CollectionPage would ignore the master column parameters anyway. Fortunately this functionality is not used and not needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This would only be needed if 2+-level hierarchies were represented with all the corresponding intermediate *List pages. For instance in the Job->Step case this would be JobsList -> JobDetails -> StepsList -> StepDetails. But that would be very cumbersome so of course the TestBot opted to eliminate the intermediate 'step' pages entirely so that there is only JobsList and JobDetails. This is why we don't currently even make use of this mechanism since all other details pages have no master column and link back to the global list page (i.e. UserDetails links back to the full users list, not a subset thereof, etc.). --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index b4d79e736..690458e3a 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -129,17 +129,7 @@ sub RedirectToList($) { my ($self) = @_; - my $Target = $self->{Collection}->GetCollectionName() . "List.pl"; - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . url_escape($MasterColValues->[$ColIndex]); - } - } - return $self->Redirect($Target); + return $self->Redirect($self->{Collection}->GetCollectionName() . "List.pl"); } sub OnAction($$) -- 2.30.2

June 7, 2022

[tools 3/4] testbot/cgi: ItemPage does not retrieve the master columns so simplify GenerateFormStart().

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 8bea816b0..b4d79e736 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -106,16 +106,6 @@ sub GenerateFormStart($) $self->SUPER::GenerateFormStart(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], - "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), - "' /></div>\n"; - } - } if (! $self->{Item}->GetIsNew()) { print "<div><input type='hidden' name='Key' value='", -- 2.30.2

June 7, 2022

[tools 2/4] testbot/cgi: Pass the full key to the details page.

by Francois Gouget

The details page's collection does not have master columns and thus it needs the full key to load the Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 7d42ba2c2..0f0a3bd6b 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -239,7 +239,7 @@ sub GetDetailsLink($$) if (!$Row->{DetailsLink}) { - $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetKey()); + $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetFullKey()); } return $Row->{DetailsLink}; } -- 2.30.2

June 7, 2022

[tools 1/4] testbot/cgi: Don't pass the master columns to the details pages.

by Francois Gouget

The details pages have no way to pass the master columns to the collection used to retrieve the Item to display: what they would need instead is a master object. So they don't even try to retrieve the master column values from the parameters (see *Param() in the FormPage and ItemPage classes). Fortunately so far there is no case where we need this functionality. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- .../lib/ObjectModel/CGI/CollectionBlock.pm | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index e8156a1bf..7d42ba2c2 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -240,15 +240,6 @@ sub GetDetailsLink($$) if (!$Row->{DetailsLink}) { $Row->{DetailsLink} = "$Row->{DetailsPage}?Key=". uri_escape($Row->{Item}->GetKey()); - my ($MasterColNames, $MasterColValues) = $Row->{Item}->GetMasterCols(); - if (defined $MasterColNames) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Row->{DetailsLink} .= "&". $MasterColNames->[$ColIndex] ."=". - uri_escape($MasterColValues->[$ColIndex]); - } - } } return $Row->{DetailsLink}; } @@ -680,17 +671,7 @@ sub OnAction($$) if ($self->{RW} and $Action eq $self->GetAddButtonLabel()) { - my $Target = $self->GetDetailsPage(); - my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); - if (defined($MasterColNames)) - { - foreach my $ColIndex (0..$#{$MasterColNames}) - { - $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . - "=" . uri_escape($MasterColValues->[$ColIndex]); - } - } - exit($self->{EnclosingPage}->Redirect($Target)); + exit($self->{EnclosingPage}->Redirect($self->GetDetailsPage())); } foreach my $Key (@{$self->{Collection}->GetKeys()}) -- 2.30.2

June 7, 2022

[tools] testbot/orm: Add support for multi-column Itemrefs.

by Francois Gouget

Also document why they are not supported in filters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45023 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes issue 9 "No Itemref support for multiple key fields" except where filters are concerned. Most of the other 18 known issues still need fixing. --- testbot/lib/ObjectModel/CGI/ValueFormatter.pm | 6 ++- testbot/lib/ObjectModel/DBIBackEnd.pm | 7 +++- testbot/lib/ObjectModel/Item.pm | 41 ++++++++++++++----- 3 files changed, 40 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm index 41d1e14aa..49bf85658 100644 --- a/testbot/lib/ObjectModel/CGI/ValueFormatter.pm +++ b/testbot/lib/ObjectModel/CGI/ValueFormatter.pm @@ -306,16 +306,18 @@ sub GenerateValueHTML($$$;$) } elsif ($PropertyDescriptor->GetClass() eq "Itemref" and defined $Value) { - # Note: This only supports single-key Itemrefs + my $First = 1; foreach my $ValuePD (@{$Value->GetPropertyDescriptors()}) { if ($ValuePD->GetIsKey()) { + print "/" if (!$First); + $First = 0; my $PropertyName = $ValuePD->GetName(); GenerateValueHTML($Parent, $ValuePD, $Value->$PropertyName); - return; } } + return; } print defined $Value ? $Parent->escapeHTML($Value) : " "; } diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 62332c1f6..f4d16836b 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -222,7 +222,12 @@ sub ColNameToDb($) my $ColNames = $PropertyDescriptor->GetColNames(); if (@$ColNames != 1) { - die "cannot filter on Itemref with more than one column name: @$ColNames"; + # This would require building a more complex where clause, something like + # ((col1 = item1.val1 AND col2 = item1.val2...) OR + # (col1 = item2.val1 AND col2 = item2.val2...) OR ...) + # So it is not supported. Instead one should build the where clause by + # hand from the underlying columns. + die "cannot filter on the ". $PropertyDescriptor->GetName() ." Itemref because it has a multi-column key: @$ColNames"; } return $ColNames->[0]; } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 39c80cc89..593b039ff 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -281,26 +281,45 @@ sub AUTOLOAD } elsif($PropertyDescriptor->GetClass() eq "Itemref") { - my $ColNames = $PropertyDescriptor->GetColNames(); - if (@{$ColNames} != 1) - { - die "Multiple key components not supported"; - } if (@_) { - $self->{Itemrefs}{$PropertyName} = shift; - if ($self->ValuesDiffer($self->{ColValues}{@{$ColNames}[0]}, - $self->{Itemrefs}{$PropertyName}->GetKey())) + my $Item = shift; + if (!$Item and !$self->{Itemrefs}{$PropertyName}) + { + # No change -> nothing to do + } + elsif (!$Item) + { + $self->{IsModified} = 1; + $self->{Itemrefs}{$PropertyName} = undef; + foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) + { + $self->{ColValues}{$ColName} = undef; + } + } + elsif (!$self->{Itemrefs}{$PropertyName} or + $self->{Itemrefs}{$PropertyName} ne $Item) { $self->{IsModified} = 1; - $self->{ColValues}{@{$ColNames}[0]} = $self->{Itemrefs}{$PropertyName}->GetKey(); + $self->{Itemrefs}{$PropertyName} = $Item; + # Note that the foreign key names ($RefColNames) typically don't + # match the Item's primary key column names. But their order and + # count must match the primary key values. + my $RefColNames = $PropertyDescriptor->GetColNames(); + my ($_ColNames, $ColValues) = $Item->GetMasterKey(); + foreach my $ColIndex (0..$#{$RefColNames}) + { + $self->{ColValues}{$RefColNames->[$ColIndex]} = $ColValues->[$ColIndex]; + } } } elsif (! defined($self->{Itemrefs}{$PropertyName})) { + my $ColNames = $PropertyDescriptor->GetColNames(); + my @KeyComponents = map { $self->{ColValues}{$_} || "" } @$ColNames; my $Collection = &{$PropertyDescriptor->GetCreator()}($self); - my $Item = $Collection->GetItem($self->{ColValues}{@{$ColNames}[0]}); - $self->{Itemrefs}{$PropertyName} = $Item; + my $Key = $Collection->CombineKey(@KeyComponents); + $self->{Itemrefs}{$PropertyName} = $Collection->GetItem($Key); } return $self->{Itemrefs}{$PropertyName}; } -- 2.30.2

June 7, 2022

[tools] testbot/web: Query the VMs table only once for the main page.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 21ee5fea4..1083d3b57 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -264,14 +264,15 @@ sub GenerateBody($) print "<div class='GeneralStatusItemText'><a href='#jobs'>Engine appears to be dead and is not processing jobs</a></div>"; } print "</div>\n"; - - my $OfflineVMs = CreateVMs(); - $OfflineVMs->FilterEnabledRole(); - $OfflineVMs->AddFilter("Status", ["offline"]); - my $MaintenanceVMs = CreateVMs(); - $MaintenanceVMs->FilterEnabledRole(); - $MaintenanceVMs->AddFilter("Status", ["maintenance"]); - if ($OfflineVMs->IsEmpty() and $MaintenanceVMs->IsEmpty()) + + my $VMs = CreateVMs(); + my ($OfflineVMs, $MaintenanceVMs); + foreach my $VM (@{$VMs->GetItems()}) + { + $OfflineVMs++ if ($VM->Status eq "offline"); + $MaintenanceVMs++ if ($VM->Status eq "maintenance"); + } + if (!$OfflineVMs and !$MaintenanceVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("green"); @@ -280,18 +281,18 @@ sub GenerateBody($) } else { - if (!$OfflineVMs->IsEmpty()) + if ($OfflineVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are offline</a></div>"; + print "<div class='GeneralStatusItemText'><a href='#vms'>$OfflineVMs VMs are offline</a></div>"; print "</div>\n"; } - if (!$MaintenanceVMs->IsEmpty()) + if ($MaintenanceVMs) { print "<div class='GeneralStatusItem'>"; $self->OutputDot("red"); - print "<div class='GeneralStatusItemText'><a href='#vms'>One or more VMs are undergoing maintenance</a></div>"; + print "<div class='GeneralStatusItemText'><a href='#vms'>$MaintenanceVMs VMs are undergoing maintenance</a></div>"; print "</div>\n"; } } @@ -343,7 +344,7 @@ sub GenerateBody($) EOF print "<h2><a name='vms'></a>VMs</h2>\n"; - my $VMsCollectionBlock = new VMStatusBlock(CreateVMs(), $self); + my $VMsCollectionBlock = new VMStatusBlock($VMs, $self); $VMsCollectionBlock->SetReadWrite(0); $VMsCollectionBlock->GenerateList(); print "</div>\n"; -- 2.30.2

June 7, 2022