content/browser/indexed_db/indexed_db_transaction_coordinator.cc - Issue 2472213003: [IndexedDB] Refactoring to remove ref ptrs and host transaction ids.

Unified Diff: content/browser/indexed_db/indexed_db_transaction_coordinator.cc

Issue 2472213003: [IndexedDB] Refactoring to remove ref ptrs and host transaction ids. (Closed)

Patch Set: comments Created 4 years 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

« no previous file with comments | « content/browser/indexed_db/indexed_db_transaction_coordinator.h ('k') | content/browser/indexed_db/indexed_db_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/indexed_db/indexed_db_transaction_coordinator.cc

diff --git a/content/browser/indexed_db/indexed_db_transaction_coordinator.cc b/content/browser/indexed_db/indexed_db_transaction_coordinator.cc

index c7d171bca65a63123176d77225b04db123773408..68e01728813500240ba1625873519d9073cc87ea 100644

--- a/content/browser/indexed_db/indexed_db_transaction_coordinator.cc

+++ b/content/browser/indexed_db/indexed_db_transaction_coordinator.cc

@@ -18,7 +18,7 @@ IndexedDBTransactionCoordinator::~IndexedDBTransactionCoordinator() {

}

void IndexedDBTransactionCoordinator::DidCreateTransaction(

- scoped_refptr<IndexedDBTransaction> transaction) {

+ IndexedDBTransaction* transaction) {

DCHECK(!queued_transactions_.count(transaction));

DCHECK(!started_transactions_.count(transaction));

DCHECK_EQ(IndexedDBTransaction::CREATED, transaction->state());

@@ -65,12 +65,11 @@ bool IndexedDBTransactionCoordinator::IsActive(

std::vector<const IndexedDBTransaction*>

IndexedDBTransactionCoordinator::GetTransactions() const {

std::vector<const IndexedDBTransaction*> result;

- for (const auto& transaction : started_transactions_)

- result.push_back(transaction.get());

- for (const auto& transaction : queued_transactions_)

- result.push_back(transaction.get());

+ result.reserve(started_transactions_.size() + queued_transactions_.size());

+ result.insert(result.end(), started_transactions_.begin(),

sof 2016/12/05 20:00:20 Somewhat odd, but I'm running into compilation bre

Somewhat odd, but I'm running into compilation breakage with the use of these list_set<> iterators in insert(): In file included from ../../content/browser/indexed_db/indexed_db_transaction_coordinator.cc:5: In file included from ../../content/browser/indexed_db/indexed_db_transaction_coordinator.h:10: In file included from /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/map:60: In file included from /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/bits/stl_tree.h:63: In file included from /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/bits/stl_algobase.h:69: In file included from /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/debug.h:138: /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:137:61: error: indirection requires pointer operand ('const list_set<content::IndexedDBTransaction *>::const_iterator' invalid) return __foreign_iterator_aux4(__it, std::__addressof(*__other)); ^~~~~~~~ /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:181:14: note: in instantiation of function template specialization '__gnu_debug::__foreign_iterator_aux3<__gnu_cxx::__normal_iterator<const content::IndexedDBTransaction *const *, std::__cxx1998::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> > >, std::__debug::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction *>::const_iterator>' requested here return __foreign_iterator_aux3(__it, __other, __other_end, __tag()); ^ /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:201:5: note: in instantiation of function template specialization '__gnu_debug::__foreign_iterator_aux2<__gnu_cxx::__normal_iterator<const content::IndexedDBTransaction *const *, std::__cxx1998::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> > >, std::__debug::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction *>::const_iterator>' requested here || __foreign_iterator_aux2(__it, std::__miter_base(__other), ^ /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:212:14: note: in instantiation of function template specialization '__gnu_debug::__foreign_iterator_aux<__gnu_cxx::__normal_iterator<const content::IndexedDBTransaction *const *, std::__cxx1998::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> > >, std::__debug::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction *>::const_iterator>' requested here return __foreign_iterator_aux(__it, __other, __other_end, _Integral()); ^ /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/vector:587:4: note: in instantiation of function template specialization '__gnu_debug::__foreign_iterator<__gnu_cxx::__normal_iterator<const content::IndexedDBTransaction *const *, std::__cxx1998::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> > >, std::__debug::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction *>::const_iterator>' requested here __glibcxx_check_insert_range(__position, __first, __last, __dist); ^ /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/macros.h:116:36: note: expanded from macro '__glibcxx_check_insert_range' _GLIBCXX_DEBUG_VERIFY(__gnu_debug::__foreign_iterator(_Position,_First,_Last), ^ ../../content/browser/indexed_db/indexed_db_transaction_coordinator.cc:69:10: note: in instantiation of function template specialization 'std::__debug::vector<const content::IndexedDBTransaction *, std::allocator<const content::IndexedDBTransaction *> >::insert<list_set<content::IndexedDBTransaction *>::const_iterator, void>' requested here result.insert(result.end(), started_transactions_.begin(), ^ 1 error generated. ninja: build stopped: subcommand failed. Same happens with the g++ 4.9 STL headers on a different workstation (both with the default is_clang=true) -- no one else has reported similar issues and/or known cause?

jsbell 2016/12/06 00:00:47 Weird - I haven't heard any other reports. list_

On 2016/12/05 20:00:20, sof wrote: > Somewhat odd, but I'm running into compilation breakage with the use of these > list_set<> iterators in insert(): > > In file included from > ../../content/browser/indexed_db/indexed_db_transaction_coordinator.cc:5: > In file included from > ../../content/browser/indexed_db/indexed_db_transaction_coordinator.h:10: > In file included from > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/map:60: > In file included from > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/bits/stl_tree.h:63: > In file included from > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/bits/stl_algobase.h:69: > In file included from > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/debug.h:138: > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:137:61: > error: indirection requires pointer operand ('const > list_set<content::IndexedDBTransaction *>::const_iterator' invalid) > return __foreign_iterator_aux4(__it, std::__addressof(*__other)); > ^~~~~~~~ > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:181:14: > note: in instantiation of function template specialization > '__gnu_debug::__foreign_iterator_aux3<__gnu_cxx::__normal_iterator<const > content::IndexedDBTransaction *const *, std::__cxx1998::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> > >, std::__debug::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction > *>::const_iterator>' requested here > return __foreign_iterator_aux3(__it, __other, __other_end, __tag()); > ^ > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:201:5: > note: in instantiation of function template specialization > '__gnu_debug::__foreign_iterator_aux2<__gnu_cxx::__normal_iterator<const > content::IndexedDBTransaction *const *, std::__cxx1998::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> > >, std::__debug::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction > *>::const_iterator>' requested here > || __foreign_iterator_aux2(__it, std::__miter_base(__other), > ^ > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/functions.h:212:14: > note: in instantiation of function template specialization > '__gnu_debug::__foreign_iterator_aux<__gnu_cxx::__normal_iterator<const > content::IndexedDBTransaction *const *, std::__cxx1998::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> > >, std::__debug::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction > *>::const_iterator>' requested here > return __foreign_iterator_aux(__it, __other, __other_end, _Integral()); > ^ > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/vector:587:4: > note: in instantiation of function template specialization > '__gnu_debug::__foreign_iterator<__gnu_cxx::__normal_iterator<const > content::IndexedDBTransaction *const *, std::__cxx1998::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> > >, std::__debug::vector<const > content::IndexedDBTransaction *, std::allocator<const > content::IndexedDBTransaction *> >, list_set<content::IndexedDBTransaction > *>::const_iterator>' requested here > __glibcxx_check_insert_range(__position, __first, __last, __dist); > ^ > /usr/lib/gcc/x86_64-linux-gnu/6.2.0/../../../../include/c++/6.2.0/debug/macros.h:116:36: > note: expanded from macro '__glibcxx_check_insert_range' > _GLIBCXX_DEBUG_VERIFY(__gnu_debug::__foreign_iterator(_Position,_First,_Last), > ^ > ../../content/browser/indexed_db/indexed_db_transaction_coordinator.cc:69:10: > note: in instantiation of function template specialization > 'std::__debug::vector<const content::IndexedDBTransaction *, > std::allocator<const content::IndexedDBTransaction *> > >::insert<list_set<content::IndexedDBTransaction *>::const_iterator, void>' > requested here > result.insert(result.end(), started_transactions_.begin(), > ^ > 1 error generated. > ninja: build stopped: subcommand failed. > > Same happens with the g++ 4.9 STL headers on a different workstation (both with > the default is_clang=true) -- no one else has reported similar issues and/or > known cause?

Weird - I haven't heard any other reports. list_set isn't too fancy - fixes welcome!

+ started_transactions_.end());

+ result.insert(result.end(), queued_transactions_.begin(),

+ queued_transactions_.end());

return result;

}

@@ -98,9 +97,9 @@ void IndexedDBTransactionCoordinator::ProcessQueuedTransactions() {

auto it = queued_transactions_.begin();

while (it != queued_transactions_.end()) {

- scoped_refptr<IndexedDBTransaction> transaction = *it;

+ IndexedDBTransaction* transaction = *it;

++it;

- if (CanStartTransaction(transaction.get(), locked_scope)) {

+ if (CanStartTransaction(transaction, locked_scope)) {

DCHECK_EQ(IndexedDBTransaction::CREATED, transaction->state());

queued_transactions_.erase(transaction);

started_transactions_.insert(transaction);