Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some improvements to FrugalList #6280

Merged
merged 2 commits into from
Jul 21, 2022
Merged

Some improvements to FrugalList #6280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ab21da
Some improvements to FrugalList
stephentoub Mar 18, 2022
08c0fc8
Update src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs
stephentoub May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 52 additions & 104 deletions src/Microsoft.DotNet.Wpf/src/Shared/MS/Utility/FrugalList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
using System.Diagnostics;
using System.Collections;
using System.Collections.Generic;
using System.Windows;
using System.Diagnostics.CodeAnalysis;
#if SYSTEM_XAML
using System.Xaml;
#else
Expand Down Expand Up @@ -1284,10 +1282,6 @@ private void SetCount(int value)
/// </summary>
internal sealed class ArrayItemList<T> : FrugalListBase<T>
{
public ArrayItemList()
{
}

public ArrayItemList(int size)
{
// Make size a multiple of GROWTH
Expand All @@ -1298,111 +1292,69 @@ public ArrayItemList(int size)

public ArrayItemList(ICollection collection)
{
if (collection != null)
{
_count = collection.Count;
_entries = new T[_count];
collection.CopyTo(_entries, 0);
}
Debug.Assert(collection is not null);
_count = collection.Count;
_entries = new T[_count];
collection.CopyTo(_entries, 0);
}

public ArrayItemList(ICollection<T> collection)
{
if (collection != null)
{
_count = collection.Count;
_entries = new T[_count];
collection.CopyTo(_entries, 0);
}
Debug.Assert(collection is not null);
_count = collection.Count;
_entries = new T[_count];
collection.CopyTo(_entries, 0);
}

// Capacity of this store
public override int Capacity
{
get
{
if (_entries != null)
{
return _entries.Length;
}
return 0;
}
}
public override int Capacity => _entries.Length;

public override FrugalListStoreState Add(T value)
{
// If we don't have any entries or the existing entry is being overwritten,
// then we can use this store. Otherwise we have to promote.
if ((null != _entries) && (_count < _entries.Length))
if (_count < _entries.Length)
{
_entries[_count] = value;
++_count;
}
else
{
if (null != _entries)
{
int size = _entries.Length;
int size = _entries.Length;

// Grow the list slowly while it is small but
// faster once it reaches the LARGEGROWTH size
if (size < LARGEGROWTH)
{
size += GROWTH;
}
else
{
size += size >> 2;
}

T[] destEntries = new T[size];

// Copy old array
Array.Copy(_entries, 0, destEntries, 0, _entries.Length);
_entries = destEntries;
// Grow the list slowly while it is small but
// faster once it reaches the LARGEGROWTH size
if (size < LARGEGROWTH)
{
size += GROWTH;
}
else
{
_entries = new T[MINSIZE];
size += size >> 2;
}

T[] destEntries = new T[size];

// Copy old array
Array.Copy(_entries, 0, destEntries, 0, _entries.Length);
_entries = destEntries;

// Insert into new array
_entries[_count] = value;
++_count;
}
return FrugalListStoreState.Success;
}

public override void Clear()
{
// Wipe out the info.
for (int i = 0; i < _count; ++i)
{
_entries[i] = default(T);
}
_count = 0;
}
public override void Clear() => _entries.AsSpan(0, _count).Clear();
stephentoub marked this conversation as resolved.
Show resolved Hide resolved

public override bool Contains(T value)
{
return (-1 != IndexOf(value));
}
public override bool Contains(T value) => IndexOf(value) >= 0;

public override int IndexOf(T value)
{
for (int index = 0; index < _count; ++index)
{
if (EqualityComparer<T>.Default.Equals(_entries[index], value))
{
return index;
}
}
return -1;
}
public override int IndexOf(T value) => Array.IndexOf(_entries, value, 0, _count);

public override void Insert(int index, T value)
{
if ((null != _entries) && (_count < _entries.Length))
if (_count < _entries.Length)
{
// Move down the required number of items
Array.Copy(_entries, index, _entries, index + 1, _count - index);
Expand All @@ -1423,13 +1375,11 @@ public override void SetAt(int index, T value)

public override bool Remove(T value)
{
for (int index = 0; index < _count; ++index)
int index = IndexOf(value);
if (index >= 0)
{
if (EqualityComparer<T>.Default.Equals(_entries[index], value))
{
RemoveAt(index);
return true;
}
RemoveAt(index);
return true;
}

return false;
Expand Down Expand Up @@ -1543,24 +1493,9 @@ public void Promote(ArrayItemList<T> oldList)
}
}

public override T[] ToArray()
{
T[] array = new T[_count];
public override T[] ToArray() => _entries.AsSpan(0, _count).ToArray();

for (int i = 0; i < _count; ++i)
{
array[i] = _entries[i];
}
return array;
}

public override void CopyTo(T[] array, int index)
{
for (int i = 0; i < _count; ++i)
{
array[index+i] = _entries[i];
}
}
public override void CopyTo(T[] array, int index) => _entries.AsSpan(0, _count).CopyTo(array.AsSpan(index));

public override object Clone()
{
Expand Down Expand Up @@ -2032,14 +1967,15 @@ public FrugalStructList(int size)

public FrugalStructList(ICollection collection)
{
if (collection.Count > 6)
int count = collection.Count;
if (count > 6)
{
_listStore = new ArrayItemList<T>(collection);
}
else
{
_listStore = null;
Capacity = collection.Count;
Capacity = count;
foreach (T item in collection)
{
Add(item);
Expand All @@ -2049,17 +1985,29 @@ public FrugalStructList(ICollection collection)

public FrugalStructList(ICollection<T> collection)
{
if (collection.Count > 6)
int count = collection.Count;
if (count > 6)
{
_listStore = new ArrayItemList<T>(collection);
}
else
{
_listStore = null;
Capacity = collection.Count;
foreach (T item in collection)
Capacity = count;

if (collection is IList<T> list)
{
Add(item);
for (int i = 0; i < count; i++)
{
Add(list[i]);
}
}
else
{
foreach (T item in collection)
{
Add(item);
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.DotNet.Wpf/src/WindowsBase/WindowsBase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@
<NetCoreReference Include="System.Linq" />
<NetCoreReference Include="System.ObjectModel" />
<NetCoreReference Include="System.Resources.ResourceManager" />
<NetCoreReference Include="System.Memory" />
<NetCoreReference Include="System.Runtime" />
<NetCoreReference Include="System.Runtime.Extensions" />
<NetCoreReference Include="System.Runtime.InteropServices" />
Expand Down