diff options
| author | Greg Clayton <gclayton@apple.com> | 2010-11-06 01:53:30 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2010-11-06 01:53:30 +0000 |
| commit | 2d4edfbc6ad8c8823791dd0285302282d2d2ed03 (patch) | |
| tree | c5462c66c46d3ed32bdd6738e948eb410cb0bfde /lldb/source/Core/Communication.cpp | |
| parent | 8e3d95e7dfb44fcd2d7fbf94f104fe821c42268e (diff) | |
| download | bcm5719-llvm-2d4edfbc6ad8c8823791dd0285302282d2d2ed03.tar.gz bcm5719-llvm-2d4edfbc6ad8c8823791dd0285302282d2d2ed03.zip | |
Modified all logging calls to hand out shared pointers to make sure we
don't crash if we disable logging when some code already has a copy of the
logger. Prior to this fix, logs were handed out as pointers and if they were
held onto while a log got disabled, then it could cause a crash. Now all logs
are handed out as shared pointers so this problem shouldn't happen anymore.
We are also using our new shared pointers that put the shared pointer count
and the object into the same allocation for a tad better performance.
llvm-svn: 118319
Diffstat (limited to 'lldb/source/Core/Communication.cpp')
| -rw-r--r-- | lldb/source/Core/Communication.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp index 2fb9cba3ff5..f6c689c7aa5 100644 --- a/lldb/source/Core/Communication.cpp +++ b/lldb/source/Core/Communication.cpp @@ -301,7 +301,7 @@ Communication::ReadThread (void *p) { Communication *comm = (Communication *)p; - Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMUNICATION); + LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMUNICATION)); if (log) log->Printf ("%p Communication::ReadThread () thread starting...", p); @@ -334,7 +334,8 @@ Communication::ReadThread (void *p) default: case eConnectionStatusError: // Check GetError() for details case eConnectionStatusTimedOut: // Request timed out - error.LogIfError(log, "%p Communication::BytesAvailable () => status = %i", p, status); + if (log) + error.LogIfError(log.get(), "%p Communication::BytesAvailable () => status = %i", p, status); break; } } |

