Changeset 199
- Timestamp:
- 05/19/11 23:51:02 (14 years ago)
- Location:
- XMLIO_V2/dev/dev_rv/src/xmlio
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
XMLIO_V2/dev/dev_rv/src/xmlio/buffer_list.cpp
r198 r199 36 36 if (SuperClass::operator[](i-1).isAvailable(size)) 37 37 { 38 std::cout << "Données reçues de " << i << std::endl;38 //std::cout << "Données reçues de " << i << std::endl; 39 39 CMPIManager::ReceiveCircularBuffer 40 40 (com_client_server, i, SuperClass::operator[](i-1)); … … 51 51 } 52 52 53 static int u = 0;54 std::cout << "Nouvelle requête disponible " << u++ << std::endl;53 //static int u = 0; 54 //std::cout << "Nouvelle requête disponible " << u++ << std::endl; 55 55 /*if (u == 3046) 56 56 for (int i = 1; i < CMPIManager::GetCommSize(com_client_server); i++) … … 67 67 for (StdSize i = 0; i < this->nbbuffer; i++) 68 68 { 69 std::cout << "Récupération de la requête " << (i+1) << std::endl;69 //std::cout << "Récupération de la requête " << (i+1) << std::endl; 70 70 lbuffer.push_back(SuperClass::operator[](i).getNextRequest()); 71 71 } -
XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.hpp
r198 r199 65 65 const long int & methodId, 66 66 A1 * arg1, A2 * arg2, A3 * arg3, A4 * arg4) 67 { 68 static int recurse = 0; 69 if (recurse > 1) 70 { 71 std::cout << "putain :" << recurse << "," << this->mustBeSent() 72 << "," << currentBuffer << "," << first.getUsedSize() << "," << second.getUsedSize(); 73 if ((currentBuffer == 0) && (first.getUsedSize() != 0) && (second_request != -1)) 74 std::cout << "," << CMPIManager::Test (second_request); 75 if ((currentBuffer == 1) && (second.getUsedSize() != 0) && (first_request != -1)) 76 std::cout << "," << CMPIManager::Test (first_request); 77 std::cout << "," << second_request << "," << first_request << std::endl; 78 } 79 80 if (recurse == 10) exit (-1); 81 67 { 82 68 if (this->mustBeSent()) 83 69 this->sendCurrentBuffer(); 84 85 70 86 71 CLinearBuffer & cbuffer = this->getCurrentBuffer(); … … 102 87 { 103 88 cbuffer.appendRequestInfos(managerId, methodId, nbargs); 104 recurse = 0;105 89 } 106 90 else 107 91 { 108 int o = this->wait(); 109 recurse ++; 110 if (recurse > 1) 111 { 112 113 std::cout << "putain bis:" << recurse << "," << this->mustBeSent() << "," << CMPIManager::Test (o) 114 << "," << currentBuffer << "," << first.getUsedSize() << "," << second.getUsedSize(); 115 if ((currentBuffer == 0) && (first.getUsedSize() != 0) && (second_request != -1)) 116 std::cout << "," << CMPIManager::Test (second_request); 117 if ((currentBuffer == 1) && (second.getUsedSize() != 0) && (first_request != -1)) 118 std::cout << "," << CMPIManager::Test (first_request); 119 std::cout << "," << second_request << "," << first_request << "," << o << std::endl; 120 } 92 this->wait(); 121 93 this->prepareRequest(managerId, methodId, arg1, arg2, arg3, arg4); 122 94 } -
XMLIO_V2/dev/dev_rv/src/xmlio/circular_buffer.cpp
r198 r199 69 69 this->movePRead(currsize); 70 70 this->nbrequest--; 71 std::cout << this->nbrequest << std::endl;71 //std::cout << this->nbrequest << std::endl; 72 72 73 73 return (CLinearBuffer(SuperClass::getData(startpos), currsize)); … … 118 118 { 119 119 this->clear(); 120 return; 120 121 } 121 122 … … 206 207 207 208 StdSize CCircularBuffer::getNumberOfRequest(void) const 208 { return (this->nbrequest); } 209 { 210 return (this->nbrequest); 211 } 212 213 //--------------------------------------------------------------- 209 214 210 215 StdSize CCircularBuffer::getReadPosition(void) const 211 { return (this->p_read); } 216 { 217 return (this->p_read); 218 } 219 220 //--------------------------------------------------------------- 212 221 213 222 StdSize CCircularBuffer::getWritePosition(void) const 214 { return (this->p_write); } 223 { 224 return (this->p_write); 225 } 226 227 //--------------------------------------------------------------- 215 228 216 229 StdSize CCircularBuffer::getUnusedPosition(void) const 217 { return (this->p_unused); } 230 { 231 return (this->p_unused); 232 } 218 233 219 234 //--------------------------------------------------------------- -
XMLIO_V2/dev/dev_rv/src/xmlio/client.cpp
r196 r199 10 10 CClient::CClient(MPIComm comm_client_server) 11 11 : bpair(comm_client_server) 12 { /* Ne rien faire de plus */ } 12 { 13 this->initialize(); 14 } 13 15 14 16 CClient::~CClient(void) 15 { /* Ne rien faire de plus */ } 17 { 18 this->finalize(); 19 } 16 20 17 21 ///-------------------------------------------------------------- … … 42 46 CLinearBuffer::NULL_ARG); 43 47 // Pas d'argument à ajouter. 44 this->bpair.sendCurrentBuffer(); 48 this->bpair.sendCurrentBuffer(); 49 comm::CMPIManager::Barrier(); 45 50 } 46 51 -
XMLIO_V2/dev/dev_rv/src/xmlio/client.hpp
r190 r199 27 27 /// Accesseur /// 28 28 const CBufferPair & getBufferPair(void) const; 29 30 public : 31 29 32 30 /// Appels distants/// 33 31 void initialize(void); // manager 0, method 0 34 32 void finalize(void); // manager 0, method 1 35 33 34 public : 35 36 36 void setContext(const StdString & idContext); // manager 1, method 0 37 37 void updateCalendar(long int timestep); // manager 1, method 1 38 38 39 void sendData(const StdString & fieldId, const ARRAY(float, 1) dataArray);// manager 2, method 039 void sendData(const StdString & fieldId, const ARRAY(float, 1) dataArray); // manager 2, method 0 40 40 void sendData(const StdString & fieldId, const ARRAY(double, 1) dataArray); // manager 2, method 1 41 41 -
XMLIO_V2/dev/dev_rv/src/xmlio/config/properties.conf
r198 r199 15 15 16 16 /// Buffer Size /// 17 DECLARE_PROPERTY (StdSize, BUFFER_CLIENT_SIZE, 1E6) // 1 Mo17 DECLARE_PROPERTY (StdSize, BUFFER_CLIENT_SIZE, 1E6) // 1 Mo 18 18 DECLARE_PROPERTY (StdSize, BUFFER_SERVER_SIZE, 10E6) // 10 Mo 19 19 -
XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp
r198 r199 15 15 try 16 16 { 17 ARRAY_CREATE(value0, double, 1, [200]); 18 ARRAY_CREATE(value1, double, 1, [1000]); 19 ARRAY_CREATE(value2, double, 1, [2000]); 20 comm::CMPIManager::Initialise(&argc, &argv); // < seulement en mode connecté 21 22 if (comm::CMPIManager::IsMaster(comm::CMPIManager::GetCommWorld())) 23 { 24 comm::CServer server(comm::CMPIManager::GetCommWorld()); 25 server.run(); 26 std::cout << "fin serveur" << std::endl; 27 comm::CMPIManager::Barrier(); 28 29 } 30 else 31 { 32 33 comm::CClient client(comm::CMPIManager::GetCommWorld()); 34 client.initialize(); 35 client.setContext("lol"); 36 37 for (int j = 0; j < 10000; j++) 38 { 39 client.updateCalendar(j); 40 client.sendData("mon_champ0", value0); 41 client.sendData("mon_champ1", value1); 42 client.sendData("mon_champ2", value2); 43 } 44 client.finalize(); 45 comm::CMPIManager::Barrier(); 46 } 47 48 comm::CMPIManager::Finalize(); // < seulement en mode connecté 17 //comm::CMPIManager::Initialise(&argc, &argv); // < seulement en mode connecté 18 //comm::CMPIManager::Finalize(); // < seulement en mode connecté 49 19 50 20 51 /*CXIOSManager::Initialise(CXIOSManager::CLIENT_SERVER, &argc, &argv); 52 21 CXIOSManager::Initialise(CXIOSManager::CLIENT_SERVER, &argc, &argv); 53 22 CXIOSManager::AddClient("nemo" , 4, 2, &nemo_fake_entry); 54 23 //CXIOSManager::AddClient("orchidee", 1, 1, &orchidee_fake_entry); 55 24 //CXIOSManager::AddClient("lmdz" , 4, 2, &lmdz_fake_entry); 56 25 CXIOSManager::RunClientServer(comm::CMPIManager::GetCommWorld()); 57 CXIOSManager::Finalize();*/ 58 59 60 26 CXIOSManager::Finalize(); 61 27 } 62 28 catch (CException & exc) -
XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.cpp
r185 r199 346 346 const int ibegin_srv = this->domain->ibegin.getValue(); 347 347 const int jbegin_srv = this->domain->jbegin.getValue(); 348 const int zoom_ni_srv = this->domain->zoom_ni.getValue(); 349 const int zoom_nj_srv = this->domain->zoom_nj.getValue(); 348 350 349 351 const int ibegin_zoom_srv = this->domain->zoom_ibegin_loc.getValue(); … … 379 381 } 380 382 381 dn += storeIndex_cl->size(); 382 383 dn += storeIndex_cl->size(); 384 } 385 386 if (storeIndex_srv->size() != 0) 387 { 388 const int ibegin_t = 389 *std::min_element(out_i_index_srv->begin(), out_i_index_srv->end()); 390 const int iend_t = 391 *std::max_element(out_i_index_srv->begin(), out_i_index_srv->end()); 392 const int jbegin_t = 393 *std::min_element(out_j_index_srv->begin(), out_j_index_srv->end()); 394 const int jend_t = 395 *std::max_element(out_j_index_srv->begin(), out_j_index_srv->end()); 396 397 if (ibegin_t < 0) 398 { 399 std::cout << "Erreur 1 " << std::endl; 400 } 401 if (jbegin_t < 0) 402 { 403 std::cout << "Erreur 2 " << std::endl; 404 } 405 if (iend_t >= zoom_ni_srv) 406 { 407 std::cout << "Erreur 3 " << std::endl; 408 } 409 if (jend_t >= zoom_nj_srv) 410 { 411 std::cout << "Erreur 4 " << std::endl; 412 } 383 413 } 384 414 … … 392 422 //~ } 393 423 //~ ofs.close(); 424 this->storeIndex.resize(1); 425 this->out_i_index.resize(1); 426 this->out_j_index.resize(1); 427 this->out_l_index.resize(1); 394 428 395 429 } -
XMLIO_V2/dev/dev_rv/src/xmlio/server.cpp
r198 r199 112 112 void CServer::initialize(void) // manager 0, method 0 113 113 { 114 std::cout << "initialize called " << std::endl;114 // Ne rien faire de plus 115 115 } 116 116 … … 119 119 void CServer::finalize(void) // manager 0, method 1 120 120 { 121 std::cout << "finalize called " << std::endl;121 comm::CMPIManager::Barrier(); 122 122 } 123 123 … … 159 159 } 160 160 else timestep = timestep_; 161 162 161 } 163 162 std::cout << "updateCalendar called " << timestep <<std::endl;
Note: See TracChangeset
for help on using the changeset viewer.