Changeset 21009
- Timestamp:
- 01/16/08 21:37:26 (8 months ago)
- Files:
-
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketDatagram_t.h (modified) (6 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/SocketStream_t.h (modified) (2 diffs)
- juggler/trunk/modules/vapor/vpr/IO/Socket/Socket_t.h (modified) (11 diffs)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketImplNSPR.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketImplNSPR.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketStreamImplNSPR.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketStreamImplNSPR.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketImplBSD.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketImplBSD.h (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketStreamImplBSD.cpp (modified) (1 diff)
- juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketStreamImplBSD.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/vapor/vpr/IO/Socket/SocketDatagram_t.h
r21003 r21009 131 131 vpr::Uint32 recvfrom(void* msg, const vpr::Uint32 len, 132 132 vpr::InetAddr& from, 133 const vpr::Interval timeout = vpr::Interval::NoTimeout)133 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 134 134 { 135 135 return mSocketDgramImpl->recvfrom(msg, len, from, timeout); … … 144 144 vpr::Uint32 recvfrom(std::string& msg, const vpr::Uint32 len, 145 145 vpr::InetAddr& from, 146 const vpr::Interval timeout = vpr::Interval::NoTimeout)146 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 147 147 { 148 148 msg.resize(len); … … 160 160 vpr::Uint32 recvfrom(std::vector<vpr::Uint8>& msg, 161 161 const vpr::Uint32 len, vpr::InetAddr& from, 162 const vpr::Interval timeout = vpr::Interval::NoTimeout)162 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 163 163 { 164 164 msg.resize(len); … … 181 181 vpr::Uint32 sendto(const void* msg, const vpr::Uint32 len, 182 182 const vpr::InetAddr& to, 183 const vpr::Interval timeout = vpr::Interval::NoTimeout)183 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 184 184 { 185 185 return mSocketDgramImpl->sendto(msg, len, to, timeout); … … 193 193 vpr::Uint32 sendto(const std::string& msg, const vpr::Uint32 len, 194 194 const vpr::InetAddr& to, 195 const vpr::Interval timeout = vpr::Interval::NoTimeout)195 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 196 196 { 197 197 vprASSERT(len <= msg.size() && "Length is bigger than data given"); … … 206 206 vpr::Uint32 sendto(const std::vector<vpr::Uint8>& msg, 207 207 const vpr::Uint32 len, const vpr::InetAddr& to, 208 const vpr::Interval timeout = vpr::Interval::NoTimeout)208 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 209 209 { 210 210 vprASSERT(len <= msg.size() && "Length is bigger than data given"); juggler/trunk/modules/vapor/vpr/IO/Socket/SocketStream_t.h
r21008 r21009 95 95 * remote socket address. 96 96 */ 97 SocketStream_t(vpr::InetAddr localAddr, vpr::InetAddr remoteAddr) 97 SocketStream_t(const vpr::InetAddr& localAddr, 98 const vpr::InetAddr& remoteAddr) 98 99 { 99 100 mSocketStreamImpl = … … 166 167 */ 167 168 void accept(SocketStream_t& sock, 168 const vpr::Interval timeout = vpr::Interval::NoTimeout)169 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 169 170 { 170 171 mSocketStreamImpl->accept(*(sock.mSocketStreamImpl), timeout); juggler/trunk/modules/vapor/vpr/IO/Socket/Socket_t.h
r21003 r21009 268 268 * @throws vpr::SocketException if could not connect. 269 269 */ 270 void connect(const vpr::Interval timeout = vpr::Interval::NoTimeout)270 void connect(const vpr::Interval& timeout = vpr::Interval::NoTimeout) 271 271 { 272 272 mSocketImpl->connect(timeout); … … 300 300 */ 301 301 vpr::Uint32 recv(void* buffer, const vpr::Uint32 length, 302 const vpr::Interval timeout = vpr::Interval::NoTimeout)302 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 303 303 { 304 304 return read(buffer, length, timeout); … … 332 332 */ 333 333 vpr::Uint32 recv(std::string& buffer, const vpr::Uint32 length, 334 const vpr::Interval timeout = vpr::Interval::NoTimeout)334 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 335 335 { 336 336 return read(buffer, length, timeout); … … 364 364 */ 365 365 vpr::Uint32 recv(std::vector<vpr::Uint8>& buffer, const vpr::Uint32 length, 366 const vpr::Interval timeout = vpr::Interval::NoTimeout)366 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 367 367 { 368 368 return read(buffer, length, timeout); … … 394 394 */ 395 395 vpr::Uint32 recvn(void* buffer, const vpr::Uint32 length, 396 const vpr::Interval timeout = vpr::Interval::NoTimeout)396 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 397 397 { 398 398 return readn(buffer, length, timeout); … … 424 424 */ 425 425 vpr::Uint32 recvn(std::string& buffer, const vpr::Uint32 length, 426 const vpr::Interval timeout = vpr::Interval::NoTimeout)426 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 427 427 { 428 428 return readn(buffer, length, timeout); … … 454 454 */ 455 455 vpr::Uint32 recvn(std::vector<vpr::Uint8>& buffer, const vpr::Uint32 length, 456 const vpr::Interval timeout = vpr::Interval::NoTimeout)456 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 457 457 { 458 458 return readn(buffer, length, timeout); … … 492 492 */ 493 493 vpr::Uint32 send(const void* buffer, const vpr::Uint32 length, 494 const vpr::Interval timeout = vpr::Interval::NoTimeout)494 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 495 495 { 496 496 return write(buffer, length, timeout); … … 525 525 */ 526 526 vpr::Uint32 send(const std::string& buffer, const vpr::Uint32 length, 527 const vpr::Interval timeout = vpr::Interval::NoTimeout)527 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 528 528 { 529 529 vprASSERT(length <= buffer.size() && "length was bigger than the data given"); … … 560 560 vpr::Uint32 send(const std::vector<vpr::Uint8>& buffer, 561 561 const vpr::Uint32 length, 562 const vpr::Interval timeout = vpr::Interval::NoTimeout)562 const vpr::Interval& timeout = vpr::Interval::NoTimeout) 563 563 { 564 564 vprASSERT(length <= buffer.size() && "length was bigger than the data given"); … … 739 739 * @throw vpr::SocketException Thrown if the operation failed. 740 740 */ 741 void setTypeOfService(const vpr::SocketOptions::TypeOfService &tos)741 void setTypeOfService(const vpr::SocketOptions::TypeOfService tos) 742 742 { 743 743 vpr::SocketOptions::Data option; juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketImplNSPR.cpp
r20997 r21009 346 346 // destination for all packets. For a stream socket, this has the effect of 347 347 // establishing a connection with the destination. 348 void SocketImplNSPR::connect( vpr::Intervaltimeout)348 void SocketImplNSPR::connect(const vpr::Interval& timeout) 349 349 { 350 350 vprASSERT(true == mOpen && "Trying to connect an un-opened socket"); juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketImplNSPR.h
r20997 r21009 206 206 * @throw vpr::SocketException If could not connect. 207 207 */ 208 void connect(const vpr::Interval timeout = vpr::Interval::NoTimeout);208 void connect(const vpr::Interval& timeout = vpr::Interval::NoTimeout); 209 209 210 210 /** juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketStreamImplNSPR.cpp
r20998 r21009 125 125 // Accept an incoming connection request. 126 126 void SocketStreamImplNSPR::accept(SocketStreamImplNSPR& sock, 127 vpr::Intervaltimeout)127 const vpr::Interval& timeout) 128 128 { 129 129 vpr::InetAddr addr; juggler/trunk/modules/vapor/vpr/md/NSPR/IO/Socket/SocketStreamImplNSPR.h
r20997 r21009 134 134 */ 135 135 void accept(SocketStreamImplNSPR& sock, 136 const vpr::Interval timeout = vpr::Interval::NoTimeout);136 const vpr::Interval& timeout = vpr::Interval::NoTimeout); 137 137 138 138 /** juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketImplBSD.cpp
r20997 r21009 321 321 // destination for all packets. For a stream socket, this has the effect of 322 322 // establishing a connection with the destination. 323 void SocketImplBSD::connect( vpr::Intervaltimeout)323 void SocketImplBSD::connect(const vpr::Interval& timeout) 324 324 { 325 325 int status; juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketImplBSD.h
r20997 r21009 212 212 * @throws vpr::SocketException if could not connect. 213 213 */ 214 void connect( vpr::Intervaltimeout = vpr::Interval::NoTimeout);214 void connect(const vpr::Interval& timeout = vpr::Interval::NoTimeout); 215 215 216 216 /** juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketStreamImplBSD.cpp
r20997 r21009 112 112 // Accept an incoming connection request. 113 113 void SocketStreamImplBSD::accept(SocketStreamImplBSD& sock, 114 vpr::Intervaltimeout)114 const vpr::Interval& timeout) 115 115 { 116 116 int accept_sock; juggler/trunk/modules/vapor/vpr/md/POSIX/IO/Socket/SocketStreamImplBSD.h
r20997 r21009 136 136 */ 137 137 void accept(SocketStreamImplBSD& sock, 138 vpr::Intervaltimeout = vpr::Interval::NoTimeout);138 const vpr::Interval& timeout = vpr::Interval::NoTimeout); 139 139 140 140 /**
