Migrate logging infrastructure Isolate->Thread

runtime/vm/log.cc

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/log.h"
 
 #include "vm/flags.h"
 #include "vm/thread.h"
 
 namespace dart {
@@ skipping 57 matching lines @@
   if (buffer_.is_empty()) {
     return;
   }
   if (buffer_.length() <= cursor) {
     return;
   }
   TerminateString();
   const char* str = &buffer_[cursor];
   ASSERT(str != NULL);
   printer_("%s", str);
   buffer_.TruncateTo(cursor);

[Ivan Posva, 2015/09/08 21:22:21]

As far as I can tell this is broken as the string in the buffer is not '\0'
terminated after the truncation.

[koda, 2015/09/09 00:26:57]

The design does *not* assume buffer_ is '\0'-terminated (see comment in
Log::VPrint). The '\0' is only added when printing/flushing.

[Ivan Posva, 2015/09/09 19:56:24]

Thanks for pointing that out. Sneaky!

[koda, 2015/09/09 22:22:57]

Acknowledged.

 }
 
 
 void Log::Clear() {
   if (this == NoOpLog()) {
     return;
   }
   buffer_.TruncateTo(0);
 }
 
@@ skipping 21 matching lines @@
 
 void Log::DisableManualFlush() {
   manual_flush_--;
   ASSERT(manual_flush_ >= 0);
   if (manual_flush_ == 0) {
     Flush();
   }
 }
 
 
-LogBlock::LogBlock(Thread* thread, Log* log)
-    : StackResource(thread),
-      log_(log), cursor_(log->cursor()) {
-  CommonConstructor();
-}
-
-
-LogBlock::LogBlock(Isolate* isolate)
-    : StackResource(isolate),
-      log_(isolate->Log()), cursor_(isolate->Log()->cursor()) {
-  CommonConstructor();
-}
-
-
 LogBlock::LogBlock(Thread* thread)
     : StackResource(thread),
-      log_(thread->isolate()->Log()),
-      cursor_(thread->isolate()->Log()->cursor()) {
+      log_(thread->Log()),
+      cursor_(thread->Log()->cursor()) {
   CommonConstructor();

[Ivan Posva, 2015/09/08 21:22:21]

How about changing CommonConstructor() to Initialize(Log*) and use it for both
constructors to also initialize the fields?

[koda, 2015/09/09 00:26:57]

Done (although it prevents the cursor_ field from being declared const).

[Ivan Posva, 2015/09/09 19:56:24]

Actually, I am fine with duplicating the code and having both log_ and cursor_
be const instead.

[koda, 2015/09/09 22:22:57]

Done.

 }
 
 }  // namespace dart