Merge branch 'master' into proc2medm

.gitignore

@@ -34,8 +34,12 @@ src/daqd/autom4te.cache
 # srctrl
 *.srctrl*
 
-#kernel module build files
+# kernel module build files
 modules.order
 
-#python compile files
-*__pycache__*
\ No newline at end of file
+# python compile files
+*__pycache__*
+
+# sphinx doc files
+*_build
+*_static

.gitlab-ci.yml

+# https://docs.gitlab.com/ee/ci/yaml/#stages
+# https://docs.gitlab.com/ee/ci/yaml/#pages
+# https://wiki.ligo.org/DASWG/GitLigoOrg
+# https://wiki.ligo.org/viewauth/DASWG/GitLigoOrg#Accessing_GitLab_Pages
+# https://git.ligo.org/lscsoft/example-ci-project/wikis/automatically-produce-documentation
+
+pages:
+  stage: deploy
+  only:
+    - master
+  image: igwn/base:buster
+  script:
+    - rm -rf public
+    - apt-get update
+    - apt-get install -y -qq python3-sphinx latexmk texlive texlive-latex-extra
+    - cd doc2
+    - make html latexpdf
+    - mv _build/html ../public
+    - mv _build/latex/advLigoRTS.pdf ../public
+  artifacts:
+    paths:
+    - public

doc2/Makefile

+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
+BUILDDIR      = _build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

doc2/conf.py

+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- Project information -----------------------------------------------------
+
+project = 'advLigoRTS'
+copyright = '2020, Rolf Bork'
+author = 'Rolf Bork, Jonathan Hanks, Erik von Reis, Jameson Rollins'
+
+
+# -- General configuration ---------------------------------------------------
+
+# the current setup uses index.rst instead of content.rst (which we do not have)
+# https://stackoverflow.com/questions/56336234/build-fail-sphinx-error-contents-rst-not-found
+master_doc = 'index'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = 'alabaster'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']

doc2/daq.rst

+Configuring the data acquisition daemons
+========================================
+
+

doc2/diag.rst

+Diagnostic tools for the RTS
+============================

doc2/index.rst

+.. advLigoRTS documentation master file, created by
+   sphinx-quickstart on Wed Jul  8 15:45:15 2020.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to advLigoRTS's documentation!
+======================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   install
+   rcg
+   daq
+   diag
+   
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`

doc2/install.rst

+Installing the advLigoRTS software
+==================================
+
+
+Install Debian 10, add the cdssoft archive source, install::
+
+   $ apt install advligorts-cymac
+
+
+
+
+Setting up an advLigoRTS system
+-------------------------------

doc2/rcg.rst

+Using the Real-time Code Generator (RCG)
+========================================
+

src/daqd/CMakeLists.txt

@@ -146,6 +146,12 @@ target_link_libraries(daqd PUBLIC
 		)
 
 install(TARGETS daqd DESTINATION bin)
+install(PROGRAMS util/daq_wiper.py
+		DESTINATION bin
+		RENAME daq_wiper)
+install(PROGRAMS util/checkdaqconfig.py
+		DESTINATION bin
+		RENAME checkdaqconfig)
 
 add_executable(test_daqd_unit_tests tests/test_main.cc
 		tests/test_daqd_cmask_t.cc

src/epics/seq/CMakeLists.txt

@@ -3,6 +3,10 @@ if (Boost_FOUND)
 add_executable(standalone_edc
         standalone_edcu.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/../../drv/rfm.c)
+#target_compile_options(standalone_edc PRIVATE -fsanitize=address)
+#target_link_libraries(standalone_edc PRIVATE asan)
+#target_compile_options(standalone_edc PRIVATE
+#        -fstack-protector -fstack-protector-strong)
 target_include_directories(standalone_edc PUBLIC
         "${CMAKE_CURRENT_SOURCE_DIR}/../../include"
         "${CMAKE_CURRENT_SOURCE_DIR}/../../include/drv"

src/epics/seq/standalone_edcu.cc

@@ -1280,7 +1280,7 @@ update_diag_info( diag_thread_queues& queues )
         return;
     }
     diag_info_block* info = nullptr;
-    queues.free_queue.pop( &info );
+    queues.free_queue.pop( &info, 1);
 
     info->con_chans = daqd_edcu1.con_chans;
     std::copy( std::begin( daqd_edcu1.channel_status ),
@@ -1304,7 +1304,7 @@ get_diag_info( diag_thread_queues& queues, diag_info_block& dest )
         return;
     }
     diag_info_block* info = nullptr;
-    queues.msg_queue.pop( &info );
+    queues.msg_queue.pop( &info, 1 );
 
     dest = *info;
 

support/systemd/rts-daqd.service

 [Unit]
 Description=Advanced LIGO RTS data acquisition daemon
-After=network-online.target
+After=network-online.target remote-fs.target
 
 [Service]
 User=advligorts

support/systemd/rts-edc.service

 [Unit]
 Description=Advanced LIGO RTS stand-alone EPICS data concentrator
-After=network-online.target
+After=network-online.target remote-fs.target
 
 [Service]
 User=advligorts

support/systemd/rts-local_dc.service

 [Unit]
 Description=Advanced LIGO RTS local data concentrator
-After=network-online.target
+After=network-online.target remote-fs.target
 
 [Service]
 User=advligorts

support/systemd/rts-nds.service

 [Unit]
 Description=Advanced LIGO RTS NDS1 frame data retriever
-After=network-online.target
+After=network-online.target remote-fs.target
 
 [Service]
 RuntimeDirectory=nds