mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-26 08:10:02 +02:00
removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.
This commit is contained in:
Dhanya Maliakal
parent
c5ff578d10
commit
e8bb186ff8
@ -1,141 +1,497 @@
|
||||
include ../Makefile.include
|
||||
# CMAKE generated file: DO NOT EDIT!
|
||||
# Generated by "Unix Makefiles" Generator, CMake Version 2.8
|
||||
|
||||
DESTDIR ?= ../bin
|
||||
LIBDIR ?= ../bin
|
||||
DOCDIR ?= docs
|
||||
SRCDIR = src
|
||||
INCDIR = include
|
||||
TESTDIR = test
|
||||
BUILDDIR = build
|
||||
PROGS = $(DESTDIR)/slsReceiver
|
||||
# Default target executed when no arguments are given to make.
|
||||
default_target: all
|
||||
.PHONY : default_target
|
||||
|
||||
#=============================================================================
|
||||
# Special targets provided by cmake.
|
||||
|
||||
CFLAGS= -g -DC_ONLY -fPIC
|
||||
#FLAGS+= #-DVERBOSE -DVERYVERBOSE
|
||||
# Disable implicit rules so canonical targets will work.
|
||||
.SUFFIXES:
|
||||
|
||||
DFLAGS= -g -DDACS_INT -DSLS_RECEIVER_UDP_FUNCTIONS #-DVERBOSE
|
||||
# Remove some rules from gmake that .SUFFIXES does not remove.
|
||||
SUFFIXES =
|
||||
|
||||
INCLUDES?= $(INCLUDESRXR) -I include/
|
||||
.SUFFIXES: .hpux_make_needs_suffix_list
|
||||
|
||||
##############################################################
|
||||
# ZMQ specific: in this case, you need ZMQ libraries already included in this package
|
||||
###########################################################
|
||||
LIBZMQDIR = include
|
||||
LIBZMQ = -L$(LIBZMQDIR) -Wl,-rpath=$(LIBZMQDIR) -lzmq
|
||||
# Suppress display of executed commands.
|
||||
$(VERBOSE).SILENT:
|
||||
|
||||
# A target that is always out of date.
|
||||
cmake_force:
|
||||
.PHONY : cmake_force
|
||||
|
||||
#=============================================================================
|
||||
# Set environment variables for the build.
|
||||
|
||||
# The shell in which to execute make rules.
|
||||
SHELL = /bin/sh
|
||||
|
||||
# The CMake executable.
|
||||
CMAKE_COMMAND = /usr/bin/cmake
|
||||
|
||||
# The command to remove a file.
|
||||
RM = /usr/bin/cmake -E remove -f
|
||||
|
||||
# The program to use to edit the cache.
|
||||
CMAKE_EDIT_COMMAND = /usr/bin/ccmake
|
||||
|
||||
# The top-level source directory on which CMake was run.
|
||||
CMAKE_SOURCE_DIR = /afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorsPackage/slsReceiverSoftware
|
||||
|
||||
# The top-level build directory on which CMake was run.
|
||||
CMAKE_BINARY_DIR = /afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorsPackage/slsReceiverSoftware
|
||||
|
||||
#=============================================================================
|
||||
# Targets provided globally by CMake.
|
||||
|
||||
# Special rule for the target edit_cache
|
||||
edit_cache:
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
|
||||
/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
|
||||
.PHONY : edit_cache
|
||||
|
||||
# Special rule for the target edit_cache
|
||||
edit_cache/fast: edit_cache
|
||||
.PHONY : edit_cache/fast
|
||||
|
||||
# Special rule for the target rebuild_cache
|
||||
rebuild_cache:
|
||||
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
|
||||
/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
|
||||
.PHONY : rebuild_cache
|
||||
|
||||
# Special rule for the target rebuild_cache
|
||||
rebuild_cache/fast: rebuild_cache
|
||||
.PHONY : rebuild_cache/fast
|
||||
|
||||
# The main all target
|
||||
all: cmake_check_build_system
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start /afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorsPackage/slsReceiverSoftware/CMakeFiles /afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorsPackage/slsReceiverSoftware/CMakeFiles/progress.marks
|
||||
$(MAKE) -f CMakeFiles/Makefile2 all
|
||||
$(CMAKE_COMMAND) -E cmake_progress_start /afs/psi.ch/project/sls_det_software/dhanya_softwareDevelopment/mySoft/slsDetectorsPackage/slsReceiverSoftware/CMakeFiles 0
|
||||
.PHONY : all
|
||||
|
||||
# The main clean target
|
||||
clean:
|
||||
$(MAKE) -f CMakeFiles/Makefile2 clean
|
||||
.PHONY : clean
|
||||
|
||||
# The main clean target
|
||||
clean/fast: clean
|
||||
.PHONY : clean/fast
|
||||
|
||||
# Prepare targets for installation.
|
||||
preinstall: all
|
||||
$(MAKE) -f CMakeFiles/Makefile2 preinstall
|
||||
.PHONY : preinstall
|
||||
|
||||
# Prepare targets for installation.
|
||||
preinstall/fast:
|
||||
$(MAKE) -f CMakeFiles/Makefile2 preinstall
|
||||
.PHONY : preinstall/fast
|
||||
|
||||
# clear depends
|
||||
depend:
|
||||
$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
|
||||
.PHONY : depend
|
||||
|
||||
#=============================================================================
|
||||
# Target rules for targets named slsReceiver
|
||||
|
||||
# Build rule for target.
|
||||
slsReceiver: cmake_check_build_system
|
||||
$(MAKE) -f CMakeFiles/Makefile2 slsReceiver
|
||||
.PHONY : slsReceiver
|
||||
|
||||
# fast build rule for target.
|
||||
slsReceiver/fast:
|
||||
$(MAKE) -f CMakeFiles/slsReceiver.dir/build.make CMakeFiles/slsReceiver.dir/build
|
||||
.PHONY : slsReceiver/fast
|
||||
|
||||
#=============================================================================
|
||||
# Target rules for targets named slsReceiverShared
|
||||
|
||||
# Build rule for target.
|
||||
slsReceiverShared: cmake_check_build_system
|
||||
$(MAKE) -f CMakeFiles/Makefile2 slsReceiverShared
|
||||
.PHONY : slsReceiverShared
|
||||
|
||||
# fast build rule for target.
|
||||
slsReceiverShared/fast:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/build
|
||||
.PHONY : slsReceiverShared/fast
|
||||
|
||||
#=============================================================================
|
||||
# Target rules for targets named slsReceiverStatic
|
||||
|
||||
# Build rule for target.
|
||||
slsReceiverStatic: cmake_check_build_system
|
||||
$(MAKE) -f CMakeFiles/Makefile2 slsReceiverStatic
|
||||
.PHONY : slsReceiverStatic
|
||||
|
||||
# fast build rule for target.
|
||||
slsReceiverStatic/fast:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/build
|
||||
.PHONY : slsReceiverStatic/fast
|
||||
|
||||
# target to build an object file
|
||||
src/BinaryFile.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/BinaryFile.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/BinaryFile.o
|
||||
.PHONY : src/BinaryFile.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/BinaryFile.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/BinaryFile.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/BinaryFile.i
|
||||
.PHONY : src/BinaryFile.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/BinaryFile.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/BinaryFile.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/BinaryFile.s
|
||||
.PHONY : src/BinaryFile.s
|
||||
|
||||
# target to build an object file
|
||||
src/DataProcessor.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/DataProcessor.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/DataProcessor.o
|
||||
.PHONY : src/DataProcessor.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/DataProcessor.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/DataProcessor.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/DataProcessor.i
|
||||
.PHONY : src/DataProcessor.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/DataProcessor.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/DataProcessor.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/DataProcessor.s
|
||||
.PHONY : src/DataProcessor.s
|
||||
|
||||
# target to build an object file
|
||||
src/DataStreamer.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/DataStreamer.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/DataStreamer.o
|
||||
.PHONY : src/DataStreamer.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/DataStreamer.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/DataStreamer.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/DataStreamer.i
|
||||
.PHONY : src/DataStreamer.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/DataStreamer.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/DataStreamer.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/DataStreamer.s
|
||||
.PHONY : src/DataStreamer.s
|
||||
|
||||
# target to build an object file
|
||||
src/Fifo.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/Fifo.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/Fifo.o
|
||||
.PHONY : src/Fifo.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/Fifo.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/Fifo.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/Fifo.i
|
||||
.PHONY : src/Fifo.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/Fifo.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/Fifo.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/Fifo.s
|
||||
.PHONY : src/Fifo.s
|
||||
|
||||
# target to build an object file
|
||||
src/File.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/File.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/File.o
|
||||
.PHONY : src/File.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/File.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/File.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/File.i
|
||||
.PHONY : src/File.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/File.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/File.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/File.s
|
||||
.PHONY : src/File.s
|
||||
|
||||
# target to build an object file
|
||||
src/Listener.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/Listener.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/Listener.o
|
||||
.PHONY : src/Listener.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/Listener.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/Listener.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/Listener.i
|
||||
.PHONY : src/Listener.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/Listener.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/Listener.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/Listener.s
|
||||
.PHONY : src/Listener.s
|
||||
|
||||
# target to build an object file
|
||||
src/MySocketTCP.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/MySocketTCP.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/MySocketTCP.o
|
||||
.PHONY : src/MySocketTCP.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/MySocketTCP.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/MySocketTCP.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/MySocketTCP.i
|
||||
.PHONY : src/MySocketTCP.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/MySocketTCP.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/MySocketTCP.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/MySocketTCP.s
|
||||
.PHONY : src/MySocketTCP.s
|
||||
|
||||
# target to build an object file
|
||||
src/ThreadObject.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/ThreadObject.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/ThreadObject.o
|
||||
.PHONY : src/ThreadObject.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/ThreadObject.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/ThreadObject.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/ThreadObject.i
|
||||
.PHONY : src/ThreadObject.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/ThreadObject.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/ThreadObject.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/ThreadObject.s
|
||||
.PHONY : src/ThreadObject.s
|
||||
|
||||
# target to build an object file
|
||||
src/UDPBaseImplementation.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPBaseImplementation.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPBaseImplementation.o
|
||||
.PHONY : src/UDPBaseImplementation.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/UDPBaseImplementation.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPBaseImplementation.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPBaseImplementation.i
|
||||
.PHONY : src/UDPBaseImplementation.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/UDPBaseImplementation.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPBaseImplementation.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPBaseImplementation.s
|
||||
.PHONY : src/UDPBaseImplementation.s
|
||||
|
||||
# target to build an object file
|
||||
src/UDPInterface.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPInterface.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPInterface.o
|
||||
.PHONY : src/UDPInterface.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/UDPInterface.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPInterface.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPInterface.i
|
||||
.PHONY : src/UDPInterface.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/UDPInterface.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPInterface.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPInterface.s
|
||||
.PHONY : src/UDPInterface.s
|
||||
|
||||
# target to build an object file
|
||||
src/UDPStandardImplementation.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPStandardImplementation.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPStandardImplementation.o
|
||||
.PHONY : src/UDPStandardImplementation.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/UDPStandardImplementation.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPStandardImplementation.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPStandardImplementation.i
|
||||
.PHONY : src/UDPStandardImplementation.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/UDPStandardImplementation.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/UDPStandardImplementation.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/UDPStandardImplementation.s
|
||||
.PHONY : src/UDPStandardImplementation.s
|
||||
|
||||
# target to build an object file
|
||||
src/main.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiver.dir/build.make CMakeFiles/slsReceiver.dir/src/main.o
|
||||
.PHONY : src/main.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/main.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiver.dir/build.make CMakeFiles/slsReceiver.dir/src/main.i
|
||||
.PHONY : src/main.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/main.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiver.dir/build.make CMakeFiles/slsReceiver.dir/src/main.s
|
||||
.PHONY : src/main.s
|
||||
|
||||
# target to build an object file
|
||||
src/slsReceiver.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiver.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiver.o
|
||||
.PHONY : src/slsReceiver.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/slsReceiver.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiver.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiver.i
|
||||
.PHONY : src/slsReceiver.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/slsReceiver.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiver.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiver.s
|
||||
.PHONY : src/slsReceiver.s
|
||||
|
||||
# target to build an object file
|
||||
src/slsReceiverTCPIPInterface.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiverTCPIPInterface.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiverTCPIPInterface.o
|
||||
.PHONY : src/slsReceiverTCPIPInterface.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/slsReceiverTCPIPInterface.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiverTCPIPInterface.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiverTCPIPInterface.i
|
||||
.PHONY : src/slsReceiverTCPIPInterface.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/slsReceiverTCPIPInterface.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiverTCPIPInterface.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiverTCPIPInterface.s
|
||||
.PHONY : src/slsReceiverTCPIPInterface.s
|
||||
|
||||
# target to build an object file
|
||||
src/slsReceiverUsers.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiverUsers.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiverUsers.o
|
||||
.PHONY : src/slsReceiverUsers.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/slsReceiverUsers.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiverUsers.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiverUsers.i
|
||||
.PHONY : src/slsReceiverUsers.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/slsReceiverUsers.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/slsReceiverUsers.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/slsReceiverUsers.s
|
||||
.PHONY : src/slsReceiverUsers.s
|
||||
|
||||
# target to build an object file
|
||||
src/utilities.o:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/utilities.o
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/utilities.o
|
||||
.PHONY : src/utilities.o
|
||||
|
||||
# target to preprocess a source file
|
||||
src/utilities.i:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/utilities.i
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/utilities.i
|
||||
.PHONY : src/utilities.i
|
||||
|
||||
# target to generate assembly for a file
|
||||
src/utilities.s:
|
||||
$(MAKE) -f CMakeFiles/slsReceiverShared.dir/build.make CMakeFiles/slsReceiverShared.dir/src/utilities.s
|
||||
$(MAKE) -f CMakeFiles/slsReceiverStatic.dir/build.make CMakeFiles/slsReceiverStatic.dir/src/utilities.s
|
||||
.PHONY : src/utilities.s
|
||||
|
||||
# Help Target
|
||||
help:
|
||||
@echo "The following are some of the valid targets for this Makefile:"
|
||||
@echo "... all (the default if no target is provided)"
|
||||
@echo "... clean"
|
||||
@echo "... depend"
|
||||
@echo "... edit_cache"
|
||||
@echo "... rebuild_cache"
|
||||
@echo "... slsReceiver"
|
||||
@echo "... slsReceiverShared"
|
||||
@echo "... slsReceiverStatic"
|
||||
@echo "... src/BinaryFile.o"
|
||||
@echo "... src/BinaryFile.i"
|
||||
@echo "... src/BinaryFile.s"
|
||||
@echo "... src/DataProcessor.o"
|
||||
@echo "... src/DataProcessor.i"
|
||||
@echo "... src/DataProcessor.s"
|
||||
@echo "... src/DataStreamer.o"
|
||||
@echo "... src/DataStreamer.i"
|
||||
@echo "... src/DataStreamer.s"
|
||||
@echo "... src/Fifo.o"
|
||||
@echo "... src/Fifo.i"
|
||||
@echo "... src/Fifo.s"
|
||||
@echo "... src/File.o"
|
||||
@echo "... src/File.i"
|
||||
@echo "... src/File.s"
|
||||
@echo "... src/Listener.o"
|
||||
@echo "... src/Listener.i"
|
||||
@echo "... src/Listener.s"
|
||||
@echo "... src/MySocketTCP.o"
|
||||
@echo "... src/MySocketTCP.i"
|
||||
@echo "... src/MySocketTCP.s"
|
||||
@echo "... src/ThreadObject.o"
|
||||
@echo "... src/ThreadObject.i"
|
||||
@echo "... src/ThreadObject.s"
|
||||
@echo "... src/UDPBaseImplementation.o"
|
||||
@echo "... src/UDPBaseImplementation.i"
|
||||
@echo "... src/UDPBaseImplementation.s"
|
||||
@echo "... src/UDPInterface.o"
|
||||
@echo "... src/UDPInterface.i"
|
||||
@echo "... src/UDPInterface.s"
|
||||
@echo "... src/UDPStandardImplementation.o"
|
||||
@echo "... src/UDPStandardImplementation.i"
|
||||
@echo "... src/UDPStandardImplementation.s"
|
||||
@echo "... src/main.o"
|
||||
@echo "... src/main.i"
|
||||
@echo "... src/main.s"
|
||||
@echo "... src/slsReceiver.o"
|
||||
@echo "... src/slsReceiver.i"
|
||||
@echo "... src/slsReceiver.s"
|
||||
@echo "... src/slsReceiverTCPIPInterface.o"
|
||||
@echo "... src/slsReceiverTCPIPInterface.i"
|
||||
@echo "... src/slsReceiverTCPIPInterface.s"
|
||||
@echo "... src/slsReceiverUsers.o"
|
||||
@echo "... src/slsReceiverUsers.i"
|
||||
@echo "... src/slsReceiverUsers.s"
|
||||
@echo "... src/utilities.o"
|
||||
@echo "... src/utilities.i"
|
||||
@echo "... src/utilities.s"
|
||||
.PHONY : help
|
||||
|
||||
|
||||
|
||||
SRC_CLNT = MySocketTCP.cpp ThreadObject.cpp Listener.cpp DataProcessor.cpp DataStreamer.cpp Fifo.cpp File.cpp BinaryFile.cpp UDPInterface.cpp UDPBaseImplementation.cpp UDPStandardImplementation.cpp slsReceiverTCPIPInterface.cpp slsReceiver.cpp slsReceiverUsers.cpp utilities.cpp
|
||||
DEPSINCLUDES = $(INCDIR)/ansi.h $(INCDIR)/sls_receiver_defs.h $(INCDIR)/sls_receiver_funcs.h $(INCDIR)/GeneralData.h $(INCDIR)/circularFifo.h $(INCDIR)/genericSocket.h $(INCDIR)/logger.h $(INCDIR)/receiver_defs.h $(INCDIR)/UDPInterface.h $(INCDIR)/utilities.h $(INCDIR)/ZmqSocket.h $(INCDIR)/BinaryFileStatic.h $(INCDIR)/HDF5FileStatic.h
|
||||
|
||||
|
||||
ifeq ($(HDF5),yes)
|
||||
SRC_CLNT += HDF5File.cpp HDF5FileStatic.cpp
|
||||
endif
|
||||
|
||||
ifeq ($(REST), yes)
|
||||
SRC_CLNT += UDPRESTImplementation.cpp
|
||||
endif
|
||||
|
||||
MAIN_SRC = main.cpp
|
||||
|
||||
|
||||
OBJS=$(SRC_CLNT:%.cpp=$(BUILDDIR)/%.o)
|
||||
|
||||
$(info )
|
||||
$(info #######################################)
|
||||
$(info # In slsReceiverSoftware Makefile #)
|
||||
$(info #######################################)
|
||||
$(info )
|
||||
|
||||
ifeq ($(REST), yes)
|
||||
$(info )
|
||||
$(info !#####################################!)
|
||||
$(info ! PLEASE ENSURE THAT VARIABLES !)
|
||||
$(info ! POCODIR and JSONBOXDIR !)
|
||||
$(info ! ARE PROPERLY SETUP!!! !)
|
||||
$(info !#####################################!)
|
||||
$(info )
|
||||
endif
|
||||
|
||||
.PHONY: all intdoc package eigerReceiver clean
|
||||
|
||||
all: builddir lib receiver
|
||||
|
||||
dummy: $(DESTDIR)/dummyReceiver
|
||||
|
||||
intdoc: $(SRC_H) $(SRC_CLNT)
|
||||
doxygen doxy.config
|
||||
|
||||
$(BUILDDIR)/%.o : $(SRCDIR)/%.cpp $(INCDIR)/%.h $(DEPSINCLUDES) Makefile
|
||||
ifeq ($(ROOTSLS),yes)
|
||||
$(CXX) -DROOTSLS -o $@ -c $< $(INCLUDES) $(DFLAGS) $(ROOTFLAGS) -fPIC $(EPICSFLAGS) $(LDFLAGRXR) -L/usr/lib64/ $(FLAGS)
|
||||
else
|
||||
# $(call colorecho,`./updateGitVersion.sh`)
|
||||
$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) $(LDFLAGRXR) -pthread $(FLAGS) $(LIBZMQ) -lrt
|
||||
endif
|
||||
|
||||
versioning:
|
||||
$(call colorecho,`./updateGitVersion.sh`)
|
||||
|
||||
lib: versioning $(OBJS) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
|
||||
|
||||
receiver: $(DESTDIR)/slsReceiver
|
||||
|
||||
$(DESTDIR)/libSlsReceiver.so: $(OBJS)
|
||||
$(call colorecho,"#######################################")
|
||||
$(call colorecho,"# Compiling slsReceiver Library #")
|
||||
$(call colorecho,"#######################################")
|
||||
$(CXX) -shared -Wl,-soname,libSlsReceiver.so -o libSlsReceiver.so $(OBJS) -lc $(INCLUDES) $(DFLAGS) $(FLAGS) $(EPICSFLAGS) -L/usr/lib64 -pthread $(LIBZMQ) -lrt
|
||||
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
||||
mv libSlsReceiver.so $(DESTDIR)
|
||||
|
||||
$(DESTDIR)/libSlsReceiver.a: $(OBJS)
|
||||
ar rcs libSlsReceiver.a $(OBJS)
|
||||
mv libSlsReceiver.a $(DESTDIR)
|
||||
|
||||
|
||||
$(DESTDIR)/slsReceiver: $(SRCDIR)/$(MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
|
||||
$(call colorecho,"#######################################")
|
||||
$(call colorecho,"# Compiling slsReceiver #")
|
||||
$(call colorecho,"#######################################")
|
||||
$(CXX) -o $@ $(SRCDIR)/$(MAIN_SRC) $(FLAGS) $(INCLUDES) $(CFLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt
|
||||
#$(EIGERFLAGS)
|
||||
|
||||
|
||||
$(DESTDIR)/dummyReceiver: $(SRCDIR)/$(DUMMY_MAIN_SRC) $(DESTDIR)/libSlsReceiver.so $(DESTDIR)/libSlsReceiver.a
|
||||
$(call colorecho,"#######################################")
|
||||
$(call colorecho,"# Compiling Dummy slsReceiver #")
|
||||
$(call colorecho,"#######################################")
|
||||
$(CXX) -o $@ $(SRCDIR)/$(DUMMY_MAIN_SRC) $(FLAGS) $(INCLUDES) $(CFLAGS) $(LIBS) $(LDFLAGRXR) -fPIC $(LIBZMQ) -lrt
|
||||
#$(EIGERFLAGS)
|
||||
|
||||
|
||||
clean: buildclean
|
||||
make testclean
|
||||
if test -e $(DESTDIR)/libSlsReceiver.a; then rm $(DESTDIR)/libSlsReceiver.a;fi
|
||||
if test -e $(DESTDIR)/libSlsReceiver.so; then rm $(DESTDIR)/libSlsReceiver.so;fi
|
||||
if test -e $(PROGS); then rm $(PROGS);fi
|
||||
|
||||
builddir:
|
||||
mkdir -p $(BUILDDIR)
|
||||
# if [ ! -d $(BUILDDIR) ]; then mkdir $(BUILDDIR); fi
|
||||
|
||||
buildclean:
|
||||
rm -rf $(OBJS)
|
||||
|
||||
testclean:
|
||||
if [ -f $(TESTDIR)/rec ]; then \
|
||||
cd $(TESTDIR) && rm *.o rec send; \
|
||||
fi
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
install: package
|
||||
|
||||
install_inc:
|
||||
$(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR))
|
||||
cp -P slsReceiver/slsReceiverUsers.h $(DESTDIR)
|
||||
#=============================================================================
|
||||
# Special targets to cleanup operation of make.
|
||||
|
||||
# Special rule to run CMake to check the build system integrity.
|
||||
# No rule that depends on this can have commands that come from listfiles
|
||||
# because they might be regenerated.
|
||||
cmake_check_build_system:
|
||||
$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
|
||||
.PHONY : cmake_check_build_system
|
||||
|
||||
|
||||
@ -27,7 +27,6 @@ class BinaryFile : private virtual slsReceiverDefs, public File, public BinaryFi
|
||||
* @param fname pointer to file name prefix
|
||||
* @param fpath pointer to file path
|
||||
* @param findex pointer to file index
|
||||
* @param frindexenable pointer to frame index enable
|
||||
* @param owenable pointer to over write enable
|
||||
* @param dindex pointer to detector index
|
||||
* @param nunits pointer to number of theads/ units per detector
|
||||
@ -36,8 +35,7 @@ class BinaryFile : private virtual slsReceiverDefs, public File, public BinaryFi
|
||||
* @param portno pointer to udp port number for logging
|
||||
*/
|
||||
BinaryFile(int ind, uint32_t maxf, const uint32_t* ppf,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex,
|
||||
bool* frindexenable, bool* owenable,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
|
||||
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno);
|
||||
|
||||
/**
|
||||
|
||||
@ -160,7 +160,6 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
|
||||
* @param fname pointer to file name prefix
|
||||
* @param fpath pointer to file path
|
||||
* @param findex pointer to file index
|
||||
* @param frindexenable pointer to frame index enable
|
||||
* @param owenable pointer to over write enable
|
||||
* @param dindex pointer to detector index
|
||||
* @param nunits pointer to number of theads/ units per detector
|
||||
@ -170,7 +169,7 @@ class DataProcessor : private virtual slsReceiverDefs, public ThreadObject {
|
||||
* @param g address of GeneralData (Detector Data) pointer
|
||||
*/
|
||||
void SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t* findex,
|
||||
bool* frindexenable, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, GeneralData* g = 0);
|
||||
bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno, GeneralData* g = 0);
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,6 @@ class File : private virtual slsReceiverDefs {
|
||||
* @param fname pointer to file name prefix
|
||||
* @param fpath pointer to file path
|
||||
* @param findex pointer to file index
|
||||
* @param frindexenable pointer to frame index enable
|
||||
* @param owenable pointer to over write enable
|
||||
* @param dindex pointer to detector index
|
||||
* @param nunits pointer to number of theads/ units per detector
|
||||
@ -36,8 +35,7 @@ class File : private virtual slsReceiverDefs {
|
||||
* @param portno pointer to udp port number for logging
|
||||
*/
|
||||
File(int ind, uint32_t maxf, const uint32_t* ppf,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex,
|
||||
bool* frindexenable, bool* owenable,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
|
||||
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno);
|
||||
|
||||
/**
|
||||
@ -68,7 +66,6 @@ class File : private virtual slsReceiverDefs {
|
||||
* @param fname pointer to file name prefix
|
||||
* @param fpath pointer to file path
|
||||
* @param findex pointer to file index
|
||||
* @param frindexenable pointer to frame index enable
|
||||
* @param owenable pointer to over write enable
|
||||
* @param dindex pointer to detector index
|
||||
* @param nunits pointer to number of theads/ units per detector
|
||||
@ -76,8 +73,7 @@ class File : private virtual slsReceiverDefs {
|
||||
* @param dr pointer to dynamic range
|
||||
* @param portno pointer to dynamic range
|
||||
*/
|
||||
void GetMemberPointerValues(int* nd, char*& fname, char*& fpath, uint64_t*& findex,
|
||||
bool*& frindexenable, bool*& owenable,
|
||||
void GetMemberPointerValues(int* nd, char*& fname, char*& fpath, uint64_t*& findex, bool*& owenable,
|
||||
int*& dindex, int*& nunits, uint64_t*& nf, uint32_t*& dr, uint32_t*& portno);
|
||||
|
||||
/**
|
||||
@ -199,9 +195,6 @@ class File : private virtual slsReceiverDefs {
|
||||
/** File Index */
|
||||
uint64_t* fileIndex;
|
||||
|
||||
/** Frame Index */
|
||||
bool* frameIndexEnable;
|
||||
|
||||
/** Over write enable */
|
||||
bool* overWriteEnable;
|
||||
|
||||
|
||||
@ -33,7 +33,6 @@ class HDF5File : private virtual slsReceiverDefs, public File, public HDF5FileSt
|
||||
* @param fname pointer to file name prefix
|
||||
* @param fpath pointer to file path
|
||||
* @param findex pointer to file index
|
||||
* @param frindexenable pointer to frame index enable
|
||||
* @param owenable pointer to over write enable
|
||||
* @param dindex pointer to detector index
|
||||
* @param nunits pointer to number of theads/ units per detector
|
||||
@ -44,8 +43,7 @@ class HDF5File : private virtual slsReceiverDefs, public File, public HDF5FileSt
|
||||
* @param ny number of pixels in y direction
|
||||
*/
|
||||
HDF5File(int ind, uint32_t maxf, const uint32_t* ppf,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex,
|
||||
bool* frindexenable, bool* owenable,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
|
||||
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
|
||||
uint32_t nx, uint32_t ny);
|
||||
|
||||
|
||||
@ -97,12 +97,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
|
||||
*/
|
||||
int getScanTag() const;
|
||||
|
||||
/**
|
||||
* Get if Frame Index is enabled (acquisition of more than 1 frame adds '_f000000000000' to file name )
|
||||
* @return true if frame index needed, else false
|
||||
*/
|
||||
bool getFrameIndexEnable() const;
|
||||
|
||||
/**
|
||||
* Get File Write Enable
|
||||
* @return true if file write enabled, else false
|
||||
@ -325,12 +319,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
|
||||
*/
|
||||
void setScanTag(const int i);
|
||||
|
||||
/**
|
||||
* Set Frame Index Enable (acquisition of more than 1 frame adds '_f000000000000' to file name )
|
||||
* @param b true for frame index enable, else false
|
||||
*/
|
||||
void setFrameIndexEnable(const bool b);
|
||||
|
||||
/**
|
||||
* Set File Write Enable
|
||||
* @param b true for file write enable, else false
|
||||
@ -517,16 +505,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
|
||||
*/
|
||||
void shutDownUDPSockets();
|
||||
|
||||
/**
|
||||
* Get the buffer-current frame read by receiver
|
||||
* @param ithread port thread index
|
||||
* @param c pointer to current file name
|
||||
* @param raw address of pointer, pointing to current frame to send to gui
|
||||
* @param startAcq start index of the acquisition
|
||||
* @param startFrame start index of the scan
|
||||
*/
|
||||
void readFrame(int ithread, char* c,char** raw, int64_t &startAcq, int64_t &startFrame);
|
||||
|
||||
/**
|
||||
* abort acquisition with minimum damage: close open files, cleanup.
|
||||
* does nothing if state already is 'idle'
|
||||
@ -657,8 +635,6 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter
|
||||
uint64_t fileIndex;
|
||||
/** Scan Tag */
|
||||
int scanTag;
|
||||
/** Frame Index Enable */
|
||||
bool frameIndexEnable;
|
||||
/** File Write enable */
|
||||
bool fileWriteEnable;
|
||||
/** Overwrite enable */
|
||||
|
||||
@ -39,7 +39,6 @@ class UDPInterface {
|
||||
* -setFileFormat
|
||||
* -setFileWriteEnable
|
||||
* -setOverwriteEnable
|
||||
* -setFrameIndexEnable
|
||||
* -setAcquisitionPeriod
|
||||
* -setNumberOfFrames
|
||||
* -setAcquisitionTime
|
||||
@ -184,12 +183,6 @@ class UDPInterface {
|
||||
*/
|
||||
virtual int getScanTag() const = 0;
|
||||
|
||||
/**
|
||||
* Get if Frame Index is enabled (acquisition of more than 1 frame adds '_f000000000000' to file name )
|
||||
* @return true if frame index needed, else false
|
||||
*/
|
||||
virtual bool getFrameIndexEnable() const = 0;
|
||||
|
||||
/**
|
||||
* Get File Write Enable
|
||||
* @return true if file write enabled, else false
|
||||
@ -410,12 +403,6 @@ class UDPInterface {
|
||||
*/
|
||||
virtual void setScanTag(const int i) = 0;
|
||||
|
||||
/**
|
||||
* Set Frame Index Enable (acquisition of more than 1 frame adds '_f000000000000' to file name )
|
||||
* @param b true for frame index enable, else false
|
||||
*/
|
||||
virtual void setFrameIndexEnable(const bool b) = 0;
|
||||
|
||||
/**
|
||||
* Set File Write Enable
|
||||
* @param b true for file write enable, else false
|
||||
@ -602,16 +589,6 @@ class UDPInterface {
|
||||
*/
|
||||
virtual void shutDownUDPSockets() = 0;
|
||||
|
||||
/**
|
||||
* Get the buffer-current frame read by receiver
|
||||
* @param ithread port thread index
|
||||
* @param c pointer to current file name
|
||||
* @param raw address of pointer, pointing to current frame to send to gui
|
||||
* @param startAcq start index of the acquisition
|
||||
* @param startFrame start index of the scan
|
||||
*/
|
||||
virtual void readFrame(int ithread, char* c,char** raw, int64_t &startAcq, int64_t &startFrame)=0;
|
||||
|
||||
/**
|
||||
* abort acquisition with minimum damage: close open files, cleanup.
|
||||
* does nothing if state already is 'idle'
|
||||
|
||||
@ -201,9 +201,6 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
|
||||
* when fifo is empty later, sets status to run_finished */
|
||||
int start_readout();
|
||||
|
||||
/** Reads Frame/ buffer */
|
||||
int read_frame();
|
||||
|
||||
/** Set File path */
|
||||
int set_file_dir();
|
||||
|
||||
@ -213,9 +210,6 @@ class slsReceiverTCPIPInterface : private virtual slsReceiverDefs {
|
||||
/** Set File index */
|
||||
int set_file_index();
|
||||
|
||||
/** Set Frame index */
|
||||
int set_frame_index();
|
||||
|
||||
/** Gets frame index for each acquisition */
|
||||
int get_frame_index();
|
||||
|
||||
|
||||
@ -35,13 +35,11 @@ enum recFuncs{
|
||||
F_START_RECEIVER, /**< starts the receiver listening mode */
|
||||
F_STOP_RECEIVER, /**< stops the receiver listening mode */
|
||||
F_START_RECEIVER_READOUT, /**< acquisition has stopped. start remaining readout in receiver */
|
||||
F_READ_RECEIVER_FRAME, /**< read one frame to gui*/
|
||||
|
||||
//file functions
|
||||
F_SET_RECEIVER_FILE_PATH, /**< sets receiver file directory */
|
||||
F_SET_RECEIVER_FILE_NAME, /**< sets receiver file name */
|
||||
F_SET_RECEIVER_FILE_INDEX, /**< sets receiver file index */
|
||||
F_SET_RECEIVER_FRAME_INDEX, /**< sets the receiver frame index */
|
||||
F_GET_RECEIVER_FRAME_INDEX, /**< gets the receiver frame index */
|
||||
F_GET_RECEIVER_FRAMES_CAUGHT, /**< gets the number of frames caught by receiver */
|
||||
F_RESET_RECEIVER_FRAMES_CAUGHT, /**< resets the frames caught by receiver */
|
||||
|
||||
@ -15,11 +15,10 @@ using namespace std;
|
||||
FILE* BinaryFile::masterfd = 0;
|
||||
|
||||
BinaryFile::BinaryFile(int ind, uint32_t maxf, const uint32_t* ppf,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex,
|
||||
bool* frindexenable, bool* owenable,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
|
||||
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno):
|
||||
|
||||
File(ind, maxf, ppf, nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, portno),
|
||||
File(ind, maxf, ppf, nd, fname, fpath, findex, owenable, dindex, nunits, nf, dr, portno),
|
||||
filefd(0),
|
||||
numFramesInFile(0),
|
||||
numActualPacketsInFile(0)
|
||||
@ -49,7 +48,7 @@ int BinaryFile::CreateFile(uint64_t fnum) {
|
||||
numActualPacketsInFile = 0;
|
||||
|
||||
currentFileName = BinaryFileStatic::CreateFileName(filePath, fileNamePrefix, *fileIndex,
|
||||
*frameIndexEnable, fnum, *detIndex, *numUnitsPerDetector, index);
|
||||
(*numImages > 1), fnum, *detIndex, *numUnitsPerDetector, index);
|
||||
|
||||
if (BinaryFileStatic::CreateDataFile(filefd, *overWriteEnable, currentFileName, FILE_BUFFER_SIZE) == FAIL)
|
||||
return FAIL;
|
||||
|
||||
@ -211,18 +211,18 @@ void DataProcessor::SetFileFormat(const fileFormat f) {
|
||||
if (file->GetFileType() != f) {
|
||||
//remember the pointer values before they are destroyed
|
||||
int nd[MAX_DIMENSIONS];nd[0] = 0; nd[1] = 0;
|
||||
char* fname=0; char* fpath=0; uint64_t* findex=0; bool* frindexenable=0;
|
||||
char* fname=0; char* fpath=0; uint64_t* findex=0;
|
||||
bool* owenable=0; int* dindex=0; int* nunits=0; uint64_t* nf = 0; uint32_t* dr = 0; uint32_t* port = 0;
|
||||
file->GetMemberPointerValues(nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, port);
|
||||
file->GetMemberPointerValues(nd, fname, fpath, findex, owenable, dindex, nunits, nf, dr, port);
|
||||
//create file writer with same pointers
|
||||
SetupFileWriter(nd, fname, fpath, findex, frindexenable, owenable, dindex, nunits, nf, dr, port);
|
||||
SetupFileWriter(nd, fname, fpath, findex, owenable, dindex, nunits, nf, dr, port);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void DataProcessor::SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t* findex,
|
||||
bool* frindexenable, bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
|
||||
bool* owenable, int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno,
|
||||
GeneralData* g)
|
||||
{
|
||||
if (g)
|
||||
@ -235,16 +235,14 @@ void DataProcessor::SetupFileWriter(int* nd, char* fname, char* fpath, uint64_t*
|
||||
#ifdef HDF5C
|
||||
case HDF5:
|
||||
file = new HDF5File(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame,
|
||||
nd, fname, fpath, findex,
|
||||
frindexenable, owenable,
|
||||
nd, fname, fpath, findex, owenable,
|
||||
dindex, nunits, nf, dr, portno,
|
||||
generalData->nPixelsX, generalData->nPixelsY);
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
file = new BinaryFile(index, generalData->maxFramesPerFile, &generalData->packetsPerFrame,
|
||||
nd, fname, fpath, findex,
|
||||
frindexenable, owenable,
|
||||
nd, fname, fpath, findex, owenable,
|
||||
dindex, nunits, nf, dr, portno);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -11,8 +11,7 @@ using namespace std;
|
||||
|
||||
|
||||
File::File(int ind, uint32_t maxf, const uint32_t* ppf,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex,
|
||||
bool* frindexenable, bool* owenable,
|
||||
int* nd, char* fname, char* fpath, uint64_t* findex, bool* owenable,
|
||||
int* dindex, int* nunits, uint64_t* nf, uint32_t* dr, uint32_t* portno):
|
||||
index(ind),
|
||||
maxFramesPerFile(maxf),
|
||||
@ -22,7 +21,6 @@ File::File(int ind, uint32_t maxf, const uint32_t* ppf,
|
||||
fileNamePrefix(fname),
|
||||
filePath(fpath),
|
||||
fileIndex(findex),
|
||||
frameIndexEnable(frindexenable),
|
||||
overWriteEnable(owenable),
|
||||
detIndex(dindex),
|
||||
numUnitsPerDetector(nunits),
|
||||
@ -50,7 +48,6 @@ void File::PrintMembers() {
|
||||
<< "File Name Prefix: " << fileNamePrefix << endl
|
||||
<< "File Path: " << filePath << endl
|
||||
<< "File Index: " << *fileIndex << endl
|
||||
<< "Frame Index Enable: " << *frameIndexEnable << endl
|
||||
<< "Over Write Enable: " << *overWriteEnable << endl
|
||||
|
||||
<< "Detector Index: " << *detIndex << endl
|
||||
@ -63,8 +60,7 @@ void File::PrintMembers() {
|
||||
}
|
||||
|
||||
|
||||
void File::GetMemberPointerValues(int* nd, char*& fname, char*& fpath, uint64_t*& findex,
|
||||
bool*& frindexenable, bool*& owenable,
|
||||
void File::GetMemberPointerValues(int* nd, char*& fname, char*& fpath, uint64_t*& findex, bool*& owenable,
|
||||
int*& dindex, int*& nunits, uint64_t*& nf, uint32_t*& dr, uint32_t*& portno)
|
||||
{
|
||||
nd[0] = numDetX;
|
||||
@ -72,7 +68,6 @@ void File::GetMemberPointerValues(int* nd, char*& fname, char*& fpath, uint64_t*
|
||||
fname = fileNamePrefix;
|
||||
fpath = filePath;
|
||||
findex = fileIndex;
|
||||
frindexenable = frameIndexEnable;
|
||||
owenable = overWriteEnable;
|
||||
dindex = detIndex;
|
||||
nunits = numUnitsPerDetector;
|
||||
|
||||
@ -91,14 +91,14 @@ int HDF5File::CreateFile(uint64_t fnum) {
|
||||
numFramesInFile = 0;
|
||||
numActualPacketsInFile = 0;
|
||||
currentFileName = HDF5FileStatic::CreateFileName(filePath, fileNamePrefix, *fileIndex,
|
||||
*frameIndexEnable, fnum, *detIndex, *numUnitsPerDetector, index);
|
||||
(*numImages > 1), fnum, *detIndex, *numUnitsPerDetector, index);
|
||||
|
||||
//first time
|
||||
if(!fnum) UpdateDataType();
|
||||
|
||||
uint64_t framestosave = ((*numImages - fnum) > maxFramesPerFile) ? maxFramesPerFile : (*numImages-fnum);
|
||||
pthread_mutex_lock(&Mutex);
|
||||
if (HDF5FileStatic::CreateDataFile(index, *overWriteEnable, currentFileName, *frameIndexEnable,
|
||||
if (HDF5FileStatic::CreateDataFile(index, *overWriteEnable, currentFileName, (*numImages > 1),
|
||||
fnum, framestosave, nPixelsY, ((*dynamicRange==4) ? (nPixelsX/2) : nPixelsX),
|
||||
datatype, filefd, dataspace, dataset,
|
||||
HDF5_WRITER_VERSION, MAX_CHUNKED_IMAGES,
|
||||
@ -191,7 +191,7 @@ void HDF5File::EndofAcquisition(uint64_t numf) {
|
||||
//dataset name
|
||||
ostringstream osfn;
|
||||
osfn << "/data";
|
||||
if (*frameIndexEnable) osfn << "_f" << setfill('0') << setw(12) << 0;
|
||||
if ((*numImages > 1)) osfn << "_f" << setfill('0') << setw(12) << 0;
|
||||
string dsetname = osfn.str();
|
||||
pthread_mutex_lock(&Mutex);
|
||||
HDF5FileStatic::LinkVirtualInMaster(masterFileName, currentFileName, dsetname);
|
||||
@ -212,7 +212,7 @@ int HDF5File::CreateVirtualFile(uint64_t numf) {
|
||||
pthread_mutex_lock(&Mutex);
|
||||
int ret = HDF5FileStatic::CreateVirtualDataFile(
|
||||
virtualfd, masterFileName,
|
||||
filePath, fileNamePrefix, *fileIndex, *frameIndexEnable,
|
||||
filePath, fileNamePrefix, *fileIndex, (*numImages > 1),
|
||||
*detIndex, *numUnitsPerDetector,
|
||||
maxFramesPerFile, numf,
|
||||
"data", datatype,
|
||||
|
||||
@ -70,7 +70,6 @@ void UDPBaseImplementation::initializeMembers(){
|
||||
strcpy(filePath,"");
|
||||
fileIndex = 0;
|
||||
scanTag = 0;
|
||||
frameIndexEnable = false;
|
||||
fileWriteEnable = true;
|
||||
overwriteEnable = true;
|
||||
dataCompressionEnable = false;
|
||||
@ -151,8 +150,6 @@ uint64_t UDPBaseImplementation::getFileIndex() const{ FILE_LOG(logDEBUG) << __AT
|
||||
|
||||
int UDPBaseImplementation::getScanTag() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return scanTag;}
|
||||
|
||||
bool UDPBaseImplementation::getFrameIndexEnable() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return frameIndexEnable;}
|
||||
|
||||
bool UDPBaseImplementation::getFileWriteEnable() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return fileWriteEnable;}
|
||||
|
||||
bool UDPBaseImplementation::getOverwriteEnable() const{ FILE_LOG(logDEBUG) << __AT__ << " starting"; return overwriteEnable;}
|
||||
@ -317,13 +314,6 @@ void UDPBaseImplementation::setScanTag(const int i){
|
||||
|
||||
}
|
||||
|
||||
void UDPBaseImplementation::setFrameIndexEnable(const bool b){
|
||||
FILE_LOG(logDEBUG) << __AT__ << " starting";
|
||||
|
||||
frameIndexEnable = b;
|
||||
FILE_LOG(logINFO) << "Frame Index Enable: " << stringEnable(frameIndexEnable);
|
||||
}
|
||||
|
||||
void UDPBaseImplementation::setFileWriteEnable(const bool b){
|
||||
FILE_LOG(logDEBUG) << __AT__ << " starting";
|
||||
|
||||
@ -548,11 +538,6 @@ void UDPBaseImplementation::shutDownUDPSockets(){
|
||||
FILE_LOG(logERROR) << __AT__ << " must be overridden by child classes";
|
||||
}
|
||||
|
||||
void UDPBaseImplementation::readFrame(int ithread, char* c,char** raw, int64_t &startAcquisitionIndex, int64_t &startFrameIndex){
|
||||
FILE_LOG(logWARNING) << __AT__ << " doing nothing...";
|
||||
FILE_LOG(logERROR) << __AT__ << " must be overridden by child classes";
|
||||
}
|
||||
|
||||
|
||||
//FIXME: needed, isnt stopReceiver enough?
|
||||
void UDPBaseImplementation::abort(){
|
||||
|
||||
@ -369,36 +369,8 @@ void UDPRESTImplementation::shutDownUDPSockets(){
|
||||
|
||||
|
||||
|
||||
/* FIXME
|
||||
* do you really need this, this is called if registerDataCallback() is activated
|
||||
* in your gui to get data from receiver. you probably have a different way
|
||||
* of reconstructing complete data set from all receivers
|
||||
*/
|
||||
/*
|
||||
void UDPRESTImplementation::readFrame(char* c,char** raw, uint64_t &startAcq, uint64_t &startFrame){
|
||||
FILE_LOG(logDEBUG1) << " called";
|
||||
strcpy(c,"");
|
||||
*raw = NULL;
|
||||
>>>>>>> 3.0-rcrest
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
/* FIXME
|
||||
* Its called by TCP in case of illegal shut down such as Ctrl + c.
|
||||
* Upto you what you want to do with it.
|
||||
*/
|
||||
|
||||
// Leo: not in the base class
|
||||
/*
|
||||
void UDPRESTImplementation::closeFiles(){
|
||||
FILE_LOG(logDEBUG1) << "called for thread ";
|
||||
FILE_LOG(logDEBUG1) << "exited for thread ";
|
||||
}
|
||||
*/
|
||||
|
||||
uint64_t UDPRESTImplementation::getTotalFramesCaught() const{
|
||||
FILE_LOG(logDEBUG1) << " starting";
|
||||
return (0);
|
||||
|
||||
@ -360,7 +360,7 @@ void UDPStandardImplementation::setDetectorPositionId(const int i){
|
||||
detID = i;
|
||||
FILE_LOG(logINFO) << "Detector Position Id:" << detID;
|
||||
for (unsigned int i = 0; i < dataProcessor.size(); ++i) {
|
||||
dataProcessor[i]->SetupFileWriter((int*)numDet, fileName, filePath, &fileIndex, &frameIndexEnable,
|
||||
dataProcessor[i]->SetupFileWriter((int*)numDet, fileName, filePath, &fileIndex,
|
||||
&overwriteEnable, &detID, &numThreads, &numberOfFrames, &dynamicRange, &udpPortNum[i], generalData);
|
||||
}
|
||||
}
|
||||
|
||||
@ -261,11 +261,9 @@ const char* slsReceiverTCPIPInterface::getFunctionName(enum recFuncs func) {
|
||||
case F_START_RECEIVER: return "F_START_RECEIVER";
|
||||
case F_STOP_RECEIVER: return "F_STOP_RECEIVER";
|
||||
case F_START_RECEIVER_READOUT: return "F_START_RECEIVER_READOUT";
|
||||
case F_READ_RECEIVER_FRAME: return "F_READ_RECEIVER_FRAME";
|
||||
case F_SET_RECEIVER_FILE_PATH: return "F_SET_RECEIVER_FILE_PATH";
|
||||
case F_SET_RECEIVER_FILE_NAME: return "F_SET_RECEIVER_FILE_NAME";
|
||||
case F_SET_RECEIVER_FILE_INDEX: return "F_SET_RECEIVER_FILE_INDEX";
|
||||
case F_SET_RECEIVER_FRAME_INDEX: return "F_SET_RECEIVER_FRAME_INDEX";
|
||||
case F_GET_RECEIVER_FRAME_INDEX: return "F_GET_RECEIVER_FRAME_INDEX";
|
||||
case F_GET_RECEIVER_FRAMES_CAUGHT: return "F_GET_RECEIVER_FRAMES_CAUGHT";
|
||||
case F_RESET_RECEIVER_FRAMES_CAUGHT:return "F_RESET_RECEIVER_FRAMES_CAUGHT";
|
||||
@ -308,11 +306,9 @@ int slsReceiverTCPIPInterface::function_table(){
|
||||
flist[F_START_RECEIVER] = &slsReceiverTCPIPInterface::start_receiver;
|
||||
flist[F_STOP_RECEIVER] = &slsReceiverTCPIPInterface::stop_receiver;
|
||||
flist[F_START_RECEIVER_READOUT] = &slsReceiverTCPIPInterface::start_readout;
|
||||
flist[F_READ_RECEIVER_FRAME] = &slsReceiverTCPIPInterface::read_frame;
|
||||
flist[F_SET_RECEIVER_FILE_PATH] = &slsReceiverTCPIPInterface::set_file_dir;
|
||||
flist[F_SET_RECEIVER_FILE_NAME] = &slsReceiverTCPIPInterface::set_file_name;
|
||||
flist[F_SET_RECEIVER_FILE_INDEX] = &slsReceiverTCPIPInterface::set_file_index;
|
||||
flist[F_SET_RECEIVER_FRAME_INDEX] = &slsReceiverTCPIPInterface::set_frame_index;
|
||||
flist[F_GET_RECEIVER_FRAME_INDEX] = &slsReceiverTCPIPInterface::get_frame_index;
|
||||
flist[F_GET_RECEIVER_FRAMES_CAUGHT] = &slsReceiverTCPIPInterface::get_frames_caught;
|
||||
flist[F_RESET_RECEIVER_FRAMES_CAUGHT] = &slsReceiverTCPIPInterface::reset_frames_caught;
|
||||
@ -1374,26 +1370,6 @@ int slsReceiverTCPIPInterface::start_readout(){
|
||||
|
||||
|
||||
|
||||
int slsReceiverTCPIPInterface::read_frame(){
|
||||
ret=FAIL;
|
||||
memset(mess, 0, sizeof(mess));
|
||||
int n = 0;
|
||||
// to receive any arguments
|
||||
while (n > 0)
|
||||
n = mySock->ReceiveDataOnly(mess,MAX_STR_LENGTH);
|
||||
|
||||
sprintf(mess,"This function (%s) is not implemented anymore\n", getFunctionName((enum recFuncs)fnum));
|
||||
FILE_LOG(logERROR) << mess;
|
||||
|
||||
// send ok / fail
|
||||
mySock->SendDataOnly(&ret,sizeof(ret));
|
||||
// send return argument
|
||||
mySock->SendDataOnly(mess,sizeof(mess));
|
||||
// return ok / fail
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int slsReceiverTCPIPInterface::set_file_dir() {
|
||||
ret = OK;
|
||||
@ -1572,62 +1548,6 @@ int slsReceiverTCPIPInterface::set_file_index() {
|
||||
|
||||
|
||||
|
||||
int slsReceiverTCPIPInterface::set_frame_index() {
|
||||
ret = OK;
|
||||
memset(mess, 0, sizeof(mess));
|
||||
int index = -1;
|
||||
int retval = -1;
|
||||
|
||||
strcpy(mess,"Could not set frame index\n");
|
||||
// receive arguments
|
||||
if (mySock->ReceiveDataOnly(&index,sizeof(index)) < 0 )
|
||||
return printSocketReadError();
|
||||
|
||||
// execute action
|
||||
// only a set, not a get
|
||||
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
|
||||
if (receiverBase == NULL)
|
||||
invalidReceiverObject();
|
||||
else if (mySock->differentClients && lockStatus)
|
||||
receiverlocked();
|
||||
else if (receiverBase->getStatus() != IDLE)
|
||||
receiverNotIdle();
|
||||
else{
|
||||
//client sets to 0, but for receiver it is just an enable
|
||||
//client uses this value for other detectors not using receiver,
|
||||
//so implement the interface here
|
||||
|
||||
switch(index){
|
||||
case -1: index=0; break;
|
||||
default: index=1; break; //value is 0
|
||||
}
|
||||
receiverBase->setFrameIndexEnable(index);
|
||||
retval=receiverBase->getFrameIndexEnable();
|
||||
switch(retval){
|
||||
case 0: retval=-1; break;
|
||||
case 1: retval=0; break;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef VERYVERBOSE
|
||||
FILE_LOG(logDEBUG1) << "frame index:" << retval;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
if (ret == OK && mySock->differentClients)
|
||||
ret = FORCE_UPDATE;
|
||||
|
||||
// send answer
|
||||
mySock->SendDataOnly(&ret,sizeof(ret));
|
||||
if (ret == FAIL)
|
||||
mySock->SendDataOnly(mess,sizeof(mess));
|
||||
mySock->SendDataOnly(&retval,sizeof(retval));
|
||||
|
||||
// return ok/fail
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
int slsReceiverTCPIPInterface::get_frame_index(){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user