Merge pull request #1806 from peternewman/master-resync

Master resync

Author: peternewman

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# See: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#about-the-dependabotyml-file
+version: 2
+
+updates:
+  # Configure check for outdated GitHub Actions actions in workflows.
+  # See: https://docs.github.com/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+  - package-ecosystem: github-actions
+    directory: / # Check the repository's workflows under /.github/workflows/
+    schedule:
+      interval: daily

.github/workflows/isort.yml

@@ -0,0 +1,12 @@
+name: isort
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  isort:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: isort/isort-action@v1

.gitignore

@@ -183,6 +183,7 @@ libs/acn/e131_loadtest
 libs/acn/e131_loadtest.exe
 libs/acn/e131_transmit_test
 libs/acn/e131_transmit_test.exe
+ola-*/
 ola.spec
 olad/olad
 olad/olad.exe
@@ -233,6 +234,7 @@ tools/ola_trigger/ola_trigger
 tools/ola_trigger/ola_trigger.exe
 tools/ola_trigger/FileValidateTest.sh
 tools/rdm/DataLocation.py
+tools/rdm/ExpectedResultsTest.sh
 tools/rdm/ResponderTestTest.sh
 tools/rdm/TestHelpersTest.sh
 tools/rdm/TestStateTest.sh

.travis-ci.sh

@@ -56,7 +56,7 @@ if [[ $TASK = 'lint' ]]; then
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for linting to run against
   travis_fold start "make_builtfiles"
-  make builtfiles;
+  make builtfiles VERBOSE=1;
   travis_fold end "make_builtfiles"
   # first check we've not got any generic NOLINTs
   # count the number of generic NOLINTs
@@ -70,7 +70,7 @@ if [[ $TASK = 'lint' ]]; then
     echo "Found $nolints generic NOLINTs"
   fi;
   # run the cpplint tool, fetching it if necessary
-  make cpplint
+  make cpplint VERBOSE=1
 elif [[ $TASK = 'check-licences' ]]; then
   # check licences only if it is the requested task
   travis_fold start "autoreconf"
@@ -82,7 +82,7 @@ elif [[ $TASK = 'check-licences' ]]; then
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for licence checking to run against
   travis_fold start "make_builtfiles"
-  make builtfiles;
+  make builtfiles VERBOSE=1;
   travis_fold end "make_builtfiles"
   ./scripts/enforce_licence.py
   if [[ $? -ne 0 ]]; then
@@ -99,7 +99,7 @@ elif [[ $TASK = 'spellintian' ]]; then
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for spellintian to run against
   travis_fold start "make_builtfiles"
-  make builtfiles;
+  make builtfiles VERBOSE=1;
   travis_fold end "make_builtfiles"
   spellingfiles=$(eval "find ./ -type f -and ! \( \
       $SPELLINGBLACKLIST \
@@ -125,7 +125,7 @@ elif [[ $TASK = 'spellintian-duplicates' ]]; then
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for spellintian to run against
   travis_fold start "make_builtfiles"
-  make builtfiles;
+  make builtfiles VERBOSE=1;
   travis_fold end "make_builtfiles"
   spellingfiles=$(eval "find ./ -type f -and ! \( \
       $SPELLINGBLACKLIST \
@@ -151,7 +151,7 @@ elif [[ $TASK = 'codespell' ]]; then
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for codespell to run against
   travis_fold start "make_builtfiles"
-  make builtfiles;
+  make builtfiles VERBOSE=1;
   travis_fold end "make_builtfiles"
   spellingfiles=$(eval "find ./ -type f -and ! \( \
       $SPELLINGBLACKLIST \
@@ -178,13 +178,13 @@ elif [[ $TASK = 'doxygen' ]]; then
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for Doxygen to run against
   travis_fold start "make_builtfiles"
-  make builtfiles;
+  make builtfiles VERBOSE=1;
   travis_fold end "make_builtfiles"
   # count the number of warnings
   warnings=$(make doxygen-doc 2>&1 >/dev/null | wc -l)
   if [[ $warnings -ne 0 ]]; then
     # print the output for info
-    make doxygen-doc
+    make doxygen-doc VERBOSE=1
     echo "Found $warnings doxygen warnings"
     exit 1;
   else
@@ -230,7 +230,7 @@ elif [[ $TASK = 'flake8' ]]; then
   # the following is a bit of a hack to build the files normally built during
   # the build, so they are present for flake8 to run against
   travis_fold start "make_builtfiles"
-  make builtfiles;
+  make builtfiles VERBOSE=1;
   travis_fold end "make_builtfiles"
   make flake8
 elif [[ $TASK = 'pychecker' ]]; then
@@ -258,7 +258,7 @@ elif [[ $TASK = 'pychecker' ]]; then
   travis_fold end "pychecker_b"
   # Even more restricted checking for files that import files that break pychecker and have unused parameters
   travis_fold start "pychecker_c"
-  pychecker --quiet --limit 500 --blacklist $PYCHECKER_BLACKLIST --only --no-argsused $(find ./ -name "*.py" -and ! \( -name "*_pb2.py" -or -name "OlaClient.py" -or -name "ola_candidate_ports.py" -or -name "ola_universe_info.py" -or -name "rdm_snapshot.py" -or -name "ClientWrapper.py" -or -name "PidStore.py" -or -name "enforce_licence.py" -or -name "ola_mon.py" -or -name "TestLogger.py" -or -name "TestRunner.py" -or -name "rdm_model_collector.py" -or -name "rdm_responder_test.py" -or -name "rdm_test_server.py" -or -wholename "./include/ola/gen_callbacks.py" -or -wholename "./tools/rdm/ResponderTest.py" -or -wholename "./tools/rdm/TestHelpers.py" \) | xargs)
+  pychecker --quiet --limit 500 --blacklist $PYCHECKER_BLACKLIST --only --no-argsused $(find ./ -name "*.py" -and ! \( -name "*_pb2.py" -or -name "OlaClient.py" -or -name "ola_candidate_ports.py" -or -name "ola_universe_info.py" -or -name "rdm_snapshot.py" -or -name "ClientWrapper.py" -or -name "PidStore.py" -or -name "enforce_licence.py" -or -name "ola_mon.py" -or -name "TestLogger.py" -or -name "TestRunner.py" -or -name "rdm_model_collector.py" -or -name "rdm_responder_test.py" -or -name "rdm_test_server.py" -or -wholename "./include/ola/gen_callbacks.py" -or -wholename "./tools/rdm/ResponderTest.py" -or -wholename "./tools/rdm/TestDefinitions.py" -or -wholename "./tools/rdm/TestHelpers.py" -or -wholename "./tools/rdm/TestMixins.py" \) | xargs)
   travis_fold end "pychecker_c"
   # Special case checking for some python 3 compatibility workarounds
   travis_fold start "pychecker_d"
@@ -304,7 +304,7 @@ else
   ./configure $DISTCHECK_CONFIGURE_FLAGS;
   travis_fold end "configure"
   travis_fold start "make_distcheck"
-  make distcheck;
+  make distcheck VERBOSE=1;
   travis_fold end "make_distcheck"
   travis_fold start "make_dist"
   make dist;

AUTHORS

@@ -24,6 +24,7 @@ Contributors:
   Nicolas, for the win32 port of libartnet
   Nicolas Bertrand, added ShowJockey DMX-U1 support
   Nils Van Zuijlen, typos and python lib small update
+  Perry Naseck, EPoll delay fix
   Peter Newman, MilInst Plugin, Scanlime Fadecandy support and numerous fixes
   Ravindra Nath Kakarla, RDM Test Server (Google Summer of Code 2012)
   Rowan Maclachlan (hippy) for various changes

NEWS

@@ -1,14 +1,17 @@
-x/y/2020 ola-0.10.9
+x/y/2022 ola-0.10.9
  Features:
- * 
+ *
 
  API:
- * 
+ * Python: Add a fetch current DMX example.
 
  RDM Tests:
  * 
 
  Bugs:
+ * Fix some tests not working on Big Endian machines because our RPC is encoded
+   with native format and those tests used sample data from a Little Endian
+   machine
  * Renamed EndpointNoticationEvent(sic) to EndpointNotificationEvent in the
    E1.33 EndpointManager code
 

common/io/EPoller.cpp

@@ -311,8 +311,10 @@ bool EPoller::Poll(TimeoutManager *timeout_manager,
   }
 
   int ms_to_sleep = sleep_interval.InMilliSeconds();
+  // If we haven't been asked to wait as part of the poll interval, then don't
+  // wait in the epoll to allow for fast streaming
   int ready = epoll_wait(m_epoll_fd, reinterpret_cast<epoll_event*>(&events),
-                         MAX_EVENTS, ms_to_sleep ? ms_to_sleep : 1);
+                         MAX_EVENTS, ms_to_sleep ? ms_to_sleep : 0);
 
   if (ready == 0) {
     m_clock->CurrentMonotonicTime(&m_wake_up_time);

data/rdm/PidDataTest.py

@@ -20,6 +20,7 @@
 
 import os
 import unittest
+
 from ola import PidStore
 
 __author__ = 'nomis52@gmail.com (Simon Newton)'

include/ola/gen_callbacks.py

@@ -18,6 +18,7 @@
 
 
 from __future__ import print_function
+
 import textwrap
 
 

python/examples/ola_artnet_params.py

@@ -19,9 +19,12 @@
 """Fetch some Art-Net parameters."""
 
 from __future__ import print_function
+
+import sys
+
 from ola.ClientWrapper import ClientWrapper
+
 from ola import ArtNetConfigMessages_pb2
-import sys
 
 __author__ = 'nomis52@gmail.com (Simon Newton)'