commit 9daa483d6ec09b56b9832bd7ecd1f08c7f00c26c
author Primiano Tucci <primiano@google.com> Wed Mar 28 23:28:17 2018 +0100
committer Primiano Tucci <primiano@google.com> Thu Mar 29 14:33:12 2018 +0000
tree 15711620e215b725180a656c5d6cfe890ad63316
parent 21c19d86d766f917725797906a379b1a404aa069

Remove DataSourceID and registration callback

Turns out we never actually need neither the notion of
a DataSourceID (!= DataSourceInstanceID) nor a callback
for RegisterDataSource. They represent only useless boilterplate.
It is just more convenient to use the data source name as a key,
we already rely on that being unique.
The proof is that none of the code we have made any use of that
and everything still works without.

Bug: 68854243
Test: perfetto_unittests / perfetto_integrationtests
Change-Id: I67ba8d3f5618760d530d56b474bd46e737484896

src/tracing/core/service_impl_unittest.cc

diff --git a/src/tracing/core/service_impl_unittest.cc b/src/tracing/core/service_impl_unittest.cc
index a10dea9..77256ac 100644
--- a/src/tracing/core/service_impl_unittest.cc
+++ b/src/tracing/core/service_impl_unittest.cc
@@ -110,23 +110,16 @@
 
   DataSourceDescriptor ds_desc1;
   ds_desc1.set_name("foo");
-  producer_endpoint_1->RegisterDataSource(
-      ds_desc1, [this, &producer_endpoint_1](DataSourceID id) {
-        EXPECT_EQ(1u, id);
-        task_runner.PostTask(
-            std::bind(&Service::ProducerEndpoint::UnregisterDataSource,
-                      producer_endpoint_1.get(), id));
-      });
+  producer_endpoint_1->RegisterDataSource(ds_desc1);
 
   DataSourceDescriptor ds_desc2;
   ds_desc2.set_name("bar");
-  producer_endpoint_2->RegisterDataSource(
-      ds_desc2, [this, &producer_endpoint_2](DataSourceID id) {
-        EXPECT_EQ(1u, id);
-        task_runner.PostTask(
-            std::bind(&Service::ProducerEndpoint::UnregisterDataSource,
-                      producer_endpoint_2.get(), id));
-      });
+  producer_endpoint_2->RegisterDataSource(ds_desc2);
+
+  task_runner.RunUntilIdle();
+
+  producer_endpoint_1->UnregisterDataSource("foo");
+  producer_endpoint_2->UnregisterDataSource("bar");
 
   task_runner.RunUntilIdle();
 
@@ -161,7 +154,7 @@
 
   DataSourceDescriptor ds_desc;
   ds_desc.set_name("foo");
-  producer_endpoint->RegisterDataSource(ds_desc, [](DataSourceID) {});
+  producer_endpoint->RegisterDataSource(ds_desc);
 
   task_runner.RunUntilIdle();
 
@@ -247,7 +240,7 @@
 
   DataSourceDescriptor ds_desc;
   ds_desc.set_name("foo");
-  producer_endpoint->RegisterDataSource(ds_desc, [](DataSourceID) {});
+  producer_endpoint->RegisterDataSource(ds_desc);
   task_runner.RunUntilIdle();
 
   // Disconnecting the consumer while tracing should trigger data source
@@ -287,7 +280,7 @@
 
   DataSourceDescriptor ds_desc;
   ds_desc.set_name("foo");
-  producer_endpoint->RegisterDataSource(ds_desc, [](DataSourceID) {});
+  producer_endpoint->RegisterDataSource(ds_desc);
   task_runner.RunUntilIdle();
 
   // Disconnecting the producer while tracing should trigger data source
@@ -312,7 +305,7 @@
   task_runner.RunUntilIdle();
   EXPECT_CALL(mock_producer, CreateDataSourceInstance(_, _));
   EXPECT_CALL(mock_producer, TearDownDataSourceInstance(_));
-  producer_endpoint->RegisterDataSource(ds_desc, [](DataSourceID) {});
+  producer_endpoint->RegisterDataSource(ds_desc);
   task_runner.RunUntilIdle();
 
   EXPECT_CALL(mock_consumer, OnDisconnect());
@@ -403,7 +396,7 @@
 
   DataSourceDescriptor ds_desc;
   ds_desc.set_name("datasource");
-  producer_endpoint->RegisterDataSource(ds_desc, [](DataSourceID) {});
+  producer_endpoint->RegisterDataSource(ds_desc);
   task_runner.RunUntilIdle();
 
   static const char kPayload[] = "1234567890abcdef-";