2007-10-10 Juraj Skripsky <[email protected]>
* Dictionary.cs (Enumerator.MoveNext): Handle the case where we
had already reached the end. Fixes bug #332534.
svn path=/trunk/mcs/; revision=88534
* Dictionary.cs: Optimize and add implementation notes. Use a "mini-heap"
to store the linked lists instead of the regular heap. Split arrays of
structs into separate arrays to make the GC's life simpler (see bug 81879
for details). Make class serialization compatible with MS.NET.
* EqualityComparer.cs: Rename IEquatableOfTEqualityComparer<T> to
GenericEqualityComparer<T> to fix binary serialization compatibility
with MS.
svn path=/trunk/mcs/; revision=80341
* List.cs (FindAllStackBits): Small optimization to the new code.
Built resulting List<T> directly as an array, wrap it in a List<T>
afterwards. Stop the filling of the result array as soon as all
matching items have been processed.
svn path=/trunk/mcs/; revision=74715
* List.cs (FindAll): Optimize FindAll using a bitmask to
* determine
the number of positive matches, this increases the performance
in
all cases below 10,000,000 elements extensively:
100 elements:
old method: 00:00:00.0126610 (26x)
stackalloc bit method: 00:00:00.0004750 (1x)
array bit method: 00:00:00.0010700 (2x)
heap bit method: 00:00:00.0038830 (8x)
1,000 elements:
old method: 00:00:00.0139250 (24x)
stackalloc bit method: 00:00:00.0005670 (1x)
array bit method: 00:00:00.0010890 (2x)
heap bit method: 00:00:00.0034920 (6x)
10,000 elements:
old method: 00:00:00.0136110 (12x)
stackalloc bit method: 00:00:00.0011240 (1x)
array bit method: 00:00:00.0016450 (1.4x)
heap bit method: 00:00:00.0043110 (3x)
50,000 elements:
old method: 00:00:00.0175970 (3x)
stackalloc bit method: 00:00:00.0085630 (1.5x)
array bit method: 00:00:00.0055010 (1x)
heap bit method: 00:00:00.0099590 (1.8x)
100,000 elements:
old method: 00:00:00.0210330 (2x)
array bit method: 00:00:00.0100430 (1x)
heap bit method: 00:00:00.0154150 (1.5x)
1,000,000 elements:
old method: 00:00:00.1243730 (1.2x)
array bit method: 00:00:00.0973110 (1x)
heap bit method: 00:00:00.1285650 (1.3x)
10,000,000 elements:
old method: 00:00:00.9252570 (1x)
array bit method: 00:00:00.9632300 ( 1.05x)
heap bit method: 00:00:01.1098490 (1.20x)
svn path=/trunk/mcs/; revision=74694
* List.cs: Fix the case where List.set_Item(int index) throws
inappropriate exception when index is equal to List.Count
List.IndexOf(object item) and IList.Contains(object item) throw
exceptions when given invalid types.
IList.Add(object item) throws InvalidCastException when item is
not of the correct type.
svn path=/trunk/mcs/; revision=73976
* Dictionary.cs: An instance of Dictionary<TKey,TValue> is
supposed to throw a KeyNotFoundException when
the user attempts to retrieve the value associated with a key that
is not in the dictionary.
On the other hand, an instance of IDictionary is supposed to
return null in similar circumstances.
svn path=/trunk/mcs/; revision=73764
Increment version whenever _items is modified; this fixes version
checks in Enumerator.
* ListTest.cs: Added tests for binary serialization, and Enumerator
version checks.
svn path=/trunk/mcs/; revision=66698
* Dictionary.cs: Speed up get_Item/set_Item/GetPrev () a bit. Increase capacity
specified by the user so 'capacity' elements can really be added without resizing.
svn path=/trunk/mcs/; revision=65005
* Dictionary.cs: Swap order of parameters to cmp.Equals () to improve
compatibility with MS.NET and strange Equals () implementations.
svn path=/trunk/mcs/; revision=62496
* ArrayTest.cs : use proper comparer in IndexOf() and LastIndexOf().
Patch by Kazuki Oikawa. Fixed bug #77277.
* List.cs : use proper comparer in Contains(), IndexOf() and
LastIndexOf(). Patch by Kazuki Oikawa. Fixed bug #77277.
* ArrayTest.cs : test for bug #77277 by Kazuki Oikawa.
* ListTest.cs : test for bug #77277 by Kazuki Oikawa.
svn path=/trunk/mcs/; revision=60396
* List.cs (CheckIndex): Check for -ve indices and allow index == size.
(Insert): Use CheckIndex.
In class/corlib/Test/System.Collections.Generic:
* ListTest.cs: Add some tests for InsertRange.
svn path=/trunk/mcs/; revision=58069
Speed up remove. Use 'dict[k]=v' as a self-tuning hint.
* Dictionary.cs (GetSlot): Move data-structure traversal to ...
(GetPrev): ... this. Returns the slot prior to the place we're
looking for, or null if that place is the head of the chain.
(Remove): Use it.
(this.set): Use it. Implement move-to-front on set.
* Dictionary.cs (ToTKey, ToTValue): New helpers to convert from
type 'object'.
(IDictionary.this, IDictionary.Add): Use them.
(IDictionary.Contains, IDictionary.Remove): If the types don't
match, do nothing.
In Test/System.Collections.Generic:
* DictionaryTest.cs (IDictionary_*): Add a few tests for the
IDictionary explicit implementation.
svn path=/trunk/mcs/; revision=55946
Fix to pass new nunit tests.
* Dictionary.cs (ShimEnumerator): New class. Implement the
requirement that ((IDictionary) foo).GetEnumerator ().Current has
type DictionaryEntry.
(IDictionary.GetEnumerator): Use ShimEnumerator.
(Enumerator.Current): Now has type KeyValuePair<TKey, TValue>.
(Enumerator.MoveNext): Use VerifyState.
(Enumerator.VerifyState): Move validation of 'current' field to ...
(Enumerator.CurrentSlot): ... this.
(Enumerator.Current, Enumerator.IDictionaryEnumerator.Entry):
Use CurrentSlot.
(CopyTo, ICollection.CopyTo): Use subtle reasoning to replace a
'>=' with a '>'. Don't throw an ArgumentException when
index==array.Length && Count==0.
(KeyCollection.CopyTo, ValueCollection.CopyTo): Likewise, and thus
obviate the need to check (dictionary.Count == 0).
In Test/System.Collections.Generic:
* DictionaryTest.cs: Remove NotWorking annotations.
(Empty_CopyTo, Empty_Values_CopyTo): Fix tests to check that
CopyTo from an empty dictionary does not throw an exception when
'index==array.Length'.
(PlainEnumeratorReturnTest): Check the type of 'Entry' property too.
svn path=/trunk/mcs/; revision=55781
* List.cs: Applied Atsushi's patch for Sort (bug 76361) now that the
generic versions of Array.Sort are implemented.
svn path=/trunk/mcs/; revision=54654
* Dictionary.cs: Fixed ICollection.CopyTo to use DictionaryEntry. Fixed
Key and Value CopyTo not to throw exception if the dictionary is empty
(fix bug #77019).
svn path=/trunk/mcs/; revision=54616
* Add ComVisible(true) to all the classes that needed it.
* Removed documentation from DictionaryBase.cs and moved it to
Monodoc.
* ArrayList.cs: Fixed signature for constructor, parameter names
are normative.
* CollectionBase.cs: Add a couple of missing methods.
svn path=/trunk/mcs/; revision=51018
Introduce some thread-safety by removing the modify-on-read
move-to-front heuristic.
* Dictionary.cs (_enumeratorGeneration, _enumerators): Remove.
(Count): Add internal property set. Invalidate enumerators when
Count is changed. Change all references of _usedSlots to Count.
(this): Invalidate enumerators when the value of some slot is
changed, even if the layout of the data-structure isn't modified.
(DoHash): Remove null-key check. All codepaths leading to this
function already have the check.
(GetSlot): Remove move-to-front heuristic.
(Remove): Update.
In Test/System.Collections.Generic:
* DictionaryTest.cs (FailFastTest1, FailFastTest2, FailFastTest3):
New tests to ensure that enumerators are invalidated on
modifications to the dictionary.
svn path=/trunk/mcs/; revision=46538
* IDictionary.cs: Use the same type parameter names than on MS.
* IDictionary.cs, Dictionary.cs: We don't need the `CLSCompliant'
attribute here.
svn path=/trunk/mcs/; revision=46477
* Dictionary.cs (_generation, _enumeratorGeneration, _enumerators):
New fields to implement fail-fast semantics. All code that
modifies the table increment _generation.
(GetSlot): Use _hcp to compare keys. Return the slot containing
the key, rather than the index. Avoid move-to-front heuristic
when there's an enumerator coursing through the table.
(this, Add, TryGetValue, ContainsKey, Remove): Update to change.
(Enumerator.Enumerator): Save the generation of the dictionary.
(Enumerator.Dispose): Inform dictionary that the enumerator is no more.
(Enumerator.MoveNext, Enumerator.VerifyState): Fail if the
dictionary has been modified.
In Test/System.Collections.Generic:
* DictionaryTest.cs (KeyValueEnumeratorTest): Add test for infloop
if dictionary is read while it's being enumerated.
svn path=/trunk/mcs/; revision=46370
* List.cs : substantial changes and optimizations
(AddCollection, AddEnumerable): new internal specializations of AddRange
(AsReadOnly): returns specific IList<T> to match ms.net 2.0b2 api.
(Clear): reset size to zero on clear
(ConvertAll): catch null converter, use Add to prevent OutOfBounds
exception
(FindAll, FindIndex, FindLast, FindLastIndex, RemoveAll, TrueForAll):
check for null match
(FindLastIndex): correct index parameters based on ms.net 2005b2 behavior
(ForEach): catch null action
(CheckIndex): new internal function similar to CheckRange for functions
which only provide a starting index
(InsertCollection, InsertEnumerable): new internal specializations of
InsertRange
(ReadOnlyList): removed, ReadOnlyCollection in
System.Collections.ObjectModel is used instead now
* ListTest.cs: Substantial new tests
svn path=/trunk/mcs/; revision=46283
Remove entry on Enumerator.MoveNext: no such change was checked in.
Update entry for Enumerator.Dispose to reflect actual change checked in.
svn path=/trunk/mcs/; revision=46203
* Dictionary.cs (EnumerationMode): Remove.
(Enumerator): Remove return type flag - legacy return is expected to
always return a DictionaryEntry
(Enumerator): Make constructor internal, it is not public on ms.net
beta 2
(Enumerator.MoveNext): Fix endless loop on enumerator use
(VerifyState): Added method to check state preconditions and throw
appropriate exceptions.
(KeyCollection,ValueCollection): Mark sealed to match ms.net beta 2
(KeyCollection.Enumerator._hostEnumerator): make exact struct type,
rather than boxing and using by interface
(KeyCollection.Enumerator.Dispose): use default to clear Enumerator
(ValueCollection.Enumerator._hostEnumerator): make exact struct type,
rather than boxing and using by interface
(ValueCollection.Enumerator.Dispose): use default to clear Enumerator
* EqualityComparer.cs (DefaultComparer, IEquatableOfTEqualityComparer):
Mark as serializable.
* DictionaryTest.cs (AddTest3): Added test of simple interaction with
struct dictionary
(AddDuplicateTest,IndexerGetNullTest,IndexerSetNullTest): Added tests
for exceptional cases to verify correct exceptions
(TryGetValueTest): check return value from TryGetValue
(KeyValueEnumeratorTest): Added test from verification of ms.net beta2
behavior for non-generic IEnumerator/IDictionaryEnumerator behavior
against Dictionary<>
(SerializationTest): Added test to utilize serialization routines.
svn path=/trunk/mcs/; revision=46200
* Dictionary.cs (GetKeys, GetValues): Remove.
(SetThreshold): New function to calculate the resize threshold.
(CopyTo): Don't use foreach syntax.
(ContainsValue): Likewise. Use default equality comparer of the
value type.
(GetObjectData): Use CopyTo to copy into temporary array. Don't
save redundant _usedSlots and _threshold.
(OnDeserialization): Rewrite.
(ICollection<>.CopyTo): Forward to CopyTo.
(Enumerator._nextIndex): Rename to from _index.
(Enumerator._next, Enumerator.FixNext): Remove.
(Enumerator.Current): Rewrite to avoid need for _next.
(Enumerator.IEnumerator.Reset): Update.
(KeyCollection): Is also IEnumerable<TKey> and IEnumerable.
Update methods to conform to standard.
(KeyCollection.GetEnumerator): Restore. Return the correct type.
(KeyCollection.Enumerator): Rename from KeyEnumerator. Simple
wrapper that forwards to Dictionary<,>.Enumerator.
(ValueCollection): Likewise.
In Test/System.Collections.Generic:
* DictionaryTest.cs (SliceCollectionsEnumeratorTest): New test
based on #75053.
svn path=/trunk/mcs/; revision=46087
* Comparer.cs, EqualityComparer.cs: Important performance hack:
make sure that we don't box stuff and do reflection on every
comparison. We use reflection at cctor time rather than on every
request.
svn path=/trunk/mcs/; revision=45833
than require subtle reasoning about the state of various variables.
* Dictionary.cs (Enumerator._isValid): Remove. Replace all uses
with "_current == null".
(Enumerator._validNodeVisited): Remove.
(Enumerator._next): New. Holds the the next position.
(Enumerator.FixNest): New helper function that ensures that _next
has the right value.
(Enumerator.MoveNext): Simplify. Now, copies _next to _current
and advances _next if possible.
svn path=/trunk/mcs/; revision=45703
* Dictionary.cs (Dictionary.KeyEnumerator): Removed the public
GetEnumerator() function since it's returning the wrong type.
(Dictionary.ValueEnumerator): Likewise. Fix#75073.
svn path=/trunk/mcs/; revision=45669
* Dictionary.cs (Dictionary<TKey, TValue>.MoveNext): Allow traversal of chain in last slot
of the table. Fixes#75168.
svn path=/trunk/mcs/; revision=45603
* Dictionary.cs: Remove the `Hash' name from the Dictionary
internal classes, make them public.
2005-05-26 Miguel de Icaza <[email protected]>
* File.cs (ReadAllBytes): add.
svn path=/trunk/mcs/; revision=45058