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

[soft-debugger-session] Domain unload type fix. #60

Closed
wants to merge 2 commits into from
Closed

[soft-debugger-session] Domain unload type fix. #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11580ff
[soft-debugger-session] Maintain list of loaded assemblies for each d…
lukaszunity Sep 3, 2015
684b28f
[soft-debugger-session] Also remove types on assembly unload, to matc…
lukaszunity Sep 4, 2015
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
88 changes: 68 additions & 20 deletions Mono.Debugging.Soft/SoftDebuggerSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public class SoftDebuggerSession : DebuggerSession
{
readonly Dictionary<Tuple<TypeMirror, string>, MethodMirror[]> overloadResolveCache = new Dictionary<Tuple<TypeMirror, string>, MethodMirror[]> ();
readonly Dictionary<string, List<TypeMirror>> source_to_type = new Dictionary<string, List<TypeMirror>> (PathComparer);
readonly Dictionary<AppDomainMirror, AssemblyMirror[]> domainAssemblies = new Dictionary<AppDomainMirror, AssemblyMirror[]>();
readonly Dictionary<long,ObjectMirror> activeExceptionsByThread = new Dictionary<long, ObjectMirror> ();
readonly Dictionary<EventRequest, BreakInfo> breakpoints = new Dictionary<EventRequest, BreakInfo> ();
readonly Dictionary<string, MonoSymbolFile> symbolFiles = new Dictionary<string, MonoSymbolFile> ();
Expand Down Expand Up @@ -416,8 +417,8 @@ void ConnectionStarted (VirtualMachine machine)
ConnectOutput (machine.StandardError, true);

HideConnectionDialog ();
machine.EnableEvents (EventType.AssemblyLoad, EventType.ThreadStart, EventType.ThreadDeath,

machine.EnableEvents (EventType.AppDomainCreate, EventType.AppDomainUnload, EventType.AssemblyLoad, EventType.ThreadStart, EventType.ThreadDeath,
EventType.AssemblyUnload, EventType.UserBreak, EventType.UserLog);
try {
unhandledExceptionRequest = machine.CreateExceptionRequest (null, false, true);
Expand Down Expand Up @@ -1475,6 +1476,12 @@ void HandleEventSet (EventSet es)
}

switch (type) {
case EventType.AppDomainCreate:
HandleAppDomainCreateEvents (Array.ConvertAll(es.Events, item => (AppDomainCreateEvent)item));
break;
case EventType.AppDomainUnload:
HandleAppDomainUnloadEvents (Array.ConvertAll(es.Events, item => (AppDomainUnloadEvent)item));
break;
case EventType.AssemblyLoad:
HandleAssemblyLoadEvents (Array.ConvertAll (es.Events, item => (AssemblyLoadEvent)item));
break;
Expand Down Expand Up @@ -1825,6 +1832,59 @@ void HandleBreakEventSet (Event[] es, bool dequeuing)
}
}

void RemoveUnloadedAssemblyTypes(AssemblyMirror asm)
{
// Remove affected types from the loaded types list
var affectedTypes = new List<string>(from pair in types
where PathComparer.Equals(pair.Value.Assembly.Location, asm.Location)
select pair.Key);

foreach (string typeName in affectedTypes)
{
TypeMirror tm;

if (types.TryGetValue(typeName, out tm))
{
if (tm.IsNested)
aliases.Remove(NestedTypeNameToAlias(typeName));

types.Remove(typeName);
}
}

foreach (var pair in source_to_type)
{
pair.Value.RemoveAll(m => PathComparer.Equals(m.Assembly.Location, asm.Location));
}
}

void HandleAppDomainCreateEvents(AppDomainCreateEvent[] events)
{
var domain = events[0].Domain;
if (events.Length > 1)
throw new InvalidOperationException("Simultaneous AppDomainCreateEvent for multiple domains");

if(!domainAssemblies.ContainsKey(domain))
domainAssemblies[domain] = null;
}

void HandleAppDomainUnloadEvents(AppDomainUnloadEvent[] events)
{
var domain = events[0].Domain;
if (events.Length > 1)
throw new InvalidOperationException("Simultaneous AppDomainUnloadEvent for multiple domains");

if (!domainAssemblies.ContainsKey(domain))
return;

var assemblies = domainAssemblies[domain];

foreach (var asm in assemblies)
RemoveUnloadedAssemblyTypes(asm);

domainAssemblies.Remove(domain);
}

void HandleAssemblyLoadEvents (AssemblyLoadEvent[] events)
{
var asm = events [0].Assembly;
Expand All @@ -1836,6 +1896,11 @@ void HandleAssemblyLoadEvents (AssemblyLoadEvent[] events)

string flagExt = isExternal ? " [External]" : "";
OnDebuggerOutput (false, string.Format ("Loaded assembly: {0}{1}\n", asm.Location, flagExt));

// Update loaded assemblies for each domain
var domains = new List<AppDomainMirror>(domainAssemblies.Keys);
foreach (var domain in domains)
domainAssemblies[domain] = domain.GetAssemblies();
}

void HandleAssemblyUnloadEvents (AssemblyUnloadEvent[] events)
Expand Down Expand Up @@ -1864,25 +1929,8 @@ void HandleAssemblyUnloadEvents (AssemblyUnloadEvent[] events)
}
}

// Remove affected types from the loaded types list
var affectedTypes = new List<string> (from pair in types
where PathComparer.Equals (pair.Value.Assembly.Location, asm.Location)
select pair.Key);

foreach (string typeName in affectedTypes) {
TypeMirror tm;

if (types.TryGetValue (typeName, out tm)) {
if (tm.IsNested)
aliases.Remove (NestedTypeNameToAlias (typeName));
RemoveUnloadedAssemblyTypes(asm);

types.Remove (typeName);
}
}

foreach (var pair in source_to_type) {
pair.Value.RemoveAll (m => PathComparer.Equals (m.Assembly.Location, asm.Location));
}
OnDebuggerOutput (false, string.Format ("Unloaded assembly: {0}\n", asm.Location));
}

Expand Down