From ba7f9a90b411a1b8b940d92c3fc26b2ee2cdafcc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 15 Jul 1998 17:14:06 +0000 Subject: [PATCH] speed optimizations: some functions now use wxString::Alloc, wxTextFile::Read uses a buffer to read data (instead of reading it one char at a time) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/config.cpp | 15 ++++---- src/common/fileconf.cpp | 6 ++-- src/common/textfile.cpp | 78 ++++++++++++++++++++++------------------- 3 files changed, 54 insertions(+), 45 deletions(-) diff --git a/src/common/config.cpp b/src/common/config.cpp index 36c7bcdde1..629a359f91 100644 --- a/src/common/config.cpp +++ b/src/common/config.cpp @@ -2,10 +2,10 @@ // Name: config.cpp // Purpose: implementation of wxConfig class // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 07.04.98 // RCS-ID: $Id$ -// Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net +// Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net // Vadim Zeitlin // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// @@ -128,13 +128,14 @@ wxConfig::PathChanger::~PathChanger() wxString ExpandEnvVars(const wxString& str) { wxString strResult; + strResult.Alloc(str.Len()); // don't change the values the enum elements: they must be equal // to the matching [closing] delimiter. enum Bracket - { - Bracket_None, - Bracket_Normal = ')', + { + Bracket_None, + Bracket_Normal = ')', Bracket_Curly = '}', #ifdef __WXMSW__ Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-) @@ -160,8 +161,8 @@ wxString ExpandEnvVars(const wxString& str) } else { switch ( str[n + 1] ) { - case '(': - bracket = Bracket_Normal; + case '(': + bracket = Bracket_Normal; n++; // skip the bracket break; diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index bc0e8aa5ac..f42a86a5bd 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -221,8 +221,8 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal) } if ( *pEnd != ']' ) { - wxLogError("file '%s': unexpected character at line %d (missing ']'?)", - file.GetName(), n + 1); + wxLogError("file '%s': unexpected character %c at line %d.", + file.GetName(), *pEnd, n + 1); continue; // skip this line } @@ -950,6 +950,7 @@ void wxFileConfig::ConfigEntry::SetDirty() wxString FilterIn(const wxString& str) { wxString strResult; + strResult.Alloc(str.Len()); bool bQuoted = !str.IsEmpty() && str[0] == '"'; @@ -989,6 +990,7 @@ wxString FilterIn(const wxString& str) wxString FilterOut(const wxString& str) { wxString strResult; + strResult.Alloc(str.Len()); // quoting is necessary to preserve spaces in the beginning of the string bool bQuote = isspace(str[0]) || str[0] == '"'; diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index 4347c0618b..eb9bae9f39 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -2,7 +2,7 @@ // Name: textfile.cpp // Purpose: implementation of wxTextFile class // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 03.04.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -36,7 +36,7 @@ // ---------------------------------------------------------------------------- // static variables // ---------------------------------------------------------------------------- - + // default type is the native one const wxTextFile::Type wxTextFile::typeDefault = wxTextFile:: #if defined(__WXMSW__) @@ -115,6 +115,7 @@ wxTextFile::Type wxTextFile::GuessType() const case Type_Unix: nUnix++; break; \ case Type_Dos: nDos++; break; \ case Type_Mac: nMac++; break; \ + default: wxFAIL_MSG("unknown line terminator"); \ } uint n; @@ -159,10 +160,12 @@ bool wxTextFile::Read() wxString str; char ch, chLast = '\0'; + char buf[1024]; + int n, nRead; while ( !m_file.Eof() ) { - // @@ should really use a buffer for efficiency - if ( m_file.Read(&ch, sizeof(ch)) == ofsInvalid ) { - // read error + nRead = m_file.Read(buf, WXSIZEOF(buf)); + if ( nRead == ofsInvalid ) { + // read error (error message already given in wxFile::Read) m_file.Close(); return FALSE; } @@ -171,36 +174,39 @@ bool wxTextFile::Read() #pragma message("wxTextFile::Read() hasn't been tested with Mac files.") #endif - switch ( ch ) { - case '\n': - // Dos/Unix line termination - m_aLines.Add(str); - m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix); - str.Empty(); - chLast = '\n'; - break; - - case '\r': - if ( chLast == '\r' ) { - // Mac empty line - m_aLines.Add(""); - m_aTypes.Add(Type_Mac); - } - else - chLast = '\r'; - break; - - default: - if ( chLast == '\r' ) { - // Mac line termination + for ( n = 0; n < nRead; n++ ) { + ch = buf[n]; + switch ( ch ) { + case '\n': + // Dos/Unix line termination m_aLines.Add(str); - m_aTypes.Add(Type_Mac); - str = ch; - } - else { - // add to the current line - str += ch; - } + m_aTypes.Add(chLast == '\r' ? Type_Dos : Type_Unix); + str.Empty(); + chLast = '\n'; + break; + + case '\r': + if ( chLast == '\r' ) { + // Mac empty line + m_aLines.Add(""); + m_aTypes.Add(Type_Mac); + } + else + chLast = '\r'; + break; + + default: + if ( chLast == '\r' ) { + // Mac line termination + m_aLines.Add(str); + m_aTypes.Add(Type_Mac); + str = ch; + } + else { + // add to the current line + str += ch; + } + } } } @@ -224,10 +230,10 @@ bool wxTextFile::Write(Type typeNew) uint nCount = m_aLines.Count(); for ( uint n = 0; n < nCount; n++ ) { - fileTmp.Write(m_aLines[n] + + fileTmp.Write(m_aLines[n] + GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew)); } // replace the old file with this one return fileTmp.Commit(); -} \ No newline at end of file +} -- 2.45.2