obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 93 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/performance/27_io/ifstream_getline-2.cc b/libstdc++-v3/testsuite/performance/27_io/ifstream_getline-2.cc
new file mode 100644
index 000000000..8c9ebd362
--- /dev/null
+++ b/libstdc++-v3/testsuite/performance/27_io/ifstream_getline-2.cc
@@ -0,0 +1,93 @@
+// Copyright (C) 2004, 2009 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+
+#include <cstdio>
+#include <fstream>
+#include <string>
+#include <testsuite_performance.h>
+
+// libstdc++/15002
+int main() 
+{
+  using namespace std;
+  using namespace __gnu_test;
+
+  time_counter time;
+  resource_counter resource;
+
+  const char filename[] = "tmp_getline.txt";
+  const unsigned lines = 1000000;
+  const unsigned line_length = 200;
+
+  char* line = new char[line_length + 2];
+  
+  // Construct data.
+  {
+    memset(line, 'x', line_length);
+    line[line_length] = '\n';
+    line[line_length + 1] = '\0';
+    
+    ofstream out(filename);
+    for (unsigned i = 0; i < lines; ++i)
+      out << line;
+  }
+
+  // C
+  {
+    // Fill the cache.
+    FILE *file = fopen(filename, "r");
+    while (fgets(line, line_length + 2, file));
+    fclose(file);
+
+    file = fopen(filename, "r");
+    start_counters(time, resource);
+    while (fgets(line, line_length + 2, file));
+    stop_counters(time, resource);
+    fclose(file);
+    report_performance(__FILE__, "C (fgets)", time, resource);
+    clear_counters(time, resource);
+  }
+
+  // getline(basic_istream<_CharT, _Traits>& __in,
+  //         basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
+  {
+    ifstream file(filename);
+    string string_line;
+
+    start_counters(time, resource);
+    while (getline(file, string_line));
+    stop_counters(time, resource);
+    report_performance(__FILE__, "C++ (string)", time, resource);
+    clear_counters(time, resource);
+  }
+
+  // getline(char_type* __s, streamsize __n, char_type __delim)
+  {
+    ifstream file(filename);
+    
+    start_counters(time, resource);
+    while (file.getline(line, line_length + 2));
+    stop_counters(time, resource);
+    report_performance(__FILE__, "C++ (char array)", time, resource);
+    clear_counters(time, resource);
+  }
+
+  delete[] line;
+  unlink(filename);
+  return 0;
+}