Changeset 20996
- Timestamp:
- 01/12/08 06:48:02 (11 months ago)
- Files:
-
- juggler/branches/2.2/modules/vapor/vpr/DynLoad/LibraryLoader.h (modified) (1 diff)
- juggler/branches/2.2/modules/vapor/vpr/IO/Port/SerialPort_t.h (modified) (2 diffs)
- juggler/branches/2.2/modules/vapor/vpr/IO/Socket/SocketDatagram_t.h (modified) (8 diffs)
- juggler/branches/2.2/modules/vapor/vpr/IO/Socket/SocketStream_t.h (modified) (5 diffs)
- juggler/branches/2.2/modules/vapor/vpr/Perf/ProfileManager.h (modified) (1 diff)
- juggler/branches/2.2/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.h (modified) (2 diffs)
- juggler/branches/2.2/modules/vapor/vpr/md/POSIX/IO/Port/SerialPortImplTermios.cpp (modified) (1 diff)
- juggler/branches/2.2/modules/vapor/vpr/md/POSIX/IO/Port/SerialPortImplTermios.h (modified) (2 diffs)
- juggler/branches/2.2/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.h (modified) (1 diff)
- juggler/branches/2.2/modules/vapor/vpr/md/WIN32/IO/Port/SerialPortImplWin32.cpp (modified) (1 diff)
- juggler/branches/2.2/modules/vapor/vpr/md/WIN32/IO/Port/SerialPortImplWin32.h (modified) (2 diffs)
- juggler/branches/2.2/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/branches/2.2/modules/vapor/vpr/DynLoad/LibraryLoader.h
r20500 r20996 237 237 * the name of the shared library to load. 238 238 * 239 * @par ram nameExt The new name extension (such as "_x") that will be used240 * by makeFullDSOName().239 * @param nameExt The new name extension (such as "_x") that will be used 240 * by makeFullDSOName(). 241 241 * 242 242 * @since 1.1.47 juggler/branches/2.2/modules/vapor/vpr/IO/Port/SerialPort_t.h
r20267 r20996 772 772 * (except BREAKs). This is only active if input parity and framing error 773 773 * reporting is enabled (see setInputParityCheck() for more information). 774 * The mark is the three-byte sequence \377 \0 X where X is the byte775 * received in error. If bit stripping is enabled, a valid \377 byte is776 * passed as the two-byte sequence \377 \377.774 * The mark is the three-byte sequence 0377 0 X where X is the byte 775 * received in error. If bit stripping is enabled, a valid 0377 byte is 776 * passed as the two-byte sequence 0377 0377. 777 777 * 778 778 * @pre This serial port is open. … … 785 785 * 786 786 * @see setInputParityCheck 787 * 788 * @note 0377 == 0xFF == 255 787 789 */ 788 790 void setParityErrorMarking(bool flag) juggler/branches/2.2/modules/vapor/vpr/IO/Socket/SocketDatagram_t.h
r19846 r20996 128 128 * Receives a message from some source. The source's address is writen 129 129 * into the by-reference parameter \p from. 130 * @throws vpr::IOException if the operation failed. 130 * 131 * @throw vpr::IOException Thrown if the operation failed. 131 132 */ 132 133 vpr::Uint32 recvfrom(void* msg, const vpr::Uint32 len, … … 140 141 * Receives a message from some source. The source's address is writen 141 142 * into the by-reference parameter \p from. 142 * @throws vpr::IOException if the operation failed. 143 * 144 * @throw vpr::IOException Thrown if the operation failed. 143 145 */ 144 146 vpr::Uint32 recvfrom(std::string& msg, const vpr::Uint32 len, … … 155 157 * Receives a message from some source. The source's address is writen 156 158 * into the by-reference parameter \p from. 157 * @throws vpr::IOException if the operation failed. 159 * 160 * @throw vpr::IOException Thrown if the operation failed. 158 161 */ 159 162 vpr::Uint32 recvfrom(std::vector<vpr::Uint8>& msg, … … 175 178 /** 176 179 * Sends a message to the designated recipient. 177 * @throws vpr::IOException if the operation failed. 180 * 181 * @throw vpr::IOException Thrown if the operation failed. 178 182 */ 179 183 vpr::Uint32 sendto(const void* msg, const vpr::Uint32 len, … … 186 190 /** 187 191 * Sends a message to the designated recipient. 188 * @throws vpr::IOException if the operation failed. 192 * 193 * @throw vpr::IOException Thrown if the operation failed. 189 194 */ 190 195 vpr::Uint32 sendto(const std::string& msg, const vpr::Uint32 len, … … 198 203 /** 199 204 * Sends a message to the designated recipient. 200 * @throws vpr::IOException if the operation failed. 205 * 206 * @throw vpr::IOException Thrown if the operation failed. 201 207 */ 202 208 vpr::Uint32 sendto(const std::vector<vpr::Uint8>& msg, … … 210 216 protected: 211 217 /** 212 * @throws vpr::SocketException. 218 * @throw vpr::SocketException 219 * Thrown if querying the indiccated option on this socket fails. 213 220 */ 214 221 virtual void getOption(const vpr::SocketOptions::Types option, … … 220 227 221 228 /** 222 * @throws vpr::SocketException. 229 * @throw vpr::SocketException 230 * Thrown if setting the indicated option on this socket fails. 223 231 */ 224 232 virtual void setOption(const vpr::SocketOptions::Types option, juggler/branches/2.2/modules/vapor/vpr/IO/Socket/SocketStream_t.h
r19729 r20996 132 132 * @param backlog The maximum length of th queue of pending connections. 133 133 * 134 * @throw s vpr::SocketException if the socket could not be put into135 * a listening state.134 * @throw vpr::SocketException 135 * Thrown if the socket could not be put into a listening state. 136 136 */ 137 137 void listen(const int backlog = 5) … … 153 153 * return. 154 154 * 155 * @throws vpr::WouldBlockException if this is a non-blocking socket, 156 * and there are no waiting connection requests. 157 * @throws vpr::TimeoutException if no connection requests arrived within 158 * the given timeout period. 159 * @throws vpr::SocketException if the connection was not accepted because 160 * of an error. 155 * @throw vpr::WouldBlockException 156 * Thrown if this is a non-blocking socket, and there are no 157 * waiting connection requests. 158 * @throw vpr::TimeoutException 159 * Thrown if no connection requests arrived within the given 160 * timeout period. 161 * @throw vpr::SocketException 162 * Thrown if the connection was not accepted because of an error. 161 163 * 162 164 * @see open, bind, listen … … 182 184 * @param backlog The maximum length of the pending connection queue. 183 185 * 184 * @throws vpr::WouldBlockException if this is a non-blocking socket, 185 * and there are no waiting connection requests. 186 * @throws vpr::TimeoutException if no connection requests arrived within 187 * the given timeout period. 188 * @throws vpr::SocketException if the connection was not accepted because 189 * of an error. 186 * @throw vpr::WouldBlockException 187 * Thrown if this is a non-blocking socket, and there are no 188 * waiting connection requests. 189 * @throw vpr::TimeoutException 190 * Thrown if no connection requests arrived within the given 191 * timeout period. 192 * @throw vpr::SocketException 193 * Thrown if the connection was not accepted because of an error. 190 194 */ 191 195 void openServer(const bool reuseAddr = true, … … 221 225 222 226 /** 223 * @THROWS vpr::SocketException. 227 * @throw vpr::SocketException 228 * Thrown if querying the indiccated option on this socket fails. 224 229 */ 225 230 virtual void getOption(const vpr::SocketOptions::Types option, … … 231 236 232 237 /** 233 * @THROWS vpr::SocketException. 238 * @throw vpr::SocketException 239 * Thrown if setting the indicated option on this socket fails. 234 240 */ 235 241 virtual void setOption(const vpr::SocketOptions::Types option, juggler/branches/2.2/modules/vapor/vpr/Perf/ProfileManager.h
r19729 r20996 121 121 static void printTree(bool forAllThreads = true); 122 122 123 /** @name Iterator handling. */123 /** @name Iterator handling. */ 124 124 //@{ 125 125 /** Returns a new Iterator that is set to the root. */ juggler/branches/2.2/modules/vapor/vpr/md/NSPR/Thread/ThreadNSPR.h
r19729 r20996 47 47 # include <process.h> 48 48 #endif 49 50 #include <boost/concept_check.hpp> 49 51 50 52 #include <prthread.h> … … 258 260 * @note This operation is not currently supported by NSPR threads. 259 261 */ 260 virtual void kill(const int )261 { 262 /* Do nothing. */;262 virtual void kill(const int signum) 263 { 264 boost::ignore_unused_variable_warning(signum); 263 265 } 264 266 juggler/branches/2.2/modules/vapor/vpr/md/POSIX/IO/Port/SerialPortImplTermios.cpp
r19846 r20996 426 426 // BREAKs). This is only active if input parity and framing error reporting 427 427 // is enabled (see getInputParityCheckState() for more information). The mark 428 // is the three-byte sequence \377 \0 X where X is the byte received in error.429 // If bit stripping is enabled, a valid \377 byte is passed as the two-byte430 // sequence \377 \377.428 // is the three-byte sequence 0377 0 X where X is the byte received in error. 429 // If bit stripping is enabled, a valid 0377 byte is passed as the two-byte 430 // sequence 0377 0377. 431 431 bool SerialPortImplTermios::getParityErrorMarkingState() const 432 432 { juggler/branches/2.2/modules/vapor/vpr/md/POSIX/IO/Port/SerialPortImplTermios.h
r20268 r20996 723 723 * (except BREAKs). This is only active if input parity and framing error 724 724 * reporting is enabled (see setInputParityCheck() for more 725 * information). The mark is the three-byte sequence \377 \0 X where X725 * information). The mark is the three-byte sequence 0377 0 X where X 726 726 * is the byte received in error. If bit stripping is enabled, a valid 727 * \377 byte is passed as the two-byte sequence \377 \377.727 * 0377 byte is passed as the two-byte sequence 0377 0377. 728 728 * 729 729 * @pre This serial port is open. … … 736 736 * 737 737 * @see setInputParityCheck 738 * 739 * @note 0377 == 0xFF == 255 738 740 */ 739 741 void setParityErrorMarking(bool flag); juggler/branches/2.2/modules/vapor/vpr/md/POSIX/Thread/ThreadPosix.h
r20820 r20996 104 104 VPRThreadScope scope = VPR_GLOBAL_THREAD, 105 105 VPRThreadState state = VPR_JOINABLE_THREAD, 106 size_t stack _size = 0);106 size_t stackSize = 0); 107 107 108 108 /** juggler/branches/2.2/modules/vapor/vpr/md/WIN32/IO/Port/SerialPortImplWin32.cpp
r20268 r20996 730 730 // BREAKs). This is only active if input parity and framing error reporting 731 731 // is enabled (see getInputParityCheckState() for more information). The mark 732 // is the three-byte sequence \377 \0 X where X is the byte received in error.733 // If bit stripping is enabled, a valid \377 byte is passed as the two-byte734 // sequence \377 \377.732 // is the three-byte sequence 0377 0 X where X is the byte received in error. 733 // If bit stripping is enabled, a valid 0377 byte is passed as the two-byte 734 // sequence 0377 0377. 735 735 bool SerialPortImplWin32::getParityErrorMarkingState() const 736 736 { juggler/branches/2.2/modules/vapor/vpr/md/WIN32/IO/Port/SerialPortImplWin32.h
r20268 r20996 672 672 * BREAKs). This is only active if input parity and framing error 673 673 * reporting is enabled (see setInputParityCheck() for more 674 * information). The mark is the three-byte sequence \377 \0 X where X674 * information). The mark is the three-byte sequence 0377 0 X where X 675 675 * is the byte received in error. If bit stripping is enabled, a valid 676 * \377 byte is passed as the two-byte sequence \377 \377.676 * 0377 byte is passed as the two-byte sequence 0377 0377. 677 677 * 678 678 * @pre This serial port is open. … … 682 682 * 683 683 * @see setInputParityCheck 684 * 685 * @note 0377 == 0xFF == 255 684 686 */ 685 687 void setParityErrorMarking(bool flag); juggler/branches/2.2/modules/vapor/vpr/md/WIN32/Thread/ThreadWin32.h
r19729 r20996 46 46 47 47 #include <process.h> 48 #include <boost/concept_check.hpp> 48 49 49 50 // To get the Win32 key stuff for storing self. … … 100 101 VPRThreadScope scope = VPR_GLOBAL_THREAD, 101 102 VPRThreadState state = VPR_JOINABLE_THREAD, 102 size_t stack _size = 0);103 size_t stackSize = 0); 103 104 104 105 /** … … 281 282 * @note This method does nothing. Use kill() instead. 282 283 */ 283 virtual void kill(const int) 284 { 284 virtual void kill(const int signum) 285 { 286 boost::ignore_unused_variable_warning(signum); 285 287 std::cerr << "vpr::ThreadWin32::kill() is not implemented!" 286 288 << std::endl;
