assorted-commits Mailing List for Assorted projects (Page 28)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1227
          http://assorted.svn.sourceforge.net/assorted/?rev=1227&view=rev
Author:   yangzhang
Date:     2009-02-23 23:54:23 +0000 (Mon, 23 Feb 2009)

Log Message:
-----------
- fixed function0<> vs. function<> discrepancy (causing seg faults; they are
  def. not interchangeable)
- tweaks to st_reader
- added st_reader::skip()
- added work-arounds for various g++ warnings that don't play well with the C
  standard library macros

Modified Paths:
--------------
    cpp-commons/trunk/src/commons/delegates.h
    cpp-commons/trunk/src/commons/sockets.h
    cpp-commons/trunk/src/commons/st/st.h

Modified: cpp-commons/trunk/src/commons/delegates.h
===================================================================

--- cpp-commons/trunk/src/commons/delegates.h	2009-02-23 04:49:55 UTC (rev 1226)
+++ cpp-commons/trunk/src/commons/delegates.h	2009-02-23 23:54:23 UTC (rev 1227)
@@ -55,13 +55,12 @@
    * giving you a `finally` clause.  Particularly useful with clamp.
    */
   //template<typename T>
-  typedef function0<void> T;
   class finally {
     public:
-      finally(T f): f_(f) {}
+      finally(const fn &f): f_(f) {}
       ~finally() { f_(); }
     private:
-      T f_;
+      fn f_;
   };
 
 }

Modified: cpp-commons/trunk/src/commons/sockets.h
===================================================================
--- cpp-commons/trunk/src/commons/sockets.h	2009-02-23 04:49:55 UTC (rev 1226)
+++ cpp-commons/trunk/src/commons/sockets.h	2009-02-23 23:54:23 UTC (rev 1227)
@@ -18,6 +18,28 @@
 {
 
   /**
+   * Work-around for the -Wold-style-cast-unsafe FD_* macros (see select(2)).
+   */
+#undef  __FDMASK
+#define __FDMASK(d) (static_cast<__fd_mask>(1) << ((d) % __NFDBITS))
+
+  /**
+   * Work-around for the -Wold-style-cast-unsafe INADDR_ANY
+   */
+  const in_addr_t inaddr_any = in_addr_t(0);
+
+  /**
+   * Make a TCP socket non-blocking.
+   */
+  int
+  set_non_blocking(int fd)
+  {
+    checknnegerr(fcntl(fd, F_SETFL,
+                       O_NONBLOCK | checknnegerr(fcntl(fd, F_GETFL, 0))));
+    return fd;
+  }
+
+  /**
    * Create a TCP socket.
    */
   int
@@ -25,12 +47,20 @@
   {
     int fd = checknnegerr(socket(PF_INET, SOCK_STREAM, 0));
     // Make our socket non-blocking if desired.
-    if (nb)
-      checknnegerr(fcntl(fd, F_SETFL, O_NONBLOCK | fcntl(fd, F_GETFL, 0)));
+    if (nb) set_non_blocking(fd);
     return fd;
   }
 
   /**
+   * -Wconversion-safe version of htons
+   */
+  inline uint16_t
+  safe_htons(uint16_t x)
+  {
+    return (x & 0x00ff << 8) | (x & 0xff00 >> 8);
+  }
+
+  /**
    * Initialize an inet address with just the port.
    */
   void
@@ -38,7 +68,7 @@
   {
     bzero(&a, sizeof a);
     a.sin_family = AF_INET;
-    a.sin_port = htons(port);
+    a.sin_port = safe_htons(port);
   }
 
   /**
@@ -49,7 +79,7 @@
   {
     sockaddr_init(a, port);
     if (host == nullptr) {
-      a.sin_addr.s_addr = htonl(INADDR_ANY);
+      a.sin_addr.s_addr = htonl(inaddr_any);
     } else {
       // First try to interpret host as a dot-notation string.
       if (!inet_aton(host, reinterpret_cast<in_addr*>(&a.sin_addr.s_addr))) {

Modified: cpp-commons/trunk/src/commons/st/st.h
===================================================================
--- cpp-commons/trunk/src/commons/st/st.h	2009-02-23 04:49:55 UTC (rev 1226)
+++ cpp-commons/trunk/src/commons/st/st.h	2009-02-23 23:54:23 UTC (rev 1227)
@@ -2,6 +2,14 @@
 #define COMMONS_ST_ST_H
 
 #include <algorithm>
+#include <boost/foreach.hpp>
+#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+#include <commons/array.h>
+#include <commons/delegates.h>
+#include <commons/nullptr.h>
+#include <commons/sockets.h>
+#include <commons/utility.h>
 #include <exception>
 #include <map>
 #include <queue>
@@ -9,15 +17,6 @@
 #include <sstream>
 #include <st.h>
 #include <stx.h>
-#include <commons/array.h>
-#include <commons/delegates.h>
-#include <commons/nullptr.h>
-// delegates.h must be included after sockets.h due to bind() conflicts.
-#include <commons/sockets.h>
-#include <commons/utility.h>
-#include <boost/foreach.hpp>
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
 
 #define foreach BOOST_FOREACH
 #define shared_ptr boost::shared_ptr
@@ -54,10 +53,10 @@
    * \todo Is it safe to treat the pthread_t as a pointer?
    */
   st_thread_t
-  st_spawn(const function0<void>& f)
+  st_spawn(const fn& f)
   {
     return st_thread_create(&run_function0_null,
-                            new function0<void>(f),
+                            new fn(f),
                             true,
                             default_stack_size);
   }
@@ -394,7 +393,7 @@
       /**
        * The size of the unconsumed range of bytes.
        */
-      size_t amt() { return end_ - start_; }
+      size_t unread() { return end_ - start_; }
 
       /**
        * The remaining number of bytes in the buffer
@@ -402,12 +401,37 @@
       size_t rem() { return buf_.end() - end_; }
 
       /**
+       * Discard the requested number of bytes.
+       */
+      void skip(size_t req, st_utime_t to = ST_UTIME_NO_TIMEOUT) {
+        while (true) {
+          if (unread() >= req) {
+            // We have more unconsumed bytes than requested, so we're done.
+            start_ += req;
+            break;
+          }
+
+          // We have more requested bytes than unconsumed, so need to keep
+          // reading.  Skip over bytes...
+          req -= unread();
+          // ...and reset pointers to discard current buffer.
+          start_ = end_ = buf_.get();
+
+          ssize_t res = checknnegerr(st_read(fd_, end_, rem(), to));
+          end_ += res;
+
+          // If we got a premature EOF.
+          if (res == 0 && unread() < req) throw eof_exception();
+        }
+      }
+
+      /**
        * Returns a char array that contains the requested number of bytes.  If
        * we hit an error or EOF, then an exception is thrown.
        */
-      managed_array<char> read(size_t req = 0, st_utime_t to = ST_UTIME_NO_TIMEOUT) {
+      managed_array<char> read(size_t req, st_utime_t to = ST_UTIME_NO_TIMEOUT) {
         // Do we already have the requested data?
-        if (amt() >= req) {
+        if (unread() >= req) {
           managed_array<char> p(start_, false);
           start_ += req;
           return p;
@@ -417,7 +441,7 @@
         if (req > buf_.size()) {
           managed_array<char> p(checkpass(new char[req]), true);
           copy(start_, end_, p.get());
-          checkeqnneg(st_read_fully(fd_, p + amt(), req - amt(), to), static_cast<ssize_t>(req - amt()));
+          checkeqnneg(st_read_fully(fd_, p + unread(), req - unread(), to), static_cast<ssize_t>(req - unread()));
           start_ = end_ = buf_.get();
           return p;
         }
@@ -431,14 +455,14 @@
         }
 
         // Keep reading until we have enough.
-        while (amt() < req) {
+        while (unread() < req) {
           ssize_t res = checknnegerr(st_read(fd_, end_, rem(), to));
           if (res == 0) break;
           else end_ += res;
         }
 
         // If we got a premature EOF.
-        if (amt() < req)
+        if (unread() < req)
           throw eof_exception();
 
         managed_array<char> p(start_, false);
@@ -452,7 +476,7 @@
         size_t req = sizeof(T);
 
         // Do we already have the requested data?
-        if (amt() >= req) {
+        if (unread() >= req) {
           T x = *reinterpret_cast<const T*>(start_);
           start_ += req;
           return x;
@@ -469,14 +493,14 @@
         }
 
         // Keep reading until we have enough.
-        while (amt() < req) {
+        while (unread() < req) {
           ssize_t res = checknnegerr(st_read(fd_, end_, rem(), to));
           if (res == 0) break;
           else end_ += res;
         }
 
         // If we got a premature EOF.
-        if (amt() < req)
+        if (unread() < req)
           throw eof_exception();
 
         T x = *reinterpret_cast<const T*>(start_);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (9)	Dec (12)
2008	Jan (86)	Feb (265)	Mar (96)	Apr (47)	May (136)	Jun (28)	Jul (57)	Aug (42)	Sep (20)	Oct (67)	Nov (37)	Dec (34)
2009	Jan (39)	Feb (85)	Mar (96)	Apr (24)	May (82)	Jun (13)	Jul (10)	Aug (8)	Sep (2)	Oct (20)	Nov (31)	Dec (17)
2010	Jan (16)	Feb (11)	Mar (17)	Apr (53)	May (31)	Jun (13)	Jul (3)	Aug (6)	Sep (11)	Oct (4)	Nov (17)	Dec (17)
2011	Jan (3)	Feb (19)	Mar (5)	Apr (17)	May (3)	Jun (4)	Jul (14)	Aug (3)	Sep (2)	Oct (1)	Nov (3)	Dec (2)
2012	Jan (3)	Feb (7)	Mar (1)	Apr	May (1)	Jun	Jul (4)	Aug (5)	Sep (2)	Oct (3)	Nov	Dec
2013	Jan	Feb	Mar (9)	Apr (5)	May	Jun (2)	Jul (1)	Aug (10)	Sep (1)	Oct (2)	Nov	Dec
2014	Jan (1)	Feb (3)	Mar (3)	Apr (1)	May (4)	Jun	Jul	Aug	Sep (2)	Oct	Nov	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec
2016	Jan (1)	Feb	Mar (2)	Apr	May	Jun	Jul	Aug	Sep (1)	Oct	Nov	Dec
2017	Jan	Feb	Mar (1)	Apr	May (5)	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec (2)
2018	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec