Changeset 29:54c2d451f8a0 in xplcommon

Timestamp:

01/02/13 11:37:15 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 2 'hg:/home/ivaradi/xplane/hg/xplcommon' '/'>, 'public')

Message:

Implemented a blocking stream and a corresponding trst program

Files:

• src/xplcommon/BlockingStream.cc (added)
• src/xplcommon/BlockingStream.h (added)
• src/xplcommon/Buffer.h (modified) (2 diffs)
• src/xplcommon/BufferedStream.h (modified) (1 diff)
• src/xplcommon/Makefile.am (modified) (3 diffs)
• src/xplcommon/posix/ReadingBuffer.cc (modified) (1 diff)
• src/xplcommon/posix/Waiter.cc (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/testblkstream.cc (added)

src/xplcommon/Buffer.h

@@ -96 +96 @@
 
     /**
+     * Get whether the buffer is empty or not.
+     */
+    bool isEmpty() const;
+
+    /**
      * Get the available capacity in the buffer.
      */
@@ -172 +177 @@
 {
     return length;
+}
+
+//------------------------------------------------------------------------------
+
+inline bool Buffer::isEmpty() const
+{
+    return length==0;
 }
 

src/xplcommon/BufferedStream.h

@@ -93 +93 @@
 //------------------------------------------------------------------------------
 
-// #include "win32/BufferedStream.h"
+#include "win32/BufferedStream.h"
 
-// namespace xplcommon { typedef win32::BufferedStream BufferedStream; }
+namespace xplcommon { typedef win32::BufferedStream BufferedStream; }
 
 //------------------------------------------------------------------------------

src/xplcommon/Makefile.am

@@ -10 +10 @@
 
 libxplcommon_la_SOURCES= \
+        PseudoRandom.cc         \
         Buffer.cc               \
-        PseudoRandom.cc
+        BlockingStream.cc
 
 if TARGET_API_POSIX
@@ -25 +26 @@
         config.h                \
         types.h                 \
+        PseudoRandom.h          \
         Failable.h              \
         Thread.h                \
@@ -38 +40 @@
         LocalConnector.h        \
         LocalClientSocket.h     \
-        PseudoRandom.h
+        BlockingStream.h

src/xplcommon/posix/ReadingBuffer.cc

@@ -63 +63 @@
         stream.events &= ~POLLIN;
         size_t added = addLength(result);
-        assert(added==result);
-        assert(getLength()==result);
+        assert(static_cast<ssize_t>(added)==result);
+        assert(static_cast<ssize_t>(getLength())==result);
     }
     return result>=0;

src/xplcommon/posix/Waiter.cc

@@ -49 +49 @@
     {
         Waitable* waitable = i->second;
-        if (waitable->ready()) return true;
+        if (waitable->ready()) {
+            return true;
+        }
     }
     return false;

test/Makefile.am

@@ -1 +1 @@
 INCLUDES=-I$(top_srcdir)/src
 
-noinst_PROGRAMS=testevent testlocsock
+noinst_PROGRAMS=testevent testlocsock testblkstream
 if TARGET_API_POSIX
 noinst_PROGRAMS+=testrandom
@@ -24 +24 @@
 endif
 
+testblkstream_SOURCES=testblkstream.cc
+testblkstream_LDADD=../src/xplcommon/libxplcommon.la
+if TARGET_API_POSIX
+testblkstream_LDADD+=-lpthread
+endif
+if TARGET_API_WIN32
+testblkstream_LDFLAGS=-static-libgcc -static-libstdc++
+endif
+
 testrandom_SOURCES=testrandom.cc
 testrandom_LDADD=../src/xplcommon/libxplcommon.la