Changeset 7 in libcf++
- Timestamp:
- 03/29/15 16:30:07 (9 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/cf/bin.h
r4 r7 29 29 * shallow-copy constructor(default constructor) 30 30 * @param in binary 31 * @param sizebinary size31 * @param length binary size 32 32 */ 33 33 bin(const cf::uint8_t * in = NULL, 34 const cf::size_t size= 0);34 const cf::size_t length = 0); 35 35 36 36 /** … … 78 78 * set 79 79 * @param in data 80 * @param sizesize80 * @param length size 81 81 */ 82 82 cf::void_t set(const cf::uint8_t * in, 83 const cf::size_t size);83 const cf::size_t length); 84 84 85 85 /** … … 110 110 * @return on success, position; otherwise, (cf::size_t)-1 111 111 * @param in binary 112 * @param sizebinary size112 * @param length binary size 113 113 */ 114 114 cf::size_t find(const cf::uint8_t * in, 115 const cf::size_t size) const;115 const cf::size_t length) const; 116 116 117 117 /** -
trunk/include/cf/exception.h
r4 r7 65 65 * destructor derived from std::exception::~exception() 66 66 */ 67 ~exception()67 virtual ~exception() 68 68 throw (); 69 69 -
trunk/include/cf/file.h
r4 r7 76 76 * destructor 77 77 */ 78 ~file();78 virtual ~file(); 79 79 80 80 /** -
trunk/include/cf/logger.h
r4 r7 58 58 * destructor 59 59 */ 60 ~logger();60 virtual ~logger(); 61 61 62 62 /** … … 114 114 DAILY = 0x00000010, /**< daily rotation */ 115 115 SIZE = 0x00000020, /**< size rotation */ 116 SECURE = 0x00000100 /**< encrypt message */116 PID = 0x00000100 /**< process-id in log file name */ 117 117 }; 118 118 -
trunk/include/cf/memory.h
r4 r7 32 32 * destructor. free memory 33 33 */ 34 ~memory();34 virtual ~memory(); 35 35 36 36 /** -
trunk/include/cf/network.h
r5 r7 12 12 #include <string> 13 13 14 #define UNUSED_SOCKET -1 15 14 16 namespace cf 15 17 { … … 79 81 * @throw cf::exception 80 82 */ 81 tcp(const cf::socket_t attachedSocket = -1)83 tcp(const cf::socket_t attachedSocket = UNUSED_SOCKET) 82 84 throw (cf::exception); 83 85 … … 85 87 * destructor 86 88 */ 87 ~tcp(); 89 virtual ~tcp(); 90 91 /** 92 * get socket descriptor 93 * @return socket descriptor 94 */ 95 cf::socket_t descriptor() const; 88 96 89 97 /** … … 178 186 179 187 /** 188 * set non-blocking 189 * @param flag true; false 190 */ 191 cf::void_t setNonBlocking(const cf::bool_t flag); 192 193 /** 180 194 * set timeout 181 195 * @param seconds timeout seconds … … 215 229 throw (cf::exception); 216 230 }; 231 232 /** 233 * byteOrder 234 */ 235 class byteOrder 236 { 237 public: 238 /** 239 * host to network long 240 * @return long for network 241 * @param long for host 242 */ 243 static cf::uint32_t htonl(cf::uint32_t in); 244 245 /** 246 * host to network short 247 * @return short for network 248 * @param short for host 249 */ 250 static cf::uint16_t htons(cf::uint16_t in); 251 252 /** 253 * network to host long 254 * @return long for host 255 * @param long for network 256 */ 257 static cf::uint32_t ntohl(cf::uint32_t in); 258 259 /** 260 * network to host short 261 * @return short for host 262 * @param short for network 263 */ 264 static cf::uint16_t ntohs(cf::uint16_t in); 265 }; 217 266 } 218 267 } -
trunk/include/cf/task.h
r4 r7 63 63 * destructor 64 64 */ 65 ~mutex();65 virtual ~mutex(); 66 66 67 67 /** … … 113 113 * destructor for unlocking 114 114 */ 115 ~scopedLock();115 virtual ~scopedLock(); 116 116 117 117 /** … … 155 155 * destructor 156 156 */ 157 ~thread();157 virtual ~thread(); 158 158 159 159 /** -
trunk/src/bin.cpp
r4 r7 10 10 11 11 cf::bin::bin(const cf::uint8_t * in, 12 const cf::size_t size)12 const cf::size_t length) 13 13 { 14 set(in, size);14 set(in, length); 15 15 } 16 16 … … 55 55 56 56 cf::void_t cf::bin::set(const cf::uint8_t * in, 57 const cf::size_t size)57 const cf::size_t length) 58 58 { 59 59 if (!in) 60 60 return; 61 61 62 resize( size);63 memcpy(buffer(), in, size);62 resize(length); 63 memcpy(buffer(), in, length); 64 64 } 65 65 … … 123 123 124 124 cf::size_t cf::bin::find(const cf::uint8_t * in, 125 const cf::size_t size) const125 const cf::size_t length) const 126 126 { 127 cf::size_t limit = this->size() - size;127 cf::size_t limit = size() - length; 128 128 129 129 if (limit < 0 || !in) 130 130 return -1; 131 131 132 for (cf::size_t iter = 0 , iterIn = 0; iter <= limit ; iter++)132 for (cf::size_t iter = 0 ; iter <= limit ; iter++) 133 133 { 134 for (iterIn = 0 ; iterIn < size ; iterIn++) 135 { 136 if (*((buffer() + iter) + iterIn) != *(in + iterIn)) 137 break; 138 } 139 140 if (iterIn == size) 134 if (!memcmp(buffer() + iter, in, length)) 141 135 return iter; 142 136 } -
trunk/src/codec.cpp
r4 r7 21 21 if (in.empty()) 22 22 THROW_EXCEPTION("input is empty"); 23 23 24 try 24 25 { -
trunk/src/logger.cpp
r4 r7 49 49 } 50 50 51 filepath += STR("." << cf::task::process::id()); 51 if (option & cf::logger::PID) 52 filepath += STR("." << cf::task::process::id()); 52 53 53 54 /* FORCED : append file-extension */ -
trunk/src/network.cpp
r6 r7 39 39 #endif 40 40 41 #define UNUSED_SOCKET -142 43 41 /*--------------------------------------------------------------*/ 44 42 /** … … 62 60 } 63 61 64 static cf::void_t setNonBlocking(const cf::socket_t sock,65 const cf::bool_t flag)66 {67 #ifdef _ON_WINDOWS68 cf::ulong_t mode = flag ? 1 : 0;69 ioctlsocket(sock, FIONBIO, &mode);70 #else71 cf::int32_t mode = fcntl(sock, F_GETFL, 0);72 73 if (flag) mode |= O_NONBLOCK;74 else mode &= ~O_NONBLOCK;75 76 fcntl(sock, F_SETFL, mode);77 #endif78 }79 80 62 static cf::void_t waitForTimeout(const cf::socket_t sock, 81 63 const cf::int32_t timeout, … … 206 188 { 207 189 close(); 190 } 191 192 cf::socket_t cf::network::tcp::descriptor() const 193 { 194 return mSocket; 208 195 } 209 196 … … 348 335 THROW_EXCEPTION("has invalid socket"); 349 336 350 close();351 352 337 mSocket = sock; 353 338 } … … 477 462 } 478 463 464 cf::void_t cf::network::tcp::setNonBlocking(const cf::bool_t flag) 465 { 466 #ifdef _ON_WINDOWS 467 cf::ulong_t mode = flag ? 1 : 0; 468 ioctlsocket(mSocket, FIONBIO, &mode); 469 #else 470 cf::int32_t mode = fcntl(mSocket, F_GETFL, 0); 471 472 if (flag) mode |= O_NONBLOCK; 473 else mode &= ~O_NONBLOCK; 474 475 fcntl(mSocket, F_SETFL, mode); 476 #endif 477 } 478 479 479 cf::void_t cf::network::tcp::setTimeout(const cf::int32_t seconds) 480 480 { 481 setNonBlocking( mSocket,seconds > 0 /*? true : false*/);481 setNonBlocking(seconds > 0 /*? true : false*/); 482 482 mTimeout = seconds; 483 483 } … … 535 535 return std::string(asciiz); 536 536 } 537 538 539 cf::uint32_t cf::network::byteOrder::htonl(cf::uint32_t in) 540 { 541 return htonl(in); 542 } 543 544 cf::uint16_t cf::network::byteOrder::htons(cf::uint16_t in) 545 { 546 return htons(in); 547 } 548 549 cf::uint32_t cf::network::byteOrder::ntohl(cf::uint32_t in) 550 { 551 return ntohl(in); 552 } 553 554 cf::uint16_t cf::network::byteOrder::ntohs(cf::uint16_t in) 555 { 556 return ntohs(in); 557 }
Note:
See TracChangeset
for help on using the changeset viewer.