Changeset 401 for XIOS/trunk
- Timestamp:
- 12/17/12 11:32:12 (11 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 2 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/array_new.hpp
r394 r401 209 209 template <typename T_numtype,int N_rank> inline CMessage& operator<<(CMessage& msg, const CArray<T_numtype, N_rank>& array) 210 210 { 211 msg.push( *array.clone()) ;211 msg.push(array) ; 212 212 return msg ; 213 213 } … … 215 215 template <typename T_numtype,int N_rank> inline CMessage& operator<<(CMessage& msg, CArray<T_numtype, N_rank>& array) 216 216 { 217 msg.push( *array.clone()) ;217 msg.push(array) ; 218 218 return msg ; 219 219 } -
XIOS/trunk/src/context_client.cpp
r386 r401 11 11 #include "mpi.hpp" 12 12 #include "timer.hpp" 13 #include "cxios.hpp" 13 14 14 15 namespace xios … … 206 207 } 207 208 CTimer::get("Blocking time").suspend(); 209 report(0)<< " Memory report : Context <"<<context->getId()<<"> : client side : total memory used for buffer "<<buffers.size()*CXios::bufferSize<<" bytes"<<endl ; 208 210 209 211 releaseBuffers() ; -
XIOS/trunk/src/context_server.cpp
r382 r401 13 13 #include "tracer.hpp" 14 14 #include "timer.hpp" 15 #include "cxios.hpp" 15 16 16 17 … … 183 184 context->finalize() ; 184 185 finished=true ; 186 report(0)<< " Memory report : Context <"<<context->getId()<<"> : server side : total memory used for buffer "<<buffers.size()*CXios::bufferSize<<" bytes"<<endl ; 185 187 } 186 188 else if (event.classId==CContext::GetType()) CContext::dispatchEvent(event) ; -
XIOS/trunk/src/cxios.cpp
r400 r401 9 9 #include "memory.hpp" 10 10 #include <new> 11 #include "memtrack.hpp" 11 12 12 13 namespace xios … … 53 54 void CXios::clientFinalize(void) 54 55 { 55 CClient::finalize() ; 56 CClient::finalize() ; 57 #ifdef XIOS_MEMTRACK 58 MemTrack::TrackListMemoryUsage() ; 59 MemTrack::TrackDumpBlocks(); 60 #endif 56 61 } 57 62 -
XIOS/trunk/src/memory.cpp
r400 r401 9 9 ERROR("void noMemory(void)",<<"Out of memory") ; 10 10 } 11 12 11 } -
XIOS/trunk/src/output/onetcdf4.cpp
r391 r401 169 169 retvalue.push_back(size); 170 170 } 171 171 delete [] dimid; 172 172 return (retvalue); 173 173 } -
XIOS/trunk/src/type/enum.hpp
r394 r401 137 137 template <typename T> __INLINE__ CBufferOut& operator<<(CBufferOut& buffer, const typename T::t_enum & type) ; 138 138 template <typename T> __INLINE__ CBufferIn& operator>>(CBufferIn& buffer, CEnum<T>& type) ; 139 template <typename T> __INLINE__ CMessage& operator<<(CMessage& msg, const CEnum<T>& type) ;139 // template <typename T> __INLINE__ CMessage& operator<<(CMessage& msg, const CEnum<T>& type) ; 140 140 template <typename T> __INLINE__ CMessage& operator<<(CMessage& msg, const typename T::t_enum & type) ; 141 141 … … 143 143 template <typename T> __INLINE__ CBufferOut& operator<<(CBufferOut& buffer, const typename T::t_enum & type); 144 144 template <typename T> __INLINE__ CBufferIn& operator>>(CBufferIn& buffer, CEnum<T>& type); 145 template <typename T> __INLINE__ CMessage& operator<<(CMessage& msg, const CEnum<T>& type);145 // template <typename T> __INLINE__ CMessage& operator<<(CMessage& msg, const CEnum<T>& type); 146 146 template <typename T> __INLINE__ CMessage& operator<<(CMessage& msg, const typename T::t_enum & type); 147 147 } -
XIOS/trunk/src/type/enum_impl.hpp
r380 r401 274 274 } 275 275 276 276 /* 277 277 template <typename T> 278 278 CMessage& operator<<(CMessage& msg, const CEnum<T>& type) … … 281 281 return msg ; 282 282 } 283 */ 283 284 284 285 template <typename T> -
XIOS/trunk/src/type/enum_ref_impl.hpp
r378 r401 298 298 299 299 300 300 /* 301 301 template <typename T> 302 302 CMessage& operator<<(CMessage& msg, const CEnum_ref<T>& type) … … 305 305 return msg ; 306 306 } 307 307 */ 308 308 309 309 template <typename T> -
XIOS/trunk/src/type/message.cpp
r369 r401 91 91 } 92 92 93 CMessage& operator<<(CMessage& msg, CBaseType& type)93 CMessage& operator<<(CMessage& msg,const CBaseType& type) 94 94 { 95 95 msg.push(type) ; -
XIOS/trunk/src/type/type.hpp
r394 r401 152 152 CBufferIn& operator>>(CBufferIn& buffer, T& type) ; 153 153 154 /* 154 155 template <typename T> 155 156 CMessage& operator<<(CMessage& msg, const CType<T>& type) ; … … 157 158 template <typename T> 158 159 CMessage& operator<<(CMessage& msg, const CType_ref<T>& type) ; 159 160 */ 160 161 161 162 template <typename T> -
XIOS/trunk/src/type/type_decl.cpp
r369 r401 18 18 template CBufferIn& operator>> <decl_type> (CBufferIn& buffer, const CType_ref<decl_type>& type) ; \ 19 19 template CBufferIn& operator>> <decl_type> (CBufferIn& buffer, decl_type& type) ; \ 20 template CMessage& operator<< <decl_type> (CMessage& msg, const CType<decl_type>& type) ;\21 template CMessage& operator<< <decl_type> (CMessage& msg, const CType_ref<decl_type>& type) ;\20 /* template CMessage& operator<< <decl_type> (CMessage& msg, const CType<decl_type>& type) ;*/ \ 21 /* template CMessage& operator<< <decl_type> (CMessage& msg, const CType_ref<decl_type>& type) ;*/ \ 22 22 template CMessage& operator<< <decl_type> (CMessage& msg, const decl_type& type) ; \ 23 23 template CMessage& operator<< <decl_type> (CMessage& msg, decl_type& type) ; -
XIOS/trunk/src/type/type_impl.hpp
r369 r401 230 230 } 231 231 232 232 /* 233 233 template <typename T> 234 234 CMessage& operator<<(CMessage& msg, const CType<T>& type) … … 237 237 return msg ; 238 238 } 239 239 */ 240 240 template <typename T> 241 241 CMessage& operator<<(CMessage& msg, const T& type) 242 242 { 243 msg.push( *CType<T>(type).clone()) ;243 msg.push(CType<T>(type)) ; 244 244 return msg ; 245 245 } -
XIOS/trunk/src/type/type_ref_impl.hpp
r369 r401 236 236 237 237 238 238 /* 239 239 template <typename T> 240 240 CMessage& operator<<(CMessage& msg, const CType_ref<T>& type) 241 241 { 242 msg.push( *type.clone()) ;242 msg.push(type) ; 243 243 return msg ; 244 244 } 245 245 */ 246 246 247 247 template <typename T> 248 248 CMessage& operator<<(CMessage& msg, T& type) 249 249 { 250 msg.push( *CType_ref<T>(type).clone()) ;250 msg.push(CType_ref<T>(type)) ; 251 251 return msg ; 252 252 }
Note: See TracChangeset
for help on using the changeset viewer.