Skip to content

Domain unload workaround #59

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

Closed
wants to merge 2 commits into from
Closed

Domain unload workaround #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31d39b9
[soft-debugger-session] Enable domain create and unload events.
lukaszunity Sep 1, 2015
494a57d
[soft-debugger-session] Workaround issue with types not being removed…
lukaszunity Sep 2, 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
30 changes: 29 additions & 1 deletion Mono.Debugging.Soft/SoftDebuggerSession.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public class SoftDebuggerSession : DebuggerSession
bool autoStepInto;
bool disposed;
bool started;
bool domainUnloaded = false;

internal int StackVersion;

Expand Down Expand Up @@ -417,7 +418,7 @@ void ConnectionStarted (VirtualMachine machine)

HideConnectionDialog ();

machine.EnableEvents (EventType.AssemblyLoad, EventType.ThreadStart, EventType.ThreadDeath,
machine.EnableEvents (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 @@ -524,6 +525,24 @@ public TypeMirror GetType (string fullName)
if (!types.TryGetValue (fullName, out tm))
aliases.TryGetValue (fullName, out tm);

if (!domainUnloaded || tm == null)
return tm;

// Check if this type has been unloaded due to bug https://github.com/mono/debugger-libs/issues/57
try
{
tm.GetTypeObject();
}
catch(CommandException e)
{
if (e.ErrorCode == ErrorCode.ERR_UNLOADED)
{
types.Remove(fullName);
aliases.Remove(fullName);
return null;
}
}

return tm;
}

Expand Down Expand Up @@ -1475,6 +1494,10 @@ void HandleEventSet (EventSet es)
}

switch (type) {

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 +1848,11 @@ void HandleBreakEventSet (Event[] es, bool dequeuing)
}
}

void HandleAppDomainUnloadEvents (AppDomainUnloadEvent[] events)
{
domainUnloaded = true;
}

void HandleAssemblyLoadEvents (AssemblyLoadEvent[] events)
{
var asm = events [0].Assembly;
Expand Down