Ignore:
Timestamp:
11/14/14 17:56:37 (10 years ago)
Author:
mhnguyen
Message:

Correct bug causing infinite run on multiple server and do some code clean

+) Correct a stupid typo which causes the bug
+) Add comments for class Contextclient
+) Remove some redundant codes

Test
+) On Curie
+) Connection mode: Attached: One and Multiple; Seperated: One and Multiple server
+) File mode: One and multiple file
+) All tests passed (Will it make the trusting board become red :)? )

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/cxios.cpp

    r511 r512  
    2323  bool CXios::usingOasis ; 
    2424  bool CXios::usingServer = false; 
    25   size_t CXios::bufferSize ; 
    26   double CXios::bufferServerFactorSize=2 ; 
    27   size_t CXios::defaultBufferSize=1024*1024*100 ; // 100Mo 
    28   double CXios::defaultBufferServerFactorSize=2 ; 
     25  double CXios::bufferServerFactorSize=1.0 ; 
     26  double CXios::defaultBufferServerFactorSize=1.0 ; 
    2927  bool CXios::printInfo2File; 
    3028  bool CXios::isServerSide; 
    3129  bool CXios::isOptPerformance = true; 
    3230 
     31  //! Parse configuration file and create some objects from it 
    3332  void CXios::initialize() 
    3433  { 
    … …  
    3837  } 
    3938 
     39  /*! 
     40  \brief Parse xios part of configuration file (.iodef.xml) 
     41   Both client and server need information returned from this function 
     42  */ 
    4043  void CXios::parseXiosConfig() 
    4144  { 
    … …  
    4346    usingServer=getin<bool>("using_server",false) ; 
    4447    info.setLevel(getin<int>("info_level",0)) ; 
    45     report.setLevel(getin<int>("info_level",0)); 
     48    report.setLevel(getin<int>("info_level",50)); 
    4649    printInfo2File=getin<bool>("print_file",false); 
    47     bufferSize=getin<size_t>("buffer_size",defaultBufferSize) ; 
     50 
    4851    StdString bufMemory("memory"); 
    4952    StdString bufPerformance("performance"); 
    … …  
    5659    } 
    5760 
    58 //    bufferServerFactorSize=getin<double>("buffer_server_factor_size",defaultBufferServerFactorSize) ; 
    5961    bufferServerFactorSize=getin<double>("buffer_factor_size",defaultBufferServerFactorSize) ; 
    6062    globalComm=MPI_COMM_WORLD ; 
    6163  } 
    6264 
     65  /*! 
     66  Initialize client 
     67  \param [in] codeId identity of context 
     68  \param [in] localComm local communicator 
     69  \param [in/out] returnComm communicator corresponding to group of client with same codeId 
     70  */ 
    6371  void CXios::initClientSide(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm) 
    6472  { 
    … …  
    8997  } 
    9098 
     99  //! Init server by parsing only xios part of config file 
    91100  void CXios::initServer() 
    92101  { 
    … …  
    98107  } 
    99108 
     109  //! Initialize server then put it into listening state 
    100110  void CXios::initServerSide(void) 
    101111  { 
    102 //    initialize(); 
    103112    initServer(); 
    104113    isClient=true; 
    … …  
    123132  } 
    124133 
     134  //! Parse configuration file 
    125135  void CXios::parseFile(const string& filename) 
    126136  { 
    … …  
    128138  } 
    129139 
     140  //! Set using server 
    130141  void CXios::setUsingServer() 
    131142  { 
    … …  
    133144  } 
    134145 
     146  //! Unset using server 
    135147  void CXios::setNotUsingServer() 
    136148  { 
Note: See TracChangeset for help on using the changeset viewer.