ios.cc (ios_base::Init::_S_ios_create): Rename __bufsize to __out_bufsize.

	libstdc++/2211
	* src/ios.cc (ios_base::Init::_S_ios_create): Rename __bufsize to
	__out_bufsize.  Add __in_bufsize, document it and use it.

From-SVN: r43707

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 89203b6baf865652305b740c2264fec5317d8194..d4089dd634ba3fb32cb9fe5f9bb5bba3097f875a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-02  Loren J. Rittle  <ljrittle@acm.org>
+
+       libstdc++/2211
+       * src/ios.cc (ios_base::Init::_S_ios_create): Rename __bufsize to
+       __out_bufsize.  Add __in_bufsize, document it and use it.  
+
 2001-07-01  Stephen M. Webb <stephen@bregmasoft.com>
 
        * include/bits/stl_construct.h (construct): Remove.

diff --git a/libstdc++-v3/src/ios.cc b/libstdc++-v3/src/ios.cc
index 244585e98849eb84ffd90c8a2ea030133a82fe59..182f5046ed1ba0634d2a3a0d64e95587e53e280e 100644 (file)
--- a/libstdc++-v3/src/ios.cc
+++ b/libstdc++-v3/src/ios.cc
@@ -144,14 +144,23 @@ namespace std
   void
   ios_base::Init::_S_ios_create(bool __sync)
   {
-    int __bufsize = __sync ? 0 : static_cast<int>(BUFSIZ);
+    int __out_bufsize = __sync ? 0 : static_cast<int>(BUFSIZ);
+    int __in_bufsize = __sync ? 1 : static_cast<int>(BUFSIZ);
+
+#if _GLIBCPP_AVOID_FSEEK
+    // Platforms that prefer to avoid fseek() calls on streams only
+    // get their desire when the C++-layer input buffer size is 1.
+    // This hack hurts performance but keeps correctness across
+    // all types of streams that might be attached to (e.g.) cin.
+    __in_bufsize = 1;
+#endif
 
     // NB: The file globals.cc creates the four standard files
     // with NULL buffers. At this point, we swap out the dummy NULL
     // [io]stream objects and buffers with the real deal.
-    new (&buf_cout) filebuf(stdout, ios_base::out, __bufsize);
-    new (&buf_cin) filebuf(stdin, ios_base::in, 1);
-    new (&buf_cerr) filebuf(stderr, ios_base::out, __bufsize);
+    new (&buf_cout) filebuf(stdout, ios_base::out, __out_bufsize);
+    new (&buf_cin) filebuf(stdin, ios_base::in, __in_bufsize);
+    new (&buf_cerr) filebuf(stderr, ios_base::out, __out_bufsize);
     new (&cout) ostream(&buf_cout);
     new (&cin) istream(&buf_cin);
     new (&cerr) ostream(&buf_cerr);
@@ -160,9 +169,9 @@ namespace std
     cerr.flags(ios_base::unitbuf);
     
 #ifdef _GLIBCPP_USE_WCHAR_T
-    new (&buf_wcout) wfilebuf(stdout, ios_base::out, __bufsize);
-    new (&buf_wcin) wfilebuf(stdin, ios_base::in, 1);
-    new (&buf_wcerr) wfilebuf(stderr, ios_base::out, __bufsize);
+    new (&buf_wcout) wfilebuf(stdout, ios_base::out, __out_bufsize);
+    new (&buf_wcin) wfilebuf(stdin, ios_base::in, __in_bufsize);
+    new (&buf_wcerr) wfilebuf(stderr, ios_base::out, __out_bufsize);
     new (&wcout) wostream(&buf_wcout);
     new (&wcin) wistream(&buf_wcin);
     new (&wcerr) wostream(&buf_wcerr);