re PR libstdc++/19422 (assoc. containers: ctor taking range is O(n log n) even if the range is sorted)

2005-01-14  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/19422
	* include/bits/stl_tree.h (_Rb_tree<>::insert_equal(_II, _II),
	_Rb_tree<>::insert_unique(_II, _II)): Use insert_equal (insert_unique,
	respectively) with hint (end()).
	* testsuite/performance/23_containers/set_create_from_sorted.cc: New.

From-SVN: r93663

3 files changed, 93 insertions, 2 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9aa1d6b..00deb29 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-14  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/19422
+	* include/bits/stl_tree.h (_Rb_tree<>::insert_equal(_II, _II),
+	_Rb_tree<>::insert_unique(_II, _II)): Use insert_equal (insert_unique,
+	respectively) with hint (end()).
+	* testsuite/performance/23_containers/set_create_from_sorted.cc: New.
+
 2005-01-13  Geoffrey Keating  <geoffk@apple.com>
 
 	* configure.host (darwin): On darwin8 or later, no need to build
diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index e2442f0..a49b898 100644
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -986,7 +986,7 @@ namespace std
       insert_equal(_II __first, _II __last)
       {
 	for (; __first != __last; ++__first)
-	  insert_equal(*__first);
+	  insert_equal(end(), *__first);
       }
 
   template<typename _Key, typename _Val, typename _KoV,
@@ -997,7 +997,7 @@ namespace std
     insert_unique(_II __first, _II __last)
     {
       for (; __first != __last; ++__first)
-	insert_unique(*__first);
+	insert_unique(end(), *__first);
     }
 
   template<typename _Key, typename _Val, typename _KeyOfValue,
diff --git a/libstdc++-v3/testsuite/performance/23_containers/set_create_from_sorted.cc b/libstdc++-v3/testsuite/performance/23_containers/set_create_from_sorted.cc
new file mode 100644
index 0000000..a1b1b0d68
--- /dev/null
+++ b/libstdc++-v3/testsuite/performance/23_containers/set_create_from_sorted.cc
@@ -0,0 +1,83 @@
+// Copyright (C) 2005 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#include <vector>
+#include <set>
+#include <list>
+#include <sstream>
+#include <testsuite_performance.h>
+
+// adjust for your setup
+static const unsigned max_size = 1000000; // avoid excessive swap file use!
+static const unsigned iterations = 10;    // make results less random while
+static const unsigned step = 50000;       // keeping the total time reasonable
+
+// libstdc++/19422
+int main()
+{
+  using namespace std;
+  using namespace __gnu_test;
+  time_counter time;
+  resource_counter resource;
+
+  typedef set<unsigned>  the_set;
+  typedef list<unsigned> the_list;
+
+  vector<unsigned> v(max_size, 0);
+  for (unsigned i = 0; i != max_size; ++i)
+    v[i] = i; // initialize sorted array
+
+  report_header(__FILE__, "set:");
+  for (unsigned count = step; count <= max_size; count += step)
+    {
+      ostringstream oss;
+      oss << count;
+
+      // measure set construction time
+      start_counters(time, resource);
+      for (unsigned i = 0; i != iterations; ++i)
+	the_set(v.begin(), v.begin() + count);
+      stop_counters(time, resource);
+      report_performance(__FILE__, oss.str(), time, resource);
+      clear_counters(time, resource);
+    }
+
+  report_header(__FILE__, "list:");
+  for (unsigned count = step; count <= max_size; count += step)
+    {
+      ostringstream oss;
+      oss << count;
+
+      // measure list construction time (surely linear in count)
+      start_counters(time, resource);
+      for (unsigned i = 0; i != iterations; ++i)
+	the_list(v.begin(), v.begin() + count);
+      stop_counters(time, resource);
+      report_performance(__FILE__, oss.str(), time, resource);
+      clear_counters(time, resource);
+    }
+}