Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(738)

Unified Diff: runtime/vm/class_finalizer.cc

Issue 1314673008: Migrate logging infrastructure Isolate->Thread (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Fix test. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/class_finalizer.cc
diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc
index 494a42dce165859275ca1bb362fe0970be515bad..83df7a90bdbff590ac223574eccbae48de1ed4c7 100644
--- a/runtime/vm/class_finalizer.cc
+++ b/runtime/vm/class_finalizer.cc
@@ -338,7 +338,7 @@ void ClassFinalizer::ResolveRedirectingFactoryTarget(
// Target is not resolved yet.
if (FLAG_trace_class_finalization) {
- ISL_Print("Resolving redirecting factory: %s\n",
+ THR_Print("Resolving redirecting factory: %s\n",
String::Handle(factory.name()).ToCString());
}
type ^= FinalizeType(cls, type, kCanonicalize);
@@ -460,7 +460,7 @@ void ClassFinalizer::ResolveTypeClass(const Class& cls,
return;
}
if (FLAG_trace_type_finalization) {
- ISL_Print("Resolve type class of '%s'\n",
+ THR_Print("Resolve type class of '%s'\n",
String::Handle(type.Name()).ToCString());
}
@@ -499,7 +499,7 @@ void ClassFinalizer::ResolveType(const Class& cls, const AbstractType& type) {
}
ASSERT(type.IsType());
if (FLAG_trace_type_finalization) {
- ISL_Print("Resolve type '%s'\n", String::Handle(type.Name()).ToCString());
+ THR_Print("Resolve type '%s'\n", String::Handle(type.Name()).ToCString());
}
ResolveTypeClass(cls, type);
if (type.IsMalformed()) {
@@ -526,7 +526,7 @@ void ClassFinalizer::FinalizeTypeParameters(
const Class& cls,
PendingTypes* pending_types) {
if (FLAG_trace_type_finalization) {
- ISL_Print("Finalizing type parameters of '%s'\n",
+ THR_Print("Finalizing type parameters of '%s'\n",
String::Handle(cls.Name()).ToCString());
}
if (cls.IsMixinApplication()) {
@@ -565,7 +565,7 @@ void ClassFinalizer::CheckRecursiveType(const Class& cls,
PendingTypes* pending_types) {
Isolate* isolate = Isolate::Current();
if (FLAG_trace_type_finalization) {
- ISL_Print("Checking recursive type '%s': %s\n",
+ THR_Print("Checking recursive type '%s': %s\n",
String::Handle(type.Name()).ToCString(),
type.ToCString());
}
@@ -595,7 +595,7 @@ void ClassFinalizer::CheckRecursiveType(const Class& cls,
for (intptr_t i = num_pending_types - 1; i >= 0; i--) {
const Type& pending_type = Type::Cast(pending_types->At(i));
if (FLAG_trace_type_finalization) {
- ISL_Print(" Comparing with pending type '%s': %s\n",
+ THR_Print(" Comparing with pending type '%s': %s\n",
String::Handle(pending_type.Name()).ToCString(),
pending_type.ToCString());
}
@@ -687,7 +687,7 @@ void ClassFinalizer::FinalizeTypeArguments(
ASSERT(super_type_arg.IsType());
CheckRecursiveType(cls, Type::Cast(super_type_arg), pending_types);
if (FLAG_trace_type_finalization) {
- ISL_Print("Creating TypeRef '%s': '%s'\n",
+ THR_Print("Creating TypeRef '%s': '%s'\n",
String::Handle(super_type_arg.Name()).ToCString(),
super_type_arg.ToCString());
}
@@ -708,7 +708,7 @@ void ClassFinalizer::FinalizeTypeArguments(
if (FLAG_trace_type_finalization && super_type_arg.IsTypeRef()) {
AbstractType& ref_type = AbstractType::Handle(
TypeRef::Cast(super_type_arg).type());
- ISL_Print("Instantiating TypeRef '%s': '%s'\n"
+ THR_Print("Instantiating TypeRef '%s': '%s'\n"
" instantiator: '%s'\n",
String::Handle(super_type_arg.Name()).ToCString(),
ref_type.ToCString(),
@@ -895,7 +895,7 @@ void ClassFinalizer::CheckTypeBounds(const Class& cls, const Type& type) {
"type '%s' has an out of bound type argument",
type_name.ToCString());
if (FLAG_trace_type_finalization) {
- ISL_Print("Marking type '%s' as malbounded: %s\n",
+ THR_Print("Marking type '%s' as malbounded: %s\n",
String::Handle(type.Name()).ToCString(),
bound_error.ToCString());
}
@@ -940,7 +940,7 @@ RawAbstractType* ClassFinalizer::FinalizeType(
Zone* Z = Thread::Current()->zone();
if (FLAG_trace_type_finalization) {
- ISL_Print("Finalizing type '%s' for class '%s'\n",
+ THR_Print("Finalizing type '%s' for class '%s'\n",
String::Handle(Z, type.Name()).ToCString(),
cls.ToCString());
}
@@ -967,7 +967,7 @@ RawAbstractType* ClassFinalizer::FinalizeType(
}
if (FLAG_trace_type_finalization) {
- ISL_Print("Done finalizing type parameter '%s' with index %" Pd "\n",
+ THR_Print("Done finalizing type parameter '%s' with index %" Pd "\n",
String::Handle(Z, type_parameter.name()).ToCString(),
type_parameter.index());
}
@@ -1122,7 +1122,7 @@ RawAbstractType* ClassFinalizer::FinalizeType(
for (intptr_t i = pending_types->length() - 1; i >= 0; i--) {
CheckTypeBounds(cls, Type::Cast(pending_types->At(i)));
if (FLAG_trace_type_finalization && type.IsRecursive()) {
- ISL_Print("Done finalizing recursive type '%s': %s\n",
+ THR_Print("Done finalizing recursive type '%s': %s\n",
String::Handle(Z, type.Name()).ToCString(),
type.ToCString());
}
@@ -1141,7 +1141,7 @@ RawAbstractType* ClassFinalizer::FinalizeType(
}
if (FLAG_trace_type_finalization) {
- ISL_Print("Done finalizing type '%s' with %" Pd " type args: %s\n",
+ THR_Print("Done finalizing type '%s' with %" Pd " type args: %s\n",
String::Handle(Z, parameterized_type.Name()).ToCString(),
parameterized_type.arguments() == TypeArguments::null() ?
0 : num_type_arguments,
@@ -1152,7 +1152,7 @@ RawAbstractType* ClassFinalizer::FinalizeType(
if (FLAG_trace_type_finalization && parameterized_type.IsRecursive()) {
AbstractType& type = Type::Handle(Z);
type = parameterized_type.Canonicalize();
- ISL_Print("Done canonicalizing recursive type '%s': %s\n",
+ THR_Print("Done canonicalizing recursive type '%s': %s\n",
String::Handle(Z, type.Name()).ToCString(),
type.ToCString());
return type.raw();
@@ -1853,7 +1853,7 @@ void ClassFinalizer::ApplyMixinAppAlias(const Class& mixin_app_class,
library.AddClass(inserted_class);
if (FLAG_trace_class_finalization) {
- ISL_Print("Creating mixin application alias %s\n",
+ THR_Print("Creating mixin application alias %s\n",
inserted_class.ToCString());
}
@@ -1988,7 +1988,7 @@ void ClassFinalizer::ApplyMixinAppAlias(const Class& mixin_app_class,
ASSERT(!mixin_app_class.is_type_finalized());
ASSERT(!mixin_app_class.is_mixin_type_applied());
if (FLAG_trace_class_finalization) {
- ISL_Print("Inserting class '%s' %s\n"
+ THR_Print("Inserting class '%s' %s\n"
" as super type '%s' with %" Pd " type args: %s\n"
" of mixin application alias '%s' %s\n",
String::Handle(inserted_class.Name()).ToCString(),
@@ -2015,7 +2015,7 @@ void ClassFinalizer::ApplyMixinType(const Class& mixin_app_class,
const Class& mixin_class = Class::Handle(mixin_type.type_class());
if (FLAG_trace_class_finalization) {
- ISL_Print("Applying mixin type '%s' to %s at pos %" Pd "\n",
+ THR_Print("Applying mixin type '%s' to %s at pos %" Pd "\n",
String::Handle(mixin_type.Name()).ToCString(),
mixin_app_class.ToCString(),
mixin_app_class.token_pos());
@@ -2058,7 +2058,7 @@ void ClassFinalizer::ApplyMixinType(const Class& mixin_app_class,
ResolveSuperTypeAndInterfaces(mixin_app_class, &visited_interfaces);
if (FLAG_trace_class_finalization) {
- ISL_Print("Done applying mixin type '%s' to class '%s' %s extending '%s'\n",
+ THR_Print("Done applying mixin type '%s' to class '%s' %s extending '%s'\n",
String::Handle(mixin_type.Name()).ToCString(),
String::Handle(mixin_app_class.Name()).ToCString(),
TypeArguments::Handle(
@@ -2103,7 +2103,7 @@ void ClassFinalizer::CreateForwardingConstructors(
clone_name = Symbols::FromConcat(mixin_name, clone_name);
if (FLAG_trace_class_finalization) {
- ISL_Print("Cloning constructor '%s' as '%s'\n",
+ THR_Print("Cloning constructor '%s' as '%s'\n",
ctor_name.ToCString(),
clone_name.ToCString());
}
@@ -2158,7 +2158,7 @@ void ClassFinalizer::ApplyMixinMembers(const Class& cls) {
// A default constructor will be created for the mixin app alias class.
if (FLAG_trace_class_finalization) {
- ISL_Print("Applying mixin members of %s to %s at pos %" Pd "\n",
+ THR_Print("Applying mixin members of %s to %s at pos %" Pd "\n",
mixin_cls.ToCString(),
cls.ToCString(),
cls.token_pos());
@@ -2217,7 +2217,7 @@ void ClassFinalizer::ApplyMixinMembers(const Class& cls) {
cls.AddFields(cloned_fields);
if (FLAG_trace_class_finalization) {
- ISL_Print("Done applying mixin members of %s to %s\n",
+ THR_Print("Done applying mixin members of %s to %s\n",
mixin_cls.ToCString(),
cls.ToCString());
}
@@ -2231,7 +2231,7 @@ void ClassFinalizer::FinalizeTypesInClass(const Class& cls) {
return;
}
if (FLAG_trace_class_finalization) {
- ISL_Print("Finalize types in %s\n", cls.ToCString());
+ THR_Print("Finalize types in %s\n", cls.ToCString());
}
if (!IsSuperCycleFree(cls)) {
const String& name = String::Handle(cls.Name());
@@ -2365,7 +2365,7 @@ void ClassFinalizer::FinalizeClass(const Class& cls) {
return;
}
if (FLAG_trace_class_finalization) {
- ISL_Print("Finalize %s\n", cls.ToCString());
+ THR_Print("Finalize %s\n", cls.ToCString());
}
if (cls.is_patch()) {
// The fields and functions of a patch class are copied to the
@@ -2739,7 +2739,7 @@ RawType* ClassFinalizer::ResolveMixinAppType(
// processed via the super_type chain of a pending class.
if (FLAG_trace_class_finalization) {
- ISL_Print("Creating mixin application %s\n",
+ THR_Print("Creating mixin application %s\n",
mixin_app_class.ToCString());
}
}
@@ -2760,7 +2760,7 @@ RawType* ClassFinalizer::ResolveMixinAppType(
}
}
if (FLAG_trace_class_finalization) {
- ISL_Print("ResolveMixinAppType: mixin appl type args: %s\n",
+ THR_Print("ResolveMixinAppType: mixin appl type args: %s\n",
mixin_app_args.ToCString());
}
// The mixin application class at depth k is a subclass of mixin application
@@ -2787,7 +2787,7 @@ void ClassFinalizer::ResolveSuperTypeAndInterfaces(
}
ASSERT(visited != NULL);
if (FLAG_trace_class_finalization) {
- ISL_Print("Resolving super and interfaces: %s\n", cls.ToCString());
+ THR_Print("Resolving super and interfaces: %s\n", cls.ToCString());
}
Isolate* isolate = Isolate::Current();
const intptr_t cls_index = cls.id();
@@ -2994,46 +2994,46 @@ void ClassFinalizer::PrintClassInformation(const Class& cls) {
Thread* thread = Thread::Current();
HANDLESCOPE(thread);
const String& class_name = String::Handle(cls.Name());
- ISL_Print("class '%s'", class_name.ToCString());
+ THR_Print("class '%s'", class_name.ToCString());
const Library& library = Library::Handle(cls.library());
if (!library.IsNull()) {
- ISL_Print(" library '%s%s':\n",
+ THR_Print(" library '%s%s':\n",
String::Handle(library.url()).ToCString(),
String::Handle(library.private_key()).ToCString());
} else {
- ISL_Print(" (null library):\n");
+ THR_Print(" (null library):\n");
}
const AbstractType& super_type = AbstractType::Handle(cls.super_type());
if (super_type.IsNull()) {
- ISL_Print(" Super: NULL");
+ THR_Print(" Super: NULL");
} else {
const String& super_name = String::Handle(super_type.Name());
- ISL_Print(" Super: %s", super_name.ToCString());
+ THR_Print(" Super: %s", super_name.ToCString());
}
const Array& interfaces_array = Array::Handle(cls.interfaces());
if (interfaces_array.Length() > 0) {
- ISL_Print("; interfaces: ");
+ THR_Print("; interfaces: ");
AbstractType& interface = AbstractType::Handle();
intptr_t len = interfaces_array.Length();
for (intptr_t i = 0; i < len; i++) {
interface ^= interfaces_array.At(i);
- ISL_Print(" %s ", interface.ToCString());
+ THR_Print(" %s ", interface.ToCString());
}
}
- ISL_Print("\n");
+ THR_Print("\n");
const Array& functions_array = Array::Handle(cls.functions());
Function& function = Function::Handle();
intptr_t len = functions_array.Length();
for (intptr_t i = 0; i < len; i++) {
function ^= functions_array.At(i);
- ISL_Print(" %s\n", function.ToCString());
+ THR_Print(" %s\n", function.ToCString());
}
const Array& fields_array = Array::Handle(cls.fields());
Field& field = Field::Handle();
len = fields_array.Length();
for (intptr_t i = 0; i < len; i++) {
field ^= fields_array.At(i);
- ISL_Print(" %s\n", field.ToCString());
+ THR_Print(" %s\n", field.ToCString());
}
}
« no previous file with comments | « runtime/vm/ast_printer.cc ('k') | runtime/vm/code_generator.cc » ('j') | runtime/vm/thread.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698