Merge branch 'master' into send-ibv-unicast

.travis.yml

@@ -38,10 +38,10 @@ matrix:
       dist: xenial
       env: TEST_PYTHON=yes PYTHON=python3 CC="clang" CXX="clang++"
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env: TEST_CXX=yes CXX="clang++"
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       env: TEST_PYTHON=yes PYTHON=python3 CC="clang" CXX="clang++"
 
 addons:

.travis/install.sh

@@ -12,9 +12,8 @@ echo "CXX = ${CXX:=g++}"
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     if [[ "$PYTHON" == "python3" ]]; then
-        brew update
-        brew upgrade python
-        pyvenv venv
+        python3 --version
+        python3 -m venv venv
     fi
 elif [[ "$PYTHON" == pypy* ]]; then
     curl -fSL https://bitbucket.org/pypy/pypy/downloads/${PYTHON}-v${PYPY_VERSION}-linux64.tar.bz2 | tar -jx

.travis/script.sh

@@ -19,7 +19,10 @@ if [ "$TEST_CXX" = "yes" ]; then
         --disable-optimized \
         CXXFLAGS=-Werror
     make -j4
-    make -j4 check
+    if ! make -j4 check; then
+        cat src/test-suite.log
+        exit 1
+    fi
     popd
 fi
 

doc/changelog.rst

@@ -15,7 +15,9 @@ Changelog
 - Fix occasional crash when using thread pool with more than one thread
   together with ibverbs.
 - Fix bug in mcdump causing it to hang if the arguments couldn't be parsed
-  and capturing to file.
+  (only happened when capturing to file).
+- Fix :program:`spead2_recv` reporting statistics that may miss out the last
+  batch of packets.
 
 .. rubric:: 2.0.2
 

src/spead2_recv.cpp

@@ -445,8 +445,15 @@ int main(int argc, const char **argv)
     }
     signals.cancel();
     spead2::recv::stream_stats stats;
-    for (const auto &ptr : streams)
+    for (auto &ptr : streams)
+    {
+        /* Even though we've seen the stop condition, if we don't explicitly
+         * stop the stream then a race condition means we might not see the
+         * last batch of statistics updates.
+         */
+        ptr->stop();
         stats += ptr->get_stats();
+    }
 
     std::cout << "Received " << n_complete << " heaps\n";
 #define REPORT_STAT(field) (std::cout << #field ": " << stats.field << '\n')

src/unittest_semaphore.cpp

@@ -44,10 +44,11 @@ typedef boost::mpl::list<
     spead2::semaphore_eventfd,
 #endif
 #if SPEAD2_USE_POSIX_SEMAPHORES
-    spead2::semaphore_posix,
+    spead2::semaphore_posix
+#else
+    spead2::semaphore      // a new type only when not using posix semaphores
 #endif
-    spead2::semaphore_fd,
-    spead2::semaphore> semaphore_types;
+    > semaphore_types;
 
 typedef boost::mpl::list<
 #if SPEAD2_USE_EVENTFD