Fast blob transfer (indilib#1668)

pkockritz · Jun 18, 2022 · 1f27fc1 · 1f27fc1
1 parent 87e6994
commit 1f27fc1
Show file tree

Hide file tree

Showing 73 changed files with 8,073 additions and 2,841 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1462,11 +1462,9 @@ libindi/examples/tutorial_three/simpleccd.h -text
 libindi/examples/tutorial_two/CMakeLists.txt -text
 libindi/examples/tutorial_two/simplescope.cpp -text
 libindi/examples/tutorial_two/simplescope.h -text
-libindi/fq.c -text
-libindi/fq.h -text
 libindi/indiapi.h -text
 libindi/indidevapi.h -text
-libindi/indidriver.c -text
+libindi/indidriver.cpp -text
 libindi/indidriver.h -text
 libindi/indidrivermain.c -text
 libindi/indiserver.c -text

diff --git a/.github/docker/Dockerfile.centos b/.github/docker/Dockerfile.centos
@@ -6,7 +6,7 @@ RUN yum -y install epel-release && yum -y upgrade && yum -y install \
     git \
     cmake gcc-c++ zlib-devel \
     cfitsio-devel libnova-devel libusb-devel libcurl-devel \
-    gsl-devel libjpeg-devel fftw-devel
+    gsl-devel libjpeg-devel fftw-devel libev-devel
 
 RUN git clone https://github.com/google/googletest.git googletest && \
     cd googletest && \

diff --git a/.github/docker/Dockerfile.debian b/.github/docker/Dockerfile.debian
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     git \
     cmake build-essential zlib1g-dev \
     libcfitsio-dev libnova-dev libusb-1.0-0-dev libcurl4-gnutls-dev \
-    libgsl-dev libjpeg-dev libfftw3-dev
+    libgsl-dev libjpeg-dev libfftw3-dev libev-dev
 
 RUN git clone https://github.com/google/googletest.git googletest && \
     cd googletest && \

diff --git a/.github/docker/Dockerfile.fedora b/.github/docker/Dockerfile.fedora
@@ -6,7 +6,7 @@ RUN dnf -y upgrade && dnf -y install \
     git \
     cmake gcc-c++ zlib-devel \
     cfitsio-devel libnova-devel libusb-devel libcurl-devel \
-    gsl-devel libjpeg-devel fftw-devel
+    gsl-devel libjpeg-devel fftw-devel libev-devel
 
 RUN git clone https://github.com/google/googletest.git googletest && \
     cd googletest && \

diff --git a/.github/docker/Dockerfile.ubuntu b/.github/docker/Dockerfile.ubuntu
@@ -6,7 +6,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     git \
     cmake build-essential zlib1g-dev \
     libcfitsio-dev libnova-dev libusb-1.0-0-dev libcurl4-gnutls-dev \
-    libgsl-dev libjpeg-dev libfftw3-dev
+    libgsl-dev libjpeg-dev libfftw3-dev libev-dev
 
 RUN git clone https://github.com/google/googletest.git googletest && \
     cd googletest && \

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -11,7 +11,7 @@ jobs:
         container: ["ubuntu", "debian", "fedora"]
 
     container:
-      image: ghcr.io/indilib/${{ matrix.container }}
+      image: ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}
 
     steps:
       - name: Get INDI Sources

diff --git a/.github/workflows/pyindi.yml b/.github/workflows/pyindi.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Install Indilib Pre-requisites
         run: |
-          $(command -v sudo) apt-get update && apt-get install -y libnova-dev libcfitsio-dev libusb-1.0-0-dev zlib1g-dev libgsl-dev build-essential cmake git libjpeg-dev libcurl4-gnutls-dev libtheora-dev libfftw3-dev
+          $(command -v sudo) apt-get update && apt-get install -y libnova-dev libcfitsio-dev libusb-1.0-0-dev zlib1g-dev libgsl-dev build-essential cmake git libjpeg-dev libcurl4-gnutls-dev libtheora-dev libfftw3-dev libev-dev
 
       - name: Get INDI Sources
         uses: actions/checkout@v2
@@ -33,7 +33,7 @@ jobs:
 
       - name: Install Python3 Pre-requisites
         run: |
-          $(command -v sudo) apt-get install -y python3 python3-dev python3-setuptools swig python3-pip
+          $(command -v sudo) apt-get update && $(command -v sudo) apt-get install -y python3 python3-dev python3-setuptools swig python3-pip
 
       - name: Get PyIndi Sources
         uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,6 +15,7 @@ if(ANDROID OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Android")
 endif()
 
 include(CMakeCommon)
+include(CheckFunctionExists)
 
 # Clang Format support
 IF (UNIX OR APPLE)
@@ -87,10 +88,17 @@ OPTION (INDI_BUILD_DRIVERS "Build INDI Drivers, Tools, and Examples" ON)
 OPTION (INDI_BUILD_CLIENT "Build INDI POSIX Client" ON)
 OPTION (INDI_BUILD_QT5_CLIENT "Build INDI Qt5 Client" OFF)
 OPTION (INDI_BUILD_UNITTESTS "Build INDI tests" OFF)
+OPTION (INDI_BUILD_INTEGTESTS "Build INDI integration tests" OFF)
 OPTION (INDI_BUILD_WEBSOCKET "Build INDI with Websocket support" OFF)
 OPTION (INDI_FAST_BLOB "Build INDI with Fast BLOB support" ON)
 OPTION (INDI_CALCULATE_MINMAX "Calculate and store image minimum and maximum values in FITS header" OFF)
 
+CHECK_FUNCTION_EXISTS(mremap HAVE_MREMAP)
+if (HAVE_MREMAP)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_MREMAP")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_MREMAP")
+endif()
+
 ###################################################################################################
 #########################################  Fast Blob  #############################################
 ###################################################################################################
@@ -128,20 +136,25 @@ else()
 
 # 1. Dependencies
 find_package(Threads REQUIRED)
+find_package(Libev REQUIRED)
 # 2. Includes
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR})
 # 3. Build
 SET(indiserver_SRC
-    ${CMAKE_CURRENT_SOURCE_DIR}/indiserver.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/fq.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/indiserver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/base64.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sharedblob.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.cpp)
 
 IF (UNITY_BUILD)
     ENABLE_UNITY_BUILD(indiserver indiserver_SRC 10 c)
 ENDIF ()
 
 add_executable(indiserver ${indiserver_SRC})
 target_link_libraries(indiserver ${CMAKE_THREAD_LIBS_INIT})
+target_include_directories(indiserver SYSTEM PRIVATE ${LIBEV_INCLUDE_DIRS})
+target_include_directories(indiserver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libs/)
+target_link_libraries(indiserver ${LIBEV_LIBRARIES})
 install(TARGETS indiserver RUNTIME DESTINATION bin)
 endif (WIN32 OR ANDROID)
 endif (INDI_BUILD_SERVER)
@@ -171,15 +184,17 @@ include_directories( ${CFITSIO_INCLUDE_DIR})
 # 3. Build
 
 SET(indiclient_C_SRC
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/userio.c
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sharedblob.c
     ${CMAKE_CURRENT_SOURCE_DIR}/base64.c)
 
 SET(indiclient_CXX_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/libastro.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/basedevice.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/baseclient.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/sharedblob_parse.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indiproperty.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indiproperties.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indipropertybasic.cpp
@@ -246,14 +261,16 @@ include_directories( ${CFITSIO_INCLUDE_DIR})
 # 3. Build
 message(STATUS "Building INDI Client with Qt5 support")
 SET(indiclientqt_C_SRC
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/userio.c
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sharedblob.c
     ${CMAKE_CURRENT_SOURCE_DIR}/base64.c)
 SET(indiclientqt_CXX_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/libastro.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/basedevice.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/baseclientqt.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/sharedblob_parse.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indiproperty.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indiproperties.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indipropertybasic.cpp
@@ -422,18 +439,21 @@ set(fpack_C_SRC
 
 SET(indidriver_C_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/indidriver.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/indidriverio.c
     ${CMAKE_CURRENT_SOURCE_DIR}/indidrivermain.c
     ${CMAKE_CURRENT_SOURCE_DIR}/eventloop.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/userio.c
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sharedblob.c
     ${CMAKE_CURRENT_SOURCE_DIR}/base64.c
     )
 
 SET(indidriver_CXX_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/libastro.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/basedevice.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/defaultdevice.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/sharedblob_parse.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indiproperty.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indiproperties.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/indibase/property/indipropertybasic.cpp
@@ -557,6 +577,8 @@ IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
     target_link_libraries(indidriver ${ICONV_LIBRARIES})
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 
+CHECK_FUNCTION_EXISTS(mremap HAVE_MREMAP)
+
 ##################################################
 ########### INDI Alignment Subsystem #############
 ##################################################
@@ -1891,9 +1913,10 @@ SET(indi_get_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/eventloop.c
     ${CMAKE_CURRENT_SOURCE_DIR}/base64.c
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/getINDIproperty.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/userio.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sharedblob.c)
 
 IF (UNITY_BUILD)
     ENABLE_UNITY_BUILD(indi_get indi_get_SRC 10 c)
@@ -1916,9 +1939,10 @@ SET(indi_set_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/eventloop.c
     ${CMAKE_CURRENT_SOURCE_DIR}/base64.c
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/setINDIproperty.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/userio.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sharedblob.c)
 
 IF (UNITY_BUILD)
     ENABLE_UNITY_BUILD(indi_set indi_set_SRC 10 c)
@@ -1942,9 +1966,10 @@ SET(indi_eval_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/base64.c
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/compiler.c
     ${CMAKE_CURRENT_SOURCE_DIR}/tools/evalINDI.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/lilxml.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/userio.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/indiuserio.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/sharedblob.c)
 
 IF (UNITY_BUILD)
     ENABLE_UNITY_BUILD(indi_eval indi_eval_SRC 10 c)
@@ -2032,7 +2057,15 @@ ENDIF ()
 #########################################  Tests  #################################################
 ###################################################################################################
 
-find_package (GTest)
+IF (DEFINED GTEST_ROOT)
+    MESSAGE (STATUS  "Using GTEST from ${GTEST_ROOT}")
+    add_subdirectory(${GTEST_ROOT}
+        "${CMAKE_CURRENT_BINARY_DIR}/googletest" EXCLUDE_FROM_ALL)
+    set(GTEST_FOUND true)
+ELSE (DEFINED GTEST_ROOT)
+    find_package (GTest)
+ENDIF()
+
 find_package (GMock)
 IF (GTEST_FOUND)
   IF (INDI_BUILD_UNITTESTS)
@@ -2041,8 +2074,16 @@ IF (GTEST_FOUND)
   ELSE (INDI_BUILD_UNITTESTS)
     MESSAGE (STATUS  "Not building unit tests")
   ENDIF (INDI_BUILD_UNITTESTS)
+
+  IF (INDI_BUILD_INTEGTESTS)
+    MESSAGE (STATUS  "Building integration tests")
+    ADD_SUBDIRECTORY(integs)
+  ELSE (INDI_BUILD_INTEGTESTS)
+    MESSAGE (STATUS  "Not building integration tests")
+  ENDIF (INDI_BUILD_INTEGTESTS)
+
 ELSE()
-  MESSAGE (STATUS  "GTEST not found, not building unit tests")
+  MESSAGE (STATUS  "GTEST not found, not building tests")
 ENDIF (GTEST_FOUND)
 
 endif (WIN32 OR ANDROID)

diff --git a/cmake_modules/FindLibev.cmake b/cmake_modules/FindLibev.cmake
@@ -0,0 +1,45 @@
+#  Copyright (C) 2022  Ludovic Pollet
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the  COPYING-CMAKE-SCRIPTS file.
+
+
+# - Try to find libev
+# Once done this will define
+#  LIBEV_FOUND        - System has libev
+#  LIBEV_INCLUDE_DIRS - The libev include directories
+#  LIBEV_LIBRARIES    - The libraries needed to use libev
+
+find_path(LIBEV_INCLUDE_DIR
+  NAMES ev.h
+)
+find_library(LIBEV_LIBRARY
+  NAMES ev
+)
+
+if(LIBEV_INCLUDE_DIR)
+  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
+    LIBEV_VERSION_MAJOR REGEX "^#define[ \t]+EV_VERSION_MAJOR[ \t]+[0-9]+")
+  file(STRINGS "${LIBEV_INCLUDE_DIR}/ev.h"
+    LIBEV_VERSION_MINOR REGEX "^#define[ \t]+EV_VERSION_MINOR[ \t]+[0-9]+")
+  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MAJOR "${LIBEV_VERSION_MAJOR}")
+  string(REGEX REPLACE "[^0-9]+" "" LIBEV_VERSION_MINOR "${LIBEV_VERSION_MINOR}")
+  set(LIBEV_VERSION "${LIBEV_VERSION_MAJOR}.${LIBEV_VERSION_MINOR}")
+  unset(LIBEV_VERSION_MINOR)
+  unset(LIBEV_VERSION_MAJOR)
+endif()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LIBEV_FOUND to TRUE
+# if all listed variables are TRUE and the requested version matches.
+find_package_handle_standard_args(Libev REQUIRED_VARS
+                                  LIBEV_LIBRARY LIBEV_INCLUDE_DIR
+                                  VERSION_VAR LIBEV_VERSION)
+
+if(LIBEV_FOUND)
+  set(LIBEV_LIBRARIES     ${LIBEV_LIBRARY})
+  set(LIBEV_INCLUDE_DIRS  ${LIBEV_INCLUDE_DIR})
+endif()
+
+mark_as_advanced(LIBEV_INCLUDE_DIR LIBEV_LIBRARY)
diff --git a/debian/control b/debian/control
@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 8.1.3~),
  libtheora-dev,
  libogg-dev,
  libfftw3-dev,
+ libev-dev,
  librtlsdr-dev,
 Standards-Version: 3.9.5
 Homepage: http://www.indilib.org/

diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
@@ -11,7 +11,7 @@ RUN yum -y install \
         libcurl-devel boost-devel cfitsio-devel libusbx-devel libtiff-devel \
         libftdi-devel libdc1394-devel libgphoto2-devel gpsd-devel gsl-devel libjpeg-turbo-devel \
         libnova-devel openal-soft-devel LibRaw-devel libusb-devel rtl-sdr-devel \
-        fftw-devel zlib-devel libconfuse-devel python3-devel doxygen \
+        fftw-devel libev-devel zlib-devel libconfuse-devel python3-devel doxygen \
         libdc1394-devel python-devel swig gcc-c++ clang vim
 
 RUN rpm --import http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro

diff --git a/docker/debian_buster/Dockerfile b/docker/debian_buster/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -qqy install \
         libcurl4-gnutls-dev libboost-dev libboost-regex-dev libcfitsio-dev \
         libftdi-dev libdc1394-22-dev libgphoto2-dev libgps-dev libgsl-dev libjpeg-dev libtiff5-dev \
         libnova-dev libopenal-dev libraw-dev libusb-1.0-0-dev librtlsdr-dev \
-        libfftw3-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
+        libfftw3-dev libev-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
         libboost-test-dev python-all-dev swig g++ libftdi1-dev \
         libdc1394-22-dev googletest clang lsb-release dirmngr vim \
         libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev

diff --git a/docker/debian_stretch/Dockerfile b/docker/debian_stretch/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -qqy install \
         libcurl4-gnutls-dev libboost-dev libboost-regex-dev libcfitsio-dev \
         libftdi-dev libdc1394-22-dev libgphoto2-dev libgps-dev libgsl-dev libjpeg-dev libtiff5-dev \
         libnova-dev libopenal-dev libraw-dev libusb-1.0-0-dev librtlsdr-dev \
-        libfftw3-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
+        libfftw3-dev libev-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
         libboost-test-dev python-all-dev swig g++ libftdi1-dev \
         libdc1394-22-dev googletest clang lsb-release dirmngr vim \
         libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev

diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile
@@ -7,7 +7,7 @@ RUN dnf -y install \
         libcurl-devel boost-devel cfitsio-devel libtiff-devel \
         libftdi-devel libgphoto2-devel gpsd-devel gsl-devel libjpeg-turbo-devel \
         libnova-devel openal-soft-devel LibRaw-devel libusb-devel rtl-sdr-devel \
-        fftw-devel zlib-devel libconfuse-devel python3-devel doxygen \
+        fftw-devel libev-devel zlib-devel libconfuse-devel python3-devel doxygen \
         libdc1394-devel python-devel swig gcc-c++ clang vim \
         libavcodec-devel libavdevice-devel libavformat-devel libavutil-devel
 

diff --git a/docker/opensuse/Dockerfile b/docker/opensuse/Dockerfile
@@ -7,7 +7,7 @@ RUN zypper --non-interactive install lsb-release \
         libcurl-devel boost-devel libboost_regex1_67_0-devel cfitsio-devel \
         libftdi1-devel libdc1394-devel libgphoto2-devel gsl-devel libjpeg-devel libtiff-devel \
         libnova-devel openal-soft-devel libraw-devel libusb-devel \
-        fftw-devel zlib-devel libconfuse-devel python3-devel doxygen \
+        fftw-devel libev-devel zlib-devel libconfuse-devel python3-devel doxygen \
         libdc1394-devel python-devel vim rtl-sdr-devel vim \
         libavcodec-devel libavdevice-devel libavformat-devel libavutil-devel
 

diff --git a/docker/ubuntu_artful/Dockerfile b/docker/ubuntu_artful/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -qqy install \
         libcurl4-gnutls-dev libboost-dev libboost-regex-dev libcfitsio-dev \
         libftdi-dev libdc1394-22-dev libgphoto2-dev libgps-dev libgsl-dev libjpeg-dev libtiff5-dev \
         libnova-dev libopenal-dev libraw-dev libusb-1.0-0-dev librtlsdr-dev \
-        libfftw3-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
+        libfftw3-dev libev-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
         libboost-test-dev python-all-dev swig g++ libftdi1-dev \
         libdc1394-22-dev googletest clang lsb-release dirmngr vim \
         libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev 

diff --git a/docker/ubuntu_bionic/Dockerfile b/docker/ubuntu_bionic/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get -qqy install \
         libcurl4-gnutls-dev libboost-dev libboost-regex-dev libcfitsio-dev \
         libftdi-dev libdc1394-22-dev libgphoto2-dev libgps-dev libgsl-dev libjpeg-dev libtiff-dev \
         libnova-dev libopenal-dev libraw-dev libusb-1.0-0-dev librtlsdr-dev \
-        libfftw3-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
+        libfftw3-dev libev-dev zlib1g-dev libconfuse-dev python3-all-dev doxygen \
         libboost-test-dev python-all-dev swig g++ libftdi1-dev \
         libdc1394-22-dev googletest clang-5.0 lsb-release dirmngr vim \
         libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev

diff --git a/drivers/ccd/ccd_simulator.cpp b/drivers/ccd/ccd_simulator.cpp
@@ -548,7 +548,7 @@ int CCDSim::DrawCcdFrame(INDI::CCDChip * targetChip)
     else
         targetFocalLength = guiderFocalLength;
 
-    if (ShowStarField)
+    if (ShowStarField && GainN[0].value > 0)
     {
         float PEOffset {0};
         float decDrift {0};