- Timestamp:
- 11/05/19 16:02:34 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_ym/XIOS_SERVICES/src/manager/servers_ressource.cpp
r1761 r1764 57 57 } 58 58 59 notify Type_=NOTIFY_CREATE_POOL ;60 notify CreatePool_ = make_tuple(poolId, isPartOf) ;59 notifyOutType_=NOTIFY_CREATE_POOL ; 60 notifyOutCreatePool_ = make_tuple(poolId, isPartOf) ; 61 61 sendNotification(freeRessourcesRank_[i]) ; 62 62 } … … 71 71 for(int rank=0; rank<commSize;rank++) 72 72 { 73 notify Type_=NOTIFY_FINALIZE ;73 notifyOutType_=NOTIFY_FINALIZE ; 74 74 sendNotification(rank) ; 75 75 } … … 89 89 buffer.realloc(maxBufferSize_) ; 90 90 91 if (notify Type_==NOTIFY_CREATE_POOL)91 if (notifyOutType_==NOTIFY_CREATE_POOL) 92 92 { 93 auto& arg=notify CreatePool_ ;94 buffer << notify Type_ << std::get<0>(arg) << std::get<1>(arg) ;93 auto& arg=notifyOutCreatePool_ ; 94 buffer << notifyOutType_ << std::get<0>(arg) << std::get<1>(arg) ; 95 95 } 96 else if (notify Type_==NOTIFY_FINALIZE) buffer << notifyType_ ;96 else if (notifyOutType_==NOTIFY_FINALIZE) buffer << notifyOutType_ ; 97 97 } 98 98 99 99 void CServersRessource::notificationsDumpIn(CBufferIn& buffer) 100 100 { 101 if (buffer.bufferSize() == 0) notify Type_= NOTIFY_NOTHING ;101 if (buffer.bufferSize() == 0) notifyInType_= NOTIFY_NOTHING ; 102 102 else 103 103 { 104 buffer>>notify Type_;105 if (notify Type_==NOTIFY_CREATE_POOL)104 buffer>>notifyInType_; 105 if (notifyInType_==NOTIFY_CREATE_POOL) 106 106 { 107 auto& arg=notify CreatePool_ ;107 auto& arg=notifyInCreatePool_ ; 108 108 buffer >> std::get<0>(arg) >> std::get<1>(arg) ; 109 109 } 110 else if (notify Type_==NOTIFY_FINALIZE) { /*nothing to do*/}110 else if (notifyInType_==NOTIFY_FINALIZE) { /*nothing to do*/} 111 111 } 112 112 } 113 113 114 bool CServersRessource::eventLoop( )114 bool CServersRessource::eventLoop(bool serviceOnly) 115 115 { 116 116 checkNotifications() ; 117 117 if (poolRessource_!=nullptr) 118 118 { 119 if (poolRessource_->eventLoop( ))119 if (poolRessource_->eventLoop(serviceOnly)) 120 120 { 121 121 poolRessource_=nullptr ; … … 135 135 winNotify_->popFromWindow(commRank, this, &CServersRessource::notificationsDumpIn) ; 136 136 winNotify_->unlockWindow(commRank,0) ; 137 if (notify Type_==NOTIFY_CREATE_POOL) createPool() ;138 else if (notify Type_==NOTIFY_FINALIZE) finalizeSignal() ;137 if (notifyInType_==NOTIFY_CREATE_POOL) createPool() ; 138 else if (notifyInType_==NOTIFY_FINALIZE) finalizeSignal() ; 139 139 } 140 140 141 141 void CServersRessource::createPool(void) 142 142 { 143 auto& arg=notify CreatePool_ ;143 auto& arg=notifyInCreatePool_ ; 144 144 string poolId=get<0>(arg) ; 145 145 bool isPartOf=get<1>(arg) ;
Note: See TracChangeset
for help on using the changeset viewer.