maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Replace direct uses of the Debugger's output stream with 

uses of the asynchronous stream.

llvm-svn: 133076
This commit is contained in:
Caroline Tice 2011-06-15 19:35:17 +00:00
parent 59d8c60719
commit 15356e7f4f
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/source/Commands/CommandObjectCommands.cpp
View File

@ -929,7 +929,11 @@ CommandObjectCommandsAddRegex::InputReaderCallback (void *baton,
switch (notification)
{
case eInputReaderActivate:
reader.GetDebugger().GetOutputStream().Printf("%s\n", "Enter regular expressions in the form 's/<regex>/<subst>/' and terminate with an empty line:");
{
StreamSP out_stream = reader.GetDebugger().GetAsyncOutputStream ();
out_stream->Printf("%s\n", "Enter regular expressions in the form 's/<regex>/<subst>/' and terminate with an empty line:");
out_stream->Flush();
}
break;
case eInputReaderReactivate:
break;
@ -951,7 +955,9 @@ CommandObjectCommandsAddRegex::InputReaderCallback (void *baton,
Error error (add_regex_cmd->AppendRegexSubstitution (bytes_strref));
if (error.Fail())
{
reader.GetDebugger().GetOutputStream().Printf("error: %s\n", error.AsCString());
StreamSP out_stream = reader.GetDebugger().GetAsyncOutputStream();
out_stream->Printf("error: %s\n", error.AsCString());
out_stream->Flush();
add_regex_cmd->InputReaderDidCancel ();
reader.SetIsDone (true);
}
@ -959,9 +965,13 @@ CommandObjectCommandsAddRegex::InputReaderCallback (void *baton,
break;
case eInputReaderInterrupt:
reader.SetIsDone (true);
reader.GetDebugger().GetOutputStream().PutCString("Regular expression command creations was cancelled.\n");
add_regex_cmd->InputReaderDidCancel ();
{
reader.SetIsDone (true);
StreamSP out_stream = reader.GetDebugger().GetAsyncOutputStream();
out_stream->PutCString("Regular expression command creations was cancelled.\n");
out_stream->Flush();
add_regex_cmd->InputReaderDidCancel ();
}
break;
case eInputReaderEndOfFile:

16
lldb/source/Commands/CommandObjectExpression.cpp
View File

@ -195,11 +195,13 @@ CommandObjectExpression::MultiLineExpressionCallback
switch (notification)
{
case eInputReaderActivate:
reader.GetDebugger().GetOutputStream().Printf("%s\n", "Enter expressions, then terminate with an empty line to evaluate:");
{
StreamSP out_stream = reader.GetDebugger().GetAsyncOutputStream();
out_stream->Printf("%s\n", "Enter expressions, then terminate with an empty line to evaluate:");
out_stream->Flush();
}
// Fall through
case eInputReaderReactivate:
//if (out_fh)
// reader.GetDebugger().GetOutputStream().Printf ("%3u: ", cmd_object_expr->m_expr_line_count);
break;
case eInputReaderDeactivate:
@ -217,14 +219,16 @@ CommandObjectExpression::MultiLineExpressionCallback
if (bytes_len == 0)
reader.SetIsDone(true);
//else if (out_fh && !reader->IsDone())
// ::fprintf (out_fh, "%3u: ", cmd_object_expr->m_expr_line_count);
break;
case eInputReaderInterrupt:
cmd_object_expr->m_expr_lines.clear();
reader.SetIsDone (true);
reader.GetDebugger().GetOutputStream().Printf("%s\n", "Expression evaluation cancelled.");
{
StreamSP out_stream = reader.GetDebugger().GetAsyncOutputStream();
out_stream->Printf("%s\n", "Expression evaluation cancelled.");
out_stream->Flush();
}
break;
case eInputReaderEndOfFile:

10
lldb/source/Target/ThreadPlanTracer.cpp
View File

@ -55,7 +55,7 @@ ThreadPlanTracer::GetLogStream ()
if (m_stream_sp.get())
return m_stream_sp.get();
else
return &(m_thread.GetProcess().GetTarget().GetDebugger().GetOutputStream());
return m_thread.GetProcess().GetTarget().GetDebugger().GetAsyncOutputStream().get();
}
void
@ -65,8 +65,11 @@ ThreadPlanTracer::Log()
bool show_frame_index = false;
bool show_fullpaths = false;
m_thread.GetStackFrameAtIndex(0)->Dump (GetLogStream(), show_frame_index, show_fullpaths);
GetLogStream()->Printf("\n");
Stream *stream = GetLogStream();
m_thread.GetStackFrameAtIndex(0)->Dump (stream, show_frame_index, show_fullpaths);
stream->Printf("\n");
stream->Flush();
}
bool
@ -259,4 +262,5 @@ ThreadPlanAssemblyTracer::Log ()
}
}
stream->EOL();
stream->Flush();
}