cafe/cpp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.20.1

Browse Source
This commit is contained in:
chrin
2024-07-04 11:47:27 +02:00
parent 7b517f2fa6
commit df07cf1a29
19 changed files with 409 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/config.h
View File

@@ -57,7 +57,7 @@
/* #undef HAVE_LIBLZ4 */
/* Define to 1 if you have the `python3.10' library (-lpython3.10). */
#define HAVE_LIBPYTHON3_10 1
/* #undef HAVE_LIBPYTHON3_10 */
/* Define to 1 if you have the `python3.4m' library (-lpython3.4m). */
/* #undef HAVE_LIBPYTHON3_4M */
@@ -72,16 +72,16 @@
/* #undef HAVE_LIBPYTHON3_8 */
/* Define to 1 if you have the `Qt5Core' library (-lQt5Core). */
/* #undef HAVE_LIBQT5CORE */
#define HAVE_LIBQT5CORE 1
/* Define to 1 if you have the `Qt5Xml' library (-lQt5Xml). */
/* #undef HAVE_LIBQT5XML */
#define HAVE_LIBQT5XML 1
/* Define to 1 if you have the `QtCore' library (-lQtCore). */
/* #undef HAVE_LIBQTCORE */
/* Availability of Qt version 5 confirmed */
/* #undef HAVE_LIBQTXML */
#define HAVE_LIBQTXML 1
/* Define to 1 if you have the `zmq' library (-lzmq). */
/* #undef HAVE_LIBZMQ */
@@ -102,19 +102,19 @@
#define HAVE_MULTI_INDEX_CONTAINER_HPP 1
/* pycafe extern C */
#define HAVE_PYCAFE_EXT 1
/* #undef HAVE_PYCAFE_EXT */
/* Availability of python */
#define HAVE_PYTHON 1
/* #undef HAVE_PYTHON */
/* Define to 1 if you have the <Python.h> header file. */
#define HAVE_PYTHON_H 1
/* #undef HAVE_PYTHON_H */
/* Availability of Qt version 5 confirmed */
/* #undef HAVE_QT */
#define HAVE_QT 1
/* Define to 1 if you have the <qxml.h> header file. */
/* #undef HAVE_QXML_H */
#define HAVE_QXML_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
@@ -156,7 +156,7 @@
#define PACKAGE_NAME "CAFE"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "CAFE 1.19.3"
#define PACKAGE_STRING "CAFE 1.20.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "cafe"
@@ -165,13 +165,13 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "1.19.3"
#define PACKAGE_VERSION "1.20.1"
/* Availability of Qt version 5 confirmed */
/* #undef QT_NO_VERSION_TAGGING */
#define QT_NO_VERSION_TAGGING 1
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "1.19.3"
#define VERSION "1.20.1"

7
include/connect.h
View File

@@ -694,10 +694,15 @@ public:
{
cafeConduit_set_by_handle & handle_index=cs.get<by_handle>();
cafeConduit_set_by_handle::iterator it_handle;
it_handle = handle_index.find(handle);
if (it_handle != handle_index.end())
{
return (*it_handle).isConnected();
//cafeMutex.lock();
bool isConnected = (*it_handle).isConnected();
//cafeMutex.unlock();
return isConnected;
}
else
{

8
include/global.h
View File

@@ -9,14 +9,14 @@
#ifndef GLOBAL_H
#define GLOBAL_H
#include <epicsTime.h>
#include <epicsMutex.h>
#include <cadef.h>
//include <epicsTime.h>
//include <epicsMutex.h>
//#include <cadef.h>
#include <hashConduit.h>
#include <hashConduitGroup.h>
#include <PVGroup.h>
#include <deviceCollection.h>
#include <enumStrings.h>
//#include <enumStrings.h>
extern bool CHECK_CONSISTENCY_CA_STATE;
extern bool MUTEX;

34
include/makefile
View File

@@ -96,8 +96,8 @@ host_triplet = x86_64-pc-linux-gnu
#if HAVE_PYTHON_
#include_HEADERS += PyCafe_api.h
#endif
am__append_2 = PyCafe.h
#am__append_3 = PyCafe_api.h
#am__append_2 = PyCafe.h
am__append_3 = PyCafe_api.h
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -199,22 +199,22 @@ am__DIST_COMMON = $(srcdir)/makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing aclocal-1.16
AMTAR = $${TAR-tar}
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.7/latest/include/qt -I/opt/gfa/python-3.7/latest/include/qt/QtCore -I/opt/gfa/python-3.7/latest/include/qt/QtXml
AM_DEFAULT_VERBOSITY = 1
AM_LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib
AM_LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib -Wl,-rpath,/opt/gfa/python-3.7/latest/lib
AR = ar
AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoconf
AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing autoheader
AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/missing automake-1.16
AWK = gawk
CAFE_CPPFLAGS = -I$(top_srcdir)/include
CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
CPP = /opt/psi/Programming/gcc/7.5.0/bin/gcc -E
CPPFLAGS = -fexceptions -fPIC -std=c++1z -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.10/latest/include/python3.10 -I/opt/gfa/python-3.10/latest/lib/python3.10/site-packages/numpy/core/include
CXX = /opt/psi/Programming/gcc/7.5.0/bin/g++
CXXCPP = /opt/psi/Programming/gcc/7.5.0/bin/g++ -E
CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.7/include/ -I/usr/local/epics/base-7.0.7/include/os/Linux -I/usr/local/epics/base-7.0.7/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include -I/opt/gfa/python-3.7/latest/include/qt -I/opt/gfa/python-3.7/latest/include/qt/QtCore -I/opt/gfa/python-3.7/latest/include/qt/QtXml
CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
@@ -236,9 +236,9 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /usr/bin/ld -m elf_x86_64
LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.10/latest/lib -Wl,-rpath,/opt/gfa/python-3.10/latest/lib
LDFLAGS = -L/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.7/lib/RHEL8-x86_64 -L/opt/gfa/python-3.7/latest/lib -Wl,-rpath,/opt/gfa/python-3.7/latest/lib
LIBOBJS =
LIBS = -lpython3.10
LIBS = -lQt5Xml -lQt5Core
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIPO =
LN_S = ln -s
@@ -256,23 +256,23 @@ OTOOL64 =
PACKAGE = cafe
PACKAGE_BUGREPORT = Bug reports to: jan.chrin@psi.ch
PACKAGE_NAME = CAFE
PACKAGE_STRING = CAFE 1.19.3
PACKAGE_STRING = CAFE 1.20.1
PACKAGE_TARNAME = cafe
PACKAGE_URL =
PACKAGE_VERSION = 1.19.3
PACKAGE_VERSION = 1.20.1
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
VERSION = 1.19.3
VERSION = 1.20.1
abs_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
abs_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/include
abs_top_builddir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
abs_top_srcdir = /afs/psi.ch/project/cafe/gitlab/CAFE/cpp
ac_ct_AR = ar
ac_ct_CC = /opt/psi/Programming/gcc/7.5.0/bin/gcc
ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
ac_ct_CXX =
ac_ct_DUMPBIN =
am__include = include
@@ -301,7 +301,7 @@ htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitlab/CAFE/cpp/install-sh
libdir = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0/lib/RHEL8-x86_64
libdir = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0/lib/RHEL8-x86_64
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
@@ -309,7 +309,7 @@ mandir = ${datarootdir}/man
mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include
pdfdir = ${docdir}
prefix = /opt/gfa/cafe/cpp/cafe-1.19.3-py310-gcc-7.5.0
prefix = /opt/gfa/cafe/cpp/cafe-1.20.1-gcc-10.4.0
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin