[VM] Delete streamable_ field from UntaggedUserTag

TEST=CI

Issue: #61267
Change-Id: I5ae405b2edbe478b6a14aa2416e8e4ee590349cf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445520
Reviewed-by: Ben Konyi <[email protected]>
Commit-Queue: Derek Xu <[email protected]>

Author: derekxu16

runtime/lib/vmservice.cc

@@ -140,74 +140,4 @@ DEFINE_NATIVE_ENTRY(VMService_CancelStream, 0, 1) {
   return Object::null();
 }
 
-#ifndef PRODUCT
-class UserTagIsolatesVisitor : public IsolateVisitor {
- public:
-  UserTagIsolatesVisitor(Thread* thread,
-                         const GrowableObjectArray* user_tags,
-                         bool set_streamable)
-      : IsolateVisitor(),
-        thread_(thread),
-        user_tags_(user_tags),
-        set_streamable_(set_streamable) {}
-
-  virtual void VisitIsolate(Isolate* isolate) {
-    if (Isolate::IsVMInternalIsolate(isolate)) {
-      return;
-    }
-    Zone* zone = thread_->zone();
-    UserTag& tag = UserTag::Handle(zone);
-    String& label = String::Handle(zone);
-    for (intptr_t i = 0; i < user_tags_->Length(); ++i) {
-      label ^= user_tags_->At(i);
-      tag ^= UserTag::FindTagInIsolate(isolate, thread_, label);
-      if (!tag.IsNull()) {
-        tag.set_streamable(set_streamable_);
-      }
-    }
-  }
-
- private:
-  Thread* thread_;
-  const GrowableObjectArray* user_tags_;
-  bool set_streamable_;
-
-  DISALLOW_COPY_AND_ASSIGN(UserTagIsolatesVisitor);
-};
-#endif  // !PRODUCT
-
-// TODO(derekxu16): This function is now dead code and should be cleaned up.
-DEFINE_NATIVE_ENTRY(VMService_AddUserTagsToStreamableSampleList, 0, 1) {
-#ifndef PRODUCT
-  GET_NON_NULL_NATIVE_ARGUMENT(GrowableObjectArray, user_tags,
-                               arguments->NativeArgAt(0));
-
-  Object& obj = Object::Handle();
-  for (intptr_t i = 0; i < user_tags.Length(); ++i) {
-    obj = user_tags.At(i);
-    UserTags::AddStreamableTagName(obj.ToCString());
-  }
-  UserTagIsolatesVisitor visitor(thread, &user_tags, true);
-  Isolate::VisitIsolates(&visitor);
-#endif
-  return Object::null();
-}
-
-// TODO(derekxu16): This function is now dead code and should be cleaned up.
-DEFINE_NATIVE_ENTRY(VMService_RemoveUserTagsFromStreamableSampleList, 0, 1) {
-#ifndef PRODUCT
-  GET_NON_NULL_NATIVE_ARGUMENT(GrowableObjectArray, user_tags,
-                               arguments->NativeArgAt(0));
-
-  Object& obj = Object::Handle();
-  for (intptr_t i = 0; i < user_tags.Length(); ++i) {
-    obj = user_tags.At(i);
-    UserTags::RemoveStreamableTagName(obj.ToCString());
-  }
-  UserTagIsolatesVisitor visitor(thread, &user_tags, false);
-  Isolate::VisitIsolates(&visitor);
-#endif
-  return Object::null();
-}
-
 }  // namespace dart

runtime/vm/bootstrap_natives.h

@@ -293,8 +293,6 @@ namespace dart {
   V(VMService_OnServerAddressChange, 1)                                        \
   V(VMService_ListenStream, 2)                                                 \
   V(VMService_CancelStream, 1)                                                 \
-  V(VMService_AddUserTagsToStreamableSampleList, 1)                            \
-  V(VMService_RemoveUserTagsFromStreamableSampleList, 1)                       \
   V(Ffi_createNativeCallableListener, 2)                                       \
   V(Ffi_createNativeCallableIsolateLocal, 3)                                   \
   V(Ffi_createNativeCallableIsolateGroupBound, 2)                              \

runtime/vm/compiler/runtime_offsets_extracted.h

@@ -373,7 +373,6 @@ char* Dart::DartInit(const Dart_InitializeParams* params) {
 #endif
   IsolateGroup::Init();
   Isolate::InitVM();
-  UserTags::Init();
   PortMap::Init();
   NativeMessageHandler::Init();
   Service::Init();
@@ -779,7 +778,6 @@ char* Dart::Cleanup() {
   ASSERT(Isolate::IsolateListLength() == 0);
   Service::Cleanup();
   PortMap::Cleanup();
-  UserTags::Cleanup();
   IsolateGroup::Cleanup();
   ICData::Cleanup();
   ArgumentsDescriptor::Cleanup();

runtime/vm/dart.cc

@@ -27796,7 +27796,6 @@ UserTagPtr UserTag::New(const String& label, Heap::Space space) {
   // No tag with label exists, create and register with isolate tag table.
   result = Object::Allocate<UserTag>(space);
   result.set_label(label);
-  result.set_streamable(UserTags::IsTagNameStreamable(label.ToCString()));
   AddTagToIsolate(thread, result);
   return result.ptr();
 }

runtime/vm/object.cc

@@ -13370,11 +13370,6 @@ class UserTag : public Instance {
     StoreNonPointer(&untag()->tag_, t);
   }
 
-  bool streamable() const { return untag()->streamable(); }
-  void set_streamable(bool streamable) {
-    StoreNonPointer(&untag()->streamable_, streamable);
-  }
-
   static intptr_t tag_offset() { return OFFSET_OF(UntaggedUserTag, tag_); }
 
   StringPtr label() const { return untag()->label(); }

runtime/vm/object.h

@@ -775,21 +775,6 @@ void SampleBlockBuffer::FreeCompletedBlocks() {
   }
 }
 
-bool SampleBlock::HasStreamableSamples(const GrowableObjectArray& tag_table,
-                                       UserTag* tag) {
-  for (intptr_t i = 0; i < capacity_; ++i) {
-    Sample* sample = At(i);
-    uword sample_tag = sample->user_tag();
-    for (intptr_t j = 0; j < tag_table.Length(); ++j) {
-      *tag ^= tag_table.At(j);
-      if (tag->tag() == sample_tag && tag->streamable()) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
 static void FlushSampleBlocks(Isolate* isolate) {
   ASSERT(isolate != nullptr);
 
@@ -1910,37 +1895,7 @@ void SampleBlockProcessor::Cleanup() {
   ASSERT(!thread_running_);
 }
 
-class StreamableSampleFilter : public SampleFilter {
- public:
-  StreamableSampleFilter(Dart_Port port, const Isolate* isolate)
-      : SampleFilter(port, kNoTaskFilter, -1, -1, true), isolate_(isolate) {}
-
-  bool FilterSample(Sample* sample) override {
-    const UserTag& tag =
-        UserTag::Handle(UserTag::FindTagById(isolate_, sample->user_tag()));
-    return tag.streamable();
-  }
-
- private:
-  const Isolate* isolate_;
-};
-
-void Profiler::ProcessCompletedBlocks(Isolate* isolate) {
-  if (!Service::profiler_stream.enabled()) return;
-  auto thread = Thread::Current();
-  if (Isolate::IsSystemIsolate(isolate)) return;
-
-  TIMELINE_DURATION(thread, Isolate, "Profiler::ProcessCompletedBlocks")
-  DisableThreadInterruptsScope dtis(thread);
-  StackZone zone(thread);
-  HandleScope handle_scope(thread);
-  StreamableSampleFilter filter(isolate->main_port(), isolate);
-  Profile profile;
-  profile.Build(thread, isolate, &filter, Profiler::sample_block_buffer());
-  ServiceEvent event(isolate, ServiceEvent::kCpuSamples);
-  event.set_cpu_profile(&profile);
-  Service::HandleEvent(&event);
-}
+void Profiler::ProcessCompletedBlocks(Isolate* isolate) {}
 
 void Profiler::IsolateShutdown(Thread* thread) {
   FlushSampleBlocks(thread->isolate());

runtime/vm/profiler.cc

@@ -95,6 +95,9 @@ class Profiler : public AllStatic {
   }
   inline static intptr_t Size();
 
+  // This function is currently a no-op, but should not be fully deleted
+  // because it will be used to implement
+  // go/dart-universal-observability-for-tools.
   static void ProcessCompletedBlocks(Isolate* isolate);
   static void IsolateShutdown(Thread* thread);
 
@@ -722,8 +725,6 @@ class SampleBlock : public SampleBuffer {
   }
 
  protected:
-  bool HasStreamableSamples(const GrowableObjectArray& tag_table, UserTag* tag);
-
   enum State : uint32_t {
     kFree,
     kSampling,  // I.e., writing.

runtime/vm/profiler.h

@@ -3787,14 +3787,10 @@ class UntaggedUserTag : public UntaggedInstance {
   // Isolate unique tag.
   uword tag_;
 
-  // Should CPU samples with this tag be streamed?
-  bool streamable_;
-
   friend class Object;
 
  public:
   uword tag() const { return tag_; }
-  bool streamable() const { return streamable_; }
 };
 
 class UntaggedFutureOr : public UntaggedInstance {

runtime/vm/raw_object.h

@@ -13,9 +13,6 @@
 
 namespace dart {
 
-MallocGrowableArray<const char*> UserTags::subscribed_tags_(4);
-Mutex* UserTags::subscribed_tags_lock_ = nullptr;
-
 const char* VMTag::TagName(uword tag) {
   if (IsNativeEntryTag(tag)) {
     const uint8_t* native_reverse_lookup = NativeEntry::ResolveSymbol(tag);
@@ -147,55 +144,4 @@ const char* UserTags::TagName(Thread* thread, Isolate* isolate, uword tag_id) {
   return label.ToCString();
 }
 
-void UserTags::AddStreamableTagName(const char* tag) {
-  MutexLocker ml(subscribed_tags_lock_);
-  // Check this tag isn't already in the subscription list.
-  for (intptr_t i = 0; i < subscribed_tags_.length(); ++i) {
-    if (strcmp(tag, subscribed_tags_.At(i)) == 0) {
-      return;
-    }
-  }
-  subscribed_tags_.Add(Utils::StrDup(tag));
-}
-
-void UserTags::RemoveStreamableTagName(const char* tag) {
-  MutexLocker ml(subscribed_tags_lock_);
-  bool found = false;
-  for (intptr_t i = 0; i < subscribed_tags_.length(); ++i) {
-    if (strcmp(tag, subscribed_tags_.At(i)) == 0) {
-      free(const_cast<char*>(subscribed_tags_.At(i)));
-      subscribed_tags_.RemoveAt(i);
-      found = true;
-      break;
-    }
-  }
-  ASSERT(found);
-}
-
-bool UserTags::IsTagNameStreamable(const char* tag) {
-  MutexLocker ml(subscribed_tags_lock_);
-  for (intptr_t i = 0; i < subscribed_tags_.length(); ++i) {
-    if (strcmp(tag, subscribed_tags_.At(i)) == 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void UserTags::Init() {
-  subscribed_tags_lock_ = new Mutex();
-}
-
-void UserTags::Cleanup() {
-  {
-    MutexLocker ml(subscribed_tags_lock_);
-    for (intptr_t i = 0; i < subscribed_tags_.length(); ++i) {
-      free(const_cast<char*>(subscribed_tags_.At(i)));
-    }
-    subscribed_tags_.Clear();
-  }
-  delete subscribed_tags_lock_;
-  subscribed_tags_lock_ = nullptr;
-}
-
 }  // namespace dart