Skip to content

Merge generics support in mscorlib #245

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Merge generics support in mscorlib #245

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
85086ea
Update core library to add support for generics <T> (#242)
josesimoes Apr 18, 2025
2bb1d2d
Work CI-CD
josesimoes Apr 21, 2025
f9a9158
Work CI-CD
josesimoes Apr 21, 2025
e37e4b8
Work CI-CD
josesimoes Apr 21, 2025
488ab3b
Merge branch 'main' of https://github.com/nanoframework/CoreLibrary i…
josesimoes Apr 29, 2025
6303710
Work CI-CD
josesimoes Apr 30, 2025
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
5 changes: 3 additions & 2 deletions .runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<!-- Configurations that affect the Test Framework -->
<RunConfiguration>
Expand All @@ -12,5 +12,6 @@
<Logging>Verbose</Logging>
<IsRealHardware>False</IsRealHardware>
<RunnerExtraArguments> --forcegc </RunnerExtraArguments>
<UsePreviewClr>True</UsePreviewClr>
</nanoFrameworkAdapter>
</RunSettings>
</RunSettings>
36 changes: 31 additions & 5 deletions Tests/NFUnitTestGC/TestGC.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


using System;
using nanoFramework.TestFramework;

namespace NFUnitTestGC
Expand All @@ -15,16 +16,14 @@ public void TestGCStress()
int maxArraySize = 1024 * 32;
object[] arrays = new object[600];

// Starting TestGCStress

for (int loop = 0; loop < 100; loop++)
{
OutputHelper.WriteLine($"Running iteration {loop}");

for (int i = 0; i < arrays.Length - 1;)
{
OutputHelper.WriteLine($"Alloc array of {maxArraySize} bytes @ pos {i}");
arrays[i++] = new byte[maxArraySize]; ;
arrays[i++] = new byte[maxArraySize];

OutputHelper.WriteLine($"Alloc array of 64 bytes @ pos {i}");
arrays[i++] = new byte[64];
Expand All @@ -37,8 +36,35 @@ public void TestGCStress()
arrays[i] = null;
}
}
}

[TestMethod]
public void TestGetTotalMemory()
{
// create several objects
object[] objects = new object[100];

for (int i = 0; i < objects.Length; i++)
{
objects[i] = new object();
}

// get total memory
long totalMemory = GC.GetTotalMemory(false);
OutputHelper.WriteLine($"Total memory: {totalMemory} bytes");

// release objects
for (int i = 0; i < objects.Length; i++)
{
objects[i] = null;
}

// get total memory, forcing full collection
long totalMemoryAfterCollection = GC.GetTotalMemory(true);
OutputHelper.WriteLine($"Total memory: {totalMemoryAfterCollection} bytes");

// Completed TestGCStress
// check if memory was released
Assert.IsTrue(totalMemory > totalMemoryAfterCollection, "Memory was not released");
}
}
}
85 changes: 35 additions & 50 deletions Tests/NFUnitTestSystemLib/UnitTestGCTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ namespace NFUnitTestSystemLib
[TestClass]
public class UnitTestGCTest
{
#pragma warning disable S1215 // this is intended to test the GC
#pragma warning disable S1854 // this is intended to test the GC
#pragma warning disable S2696 // this is intended to test the GC
#pragma warning disable S3971 // this is intended to test the GC

internal class FinalizeObject
{
public static FinalizeObject m_currentInstance = null;
Expand Down Expand Up @@ -54,17 +59,20 @@ public void SystemGC1_Test()
/// 6. Verify that object has been collected
/// </summary>
///
// Tests ReRegisterForFinalize
// Create a FinalizeObject.

OutputHelper.WriteLine("Tests ReRegisterForFinalize");
OutputHelper.WriteLine("Create a FinalizeObject.");

FinalizeObject mfo = new FinalizeObject();
m_hasFinalized1 = false;
m_hasFinalized2 = false;

// Release reference
OutputHelper.WriteLine("Release reference");
mfo = null;

// Allow GC
GC.WaitForPendingFinalizers();
OutputHelper.WriteLine("Allow GC");
GC.Collect();

int sleepTime = 1000;
int slept = 0;
Expand All @@ -85,10 +93,10 @@ public void SystemGC1_Test()
// FinalizeObject.m_currentInstance field. Setting this value
// to null and forcing another garbage collection will now
// cause the object to Finalize permanently.
// Reregister and allow for GC
FinalizeObject.m_currentInstance = null;

GC.WaitForPendingFinalizers();
OutputHelper.WriteLine("Reregister and allow for GC");
FinalizeObject.m_currentInstance = null;
GC.Collect();

sleepTime = 1000;
slept = 0;
Expand Down Expand Up @@ -119,26 +127,27 @@ public void SystemGC2_Test()
/// 6. Verify that object has not been collected
/// </summary>
///
// Tests SuppressFinalize
// Create a FinalizeObject.

OutputHelper.WriteLine("Tests SuppressFinalize");
OutputHelper.WriteLine("Create a FinalizeObject");
FinalizeObject mfo = new FinalizeObject();
m_hasFinalized1 = false;
m_hasFinalized2 = false;

// Releasing
OutputHelper.WriteLine("Releasing");
GC.SuppressFinalize(mfo);
mfo = null;

// Allow GC
GC.WaitForPendingFinalizers();
OutputHelper.WriteLine("Allow GC");
GC.Collect();

int sleepTime = 1000;
int slept = 0;

while (!m_hasFinalized1 && slept < sleepTime)
{
// force GC run caused by memory allocation
var dummyArray = new byte[1024 * 1024 * 1];
_ = new byte[1024 * 1024 * 1];

System.Threading.Thread.Sleep(10);
slept += 10;
Expand All @@ -161,59 +170,35 @@ public void SystemGC3_Test()
/// </summary>
///

// Tests WaitForPendingFinalizers, dependant on test 1
// will auto-fail if test 1 fails.
OutputHelper.Write("Tests WaitForPendingFinalizers, dependant on test 1");
OutputHelper.WriteLine("will auto-fail if test 1 fails.");
OutputHelper.WriteLine("will fail if test 1 fails.");

Assert.IsTrue(m_Test1Result);
Assert.IsTrue(m_Test1Result, "Can't run this test as SystemGC1_Test has failed.");

// Create a FinalizeObject.
OutputHelper.WriteLine("Create a FinalizeObject");
FinalizeObject mfo = new FinalizeObject();
m_hasFinalized1 = false;
m_hasFinalized2 = false;

// Releasing
OutputHelper.WriteLine("Releasing");
mfo = null;

int sleepTime = 1000;
int slept = 0;

while (!m_hasFinalized1 && slept < sleepTime)
{
// force GC run caused by memory allocation
var dummyArray = new byte[1024 * 1024 * 1];

System.Threading.Thread.Sleep(10);
slept += 10;
}

OutputHelper.WriteLine($"GC took {slept}");

// Wait for GC
OutputHelper.WriteLine("Wait for GC");
GC.Collect();
GC.WaitForPendingFinalizers();

// Releasing again
OutputHelper.WriteLine("Releasing again");
FinalizeObject.m_currentInstance = null;

sleepTime = 1000;
slept = 0;

while (!m_hasFinalized2 && slept < sleepTime)
{
// force GC run caused by memory allocation
var dummyArray = new byte[1024 * 1024 * 1];

System.Threading.Thread.Sleep(10);
slept += 10;
}

OutputHelper.WriteLine($"GC took {slept}");

// Wait for GC
OutputHelper.WriteLine("Wait for GC");
GC.Collect();
GC.WaitForPendingFinalizers();

Assert.IsTrue(m_hasFinalized2);
}
}
#pragma warning restore S1215 // "GC.Collect" should not be called
#pragma warning restore S1854 // Unused assignments should be removed
#pragma warning restore S2696 // Instance members should not write to "static" fields
#pragma warning restore S3971 // "GC.SuppressFinalize" should not be called
}
27 changes: 25 additions & 2 deletions Tests/NFUnitTestSystemLib/UnitTestInitLocalTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ public void SystemType1_GetType_Test()
// ConstructorInfo)
// NOTE: We add the reflection items to the ArrayList to assure that they can be properly
// assigned to a object container (this used to lead to a access violation)

OutputHelper.WriteLine("Testing Int32");

Type type = typeof(int);
list.Add(type);
string name = ((Type)list[i]).Name;
Expand All @@ -68,33 +71,43 @@ public void SystemType1_GetType_Test()
//fRes &= name.ToLower() == "mscorlib";
//i++;

OutputHelper.WriteLine("Testing NFUnitTestSystemLib.UnitTestInitLocalTests+TestObj");

type = Type.GetType("NFUnitTestSystemLib.UnitTestInitLocalTests+TestObj");
list.Add(type);
name = ((Type)list[i]).Name;
Assert.AreEqual(name, "TestObj");
i++;

OutputHelper.WriteLine("Testing IEmptyInterface");

Type iface = type.GetInterfaces()[0];
list.Add(iface);
name = ((Type)list[i]).Name;
Assert.AreEqual(name, "IEmptyInterface");
Assert.AreEqual(iface.Name, "IEmptyInterface");
i++;

OutputHelper.WriteLine("Testing FieldInfo");

FieldInfo fi = type.GetField("Field1");
list.Add(fi);
name = ((FieldInfo)list[i]).Name;
Assert.AreEqual(name, "Field1");
Assert.AreEqual(fi.Name, "Field1");
i++;

OutputHelper.WriteLine("Testing MethodInfo");

MethodInfo mi = type.GetMethod("Method1");
list.Add(mi);
name = ((MethodInfo)list[i]).Name;
Assert.AreEqual(name, "Method1");
Assert.AreEqual(mi.Name, "Method1");
i++;

OutputHelper.WriteLine("Testing ConstructorInfo");

ConstructorInfo ci = type.GetConstructor(new Type[] { });
list.Add(ci);
name = ((ConstructorInfo)list[i]).Name;
Expand All @@ -104,7 +117,10 @@ public void SystemType1_GetType_Test()

//
// Now test arrays of reflection types
//
//

OutputHelper.WriteLine("Testing Array of Type");

Type[] types = new Type[] { typeof(int), typeof(bool), Type.GetType("NFUnitTestSystemLib.UnitTestInitLocalTests+TestObj") };
list.Add(types[2]);
name = ((Type)list[i]).Name;
Expand All @@ -127,27 +143,35 @@ public void SystemType1_GetType_Test()
//fRes &= asms[0].GetName().Name == "Microsoft.SPOT.Platform.Tests.Systemlib2";
//i++;

OutputHelper.WriteLine("Testing Array of FieldInfo");

FieldInfo[] fis = new FieldInfo[] { types[2].GetField("Field1"), type.GetFields()[0] };
list.Add(fis[0]);
name = ((FieldInfo)list[i]).Name;
Assert.AreEqual(name, "Field1");
Assert.AreEqual(fis[0].Name, "Field1");
i++;

OutputHelper.WriteLine("Testing Array of MethodInfo");

MethodInfo[] mis = new MethodInfo[] { type.GetMethods()[2], types[2].GetMethod("Method2", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public) };
list.Add(mis[1]);
name = ((MethodInfo)list[i]).Name;
Assert.AreEqual(name, "Method2");
Assert.AreEqual(mis[1].Name, "Method2");
i++;

OutputHelper.WriteLine("Testing Array of ConstructorInfo");

ConstructorInfo[] cis = new ConstructorInfo[] { types[2].GetConstructor(new Type[] { }), typeof(TestObj).GetConstructor(new Type[] { typeof(int) }) };
list.Add(cis[0]);
name = ((ConstructorInfo)list[i]).Name;
Assert.AreEqual(name, ".ctor");
Assert.AreEqual(cis[0].Name, ".ctor");
i++;

OutputHelper.WriteLine("Testing Array of System.Collections.ArrayList");

Array ar = Array.CreateInstance(typeof(Type), 3);
((IList)ar)[0] = typeof(Type);
((IList)ar)[1] = Type.GetType("System.Collections.ArrayList");
Expand All @@ -157,7 +181,6 @@ public void SystemType1_GetType_Test()
Assert.AreEqual(name, "ArrayList");
Assert.AreEqual(((Type)((IList)ar)[0]).Name, "Type");
Assert.AreEqual(((Type)ar.GetValue(1)).Name, "ArrayList");
i++;

list.Clear();
}
Expand Down
Loading