libitm: Optimize undo log.
libitm/
* local.cc (GTM_LB): Use GTM::gtm_undolog.
(GTM::gtm_thread::drop_references_undolog): Remove.
(GTM::gtm_thread::commit_undolog,
GTM::gtm_thread::rollback_undolog): Move to ...
* libitm_i.h (GTM::gtm_undolog): ...here. New.
(GTM::gtm_undolog_entry): Remove.
(GTM::gtm_thread): Adapt.
* beginend.cc (GTM::gtm_thread::rollback): Adapt.
(GTM::gtm_thread::trycommit): Adapt.
* method-serial.cc (serial_dispatch::log): Adapt.
* method-gl.cc (gl_wt_dispatch::pre_write): Adapt.
(gl_wt_dispatch::store): Fix likely/unlikely.
* containers.h (GTM::vector::resize): Add additional_capacity
parameter and handle it.
(GTM::vector::resize_noinline): New/adapt.
(GTM::vector::push): New.
From-SVN: r182992
diff --git a/libitm/containers.h b/libitm/containers.h
index e8aa94b..394b6f2 100644
--- a/libitm/containers.h
+++ b/libitm/containers.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
Contributed by Torvald Riegel <triegel@redhat.com>.
This file is part of the GNU Transactional Memory Library (libitm).
@@ -70,17 +70,24 @@
}
~vector<T, alloc_separate_cl>() { if (m_capacity) free(entries); }
- void resize()
+ void resize(size_t additional_capacity)
{
- if (m_capacity >= default_resize_max)
- m_capacity = m_capacity + default_resize_max;
+ size_t target = m_capacity + additional_capacity;
+ if (target > default_resize_max)
+ m_capacity = ((target - 1 + default_resize_max) / default_resize_max)
+ * default_resize_max;
else
- m_capacity = m_capacity * 2;
+ while (m_capacity < target)
+ m_capacity = m_capacity * 2;
if (m_capacity < default_resize_min)
m_capacity = default_resize_min;
entries = (T*) xrealloc(entries, sizeof(T) * m_capacity, alloc_separate_cl);
}
- void resize_noinline() __attribute__((noinline)) { resize(); }
+ void resize_noinline() __attribute__((noinline)) { resize(1); }
+ void resize_noinline(size_t elements) __attribute__((noinline))
+ {
+ resize(elements);
+ }
size_t size() const { return m_size; }
size_t capacity() const { return this->capacity; }
@@ -93,6 +100,15 @@
return &entries[m_size++];
}
+ iterator push(size_t elements)
+ {
+ // We don't want inlining here since push() is often on the fast path.
+ if (unlikely(m_size + elements > m_capacity)) resize_noinline(elements);
+ iterator it = &entries[m_size];
+ m_size += elements;
+ return it;
+ }
+
iterator pop() {
if (likely(m_size > 0))
{