Changeset 205 in dev for trunk/jenga/include/common

Timestamp:

Jul 12, 2007, 2:57:04 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

Location:

trunk/jenga/include/common

Files:

• BoostXmlSupport.h (modified) (9 diffs)
• logger.h (modified) (6 diffs)

trunk/jenga/include/common/BoostXmlSupport.h

@@ -19 +19 @@
 #include <boost/serialization/is_abstract.hpp>
 
+#include <windows.h>
+
 namespace Jenga{
 namespace Common{
@@ -27 +29 @@
     virtual const char *RootTagName() const = 0;
 
+    void echo( const char *msg ) const
+    {
+        MessageBox( NULL, msg, "XMLシリアライズの例外", MB_OK );
+    }
+
 public:
-    bool Read( istream& ifs )
+    bool Read( istream& ifs, bool isShowExceptionMessage = true )
     {
         bool isSuccessful = false;
@@ -40 +47 @@
             isSuccessful = true;
         }
+        catch( boost::archive::archive_exception e )
+        {
+            if( isShowExceptionMessage )
+            {
+                echo( e.what() );
+            }
+        }
         catch(...){
-            // 失敗
+            if( isShowExceptionMessage )
+            {
+                echo( "archive_exception以外の不明な例外" );
+            }
         }
 
@@ -52 +69 @@
     }
 
-    bool Write( ostream& ofs ) const
+    bool Write( ostream& ofs, bool isShowExceptionMessage = true ) const
     {
         bool isSuccessful = false;
@@ -64 +81 @@
             isSuccessful = true;
         }
-        catch( ... ){
-            // 失敗
+        catch( boost::archive::archive_exception e )
+        {
+            if( isShowExceptionMessage )
+            {
+                echo( e.what() );
+            }
+        }
+        catch(...){
+            if( isShowExceptionMessage )
+            {
+                echo( "archive_exception以外の不明な例外" );
+            }
         }
 
@@ -76 +103 @@
     }
 
-    bool Read( const string &xmlFilePath )
+    bool Read( const string &xmlFilePath, bool isShowExceptionMessage = true )
     {
         bool isSuccessful = false;
@@ -83 +110 @@
         std::ifstream ifs( xmlFilePath.c_str() );
         
-        bool result = Read(ifs);
+        bool result = Read(ifs,isShowExceptionMessage);
 
         // 入力を閉じる
@@ -91 +118 @@
     }
 
-    bool Write( const string &xmlFilePath ) const
+    bool Write( const string &xmlFilePath, bool isShowExceptionMessage = true ) const
     {
         // 出力アーカイブの作成
         std::ofstream ofs( xmlFilePath.c_str() );
 
-        bool result = Write(ofs);
+        bool result = Write(ofs,isShowExceptionMessage);
 
         // 出力を閉じる
@@ -104 +131 @@
     }
 
-    bool ReadFromString( const wstring &xmlBuffer )
+    bool ReadFromString( const string &xmlBuffer )
     {
         bool isSuccessful = false;

trunk/jenga/include/common/logger.h

@@ -13 +13 @@
 
 #include <jenga/include/common/Environment.h>
+#include <jenga/include/common/BoostXmlSupport.h>
 
 #define STDX_DSTREAM_BUFFERING
@@ -23 +24 @@
 
 
+class LoggerSetting : public BoostXmlSupport<LoggerSetting>
+{
+public:
+    int stopStep;
+
+    LoggerSetting()
+        : stopStep( -1 )
+    {
+    }
+
+    // XMLシリアライズ用
+private:
+    virtual const char *RootTagName() const
+    {
+        return "loggerSetting";
+    }
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_NVP( stopStep );
+    }
+};
+
+
 // VC++ で STLport だと using std::char_traits; みたいなのが必要かも
 template <typename Ch_T, typename Tr_T = std::char_traits<Ch_T> >
@@ -29 +54 @@
 protected:
     std::string saveFilePath;
+    int count;
+    LoggerSetting setting;
 
 public:
-    basic_dbg_streambuf( const std::string &saveFilePath )
+    basic_dbg_streambuf( const std::string &saveFilePath, bool isOptionEnabled )
         : saveFilePath( saveFilePath )
+        , count( 0 )
     {
 #ifndef STDX_DSTREAM_BUFFERING
         setbuf(0,0);
 #endif
+
+        if( isOptionEnabled )
+        {
+            // 設定ファイルを読み込む
+            char temporary[MAX_PATH];
+            char temp2[MAX_PATH];
+            char temp3[MAX_PATH];
+            _splitpath(saveFilePath.c_str(),temporary,temp2,temp3,NULL);
+            setting.Read( (string)temporary + temp2 + temp3 + ".setting.xml", false );
+        }
     }
 
@@ -59 +97 @@
 {
     ofstream ofs( ( saveFilePath ).c_str(), ios_base::app );
-    ofs << str ;
+    ofs << "[" << (count++) << "] " << str ;
     ofs.close();
+
+    if( (count-1) == setting.stopStep )
+    {
+        DebugBreak();
+    }
 }
 
@@ -67 +110 @@
 {
 public:
-    basic_dbg_ostream( const string &saveFilePath )
-        : std::basic_ostream<Ch_T, Tr_T>(new basic_dbg_streambuf<Ch_T, Tr_T>(saveFilePath))
+    basic_dbg_ostream( const string &saveFilePath, bool isOptionEnabled )
+        : std::basic_ostream<Ch_T, Tr_T>(new basic_dbg_streambuf<Ch_T, Tr_T>(saveFilePath,isOptionEnabled))
     {
         ofstream ofs( ( saveFilePath ).c_str(), ios_base::trunc );
@@ -87 +130 @@
 
 }}
+
+BOOST_CLASS_IMPLEMENTATION(Jenga::Common::LoggerSetting, boost::serialization::object_serializable);