Commit dca8f635 authored by Dainius Simelevicius's avatar Dainius Simelevicius
Browse files

references #265: moving interface/bril package to interface/bril/shared

parent fb692400
variables:
EXTERN_PACKAGES: "extern/oracle extern/dim extern/smi extern/yui extern/caen/a2818 extern/caen/a3818 extern/caen/CAENUSBdrvB extern/caen/caenvmelib extern/caen/caencomm extern/caen/caenbridgeupgrade extern/caen/caenupgrader"
WORKSUITE_PACKAGES: "xdaq2rc interface/evb interface/shared interface/bril evb jobcontrol xpci/drv xpci hal/generic hal/utilities hal/busAdapter/dummy hal/busAdapter/caen hal/busAdapter/pci hal/PyHAL pheaps/drv/cmem_rcc pheaps jal/jtagChain jal/jtagController jal/jtagSVFSequencer ttc/utils ttc/monitoring ttc/ltc ttc/ttcci tts/ttsbase tts/atts tts/cpcibase tts/fmmtd tts/ipcutils tts/fmm tts/fmmcontroller tts/fmmdbi tts/fmmtester d2s/utils d2s/fedemulator d2s/gtpe d2s/gtpecontroller d2s/firmwareloader fedstreamer fedkit ferol ferol40 psx/sapi psx/mapi psx psx/watchdog sentinel sentinel/utils sentinel/probe sentinel/sentineld sentinel/tester sentinel/bridge2g sentinel/spotlight2g sentinel/spotlightocci sentinel/arc/utils sentinel/arc tstore/utils tstore/client tstore tstore/api xmas/admin xmas/heartbeat xmas/heartbeat/probe xmas/heartbeat/heartbeatd xmas/utils xmas/sensord xmas/probe xmas/tester xmas/bridge2g xmas/slash2g xmas/store2g xmas/smarthub ibvla pt/udapl pt/ibv gevb2g es/api es/xtreme es/xbeat elastic/api elastic/timestream amc13controller dipbridge oms"
WORKSUITE_PACKAGES: "xdaq2rc interface/evb interface/shared interface/bril/shared evb jobcontrol xpci/drv xpci hal/generic hal/utilities hal/busAdapter/dummy hal/busAdapter/caen hal/busAdapter/pci hal/PyHAL pheaps/drv/cmem_rcc pheaps jal/jtagChain jal/jtagController jal/jtagSVFSequencer ttc/utils ttc/monitoring ttc/ltc ttc/ttcci tts/ttsbase tts/atts tts/cpcibase tts/fmmtd tts/ipcutils tts/fmm tts/fmmcontroller tts/fmmdbi tts/fmmtester d2s/utils d2s/fedemulator d2s/gtpe d2s/gtpecontroller d2s/firmwareloader fedstreamer fedkit ferol ferol40 psx/sapi psx/mapi psx psx/watchdog sentinel sentinel/utils sentinel/probe sentinel/sentineld sentinel/tester sentinel/bridge2g sentinel/spotlight2g sentinel/spotlightocci sentinel/arc/utils sentinel/arc tstore/utils tstore/client tstore tstore/api xmas/admin xmas/heartbeat xmas/heartbeat/probe xmas/heartbeat/heartbeatd xmas/utils xmas/sensord xmas/probe xmas/tester xmas/bridge2g xmas/slash2g xmas/store2g xmas/smarthub ibvla pt/udapl pt/ibv gevb2g es/api es/xtreme es/xbeat elastic/api elastic/timestream amc13controller dipbridge oms"
RPM_REPO_DIR: "/tmp/$CI_PROJECT_NAME/$CI_JOB_NAME/repo"
DOCKER_IMAGE: "gitlab-registry.cern.ch/cmsos/docker/docker-image-cmsos-15-cc7-x86_64-worksuite:3.4.0.0"
ARTIFACT_PREREQUISITE_DIR: "$CI_PROJECT_DIR/prerequisites/"
......@@ -154,7 +154,7 @@ interface/shared:
before_script:
<<: *build_package_definition
interface/bril:
interface/bril/shared:
before_script:
<<: *build_package_definition
......@@ -228,7 +228,7 @@ dipbridge:
oms:
before_script:
- export DEPENDENCY_LIST="interface/bril"
- export DEPENDENCY_LIST="interface/bril/shared"
<<: *build_package_definition
d2s/fedemulator:
......@@ -520,7 +520,7 @@ deploy:
- xdaq2rc
- interface/evb
- interface/shared
- interface/bril
- interface/bril/shared
- evb
- jobcontrol
- xpci/drv
......@@ -642,7 +642,7 @@ git:
- xdaq2rc
- interface/evb
- interface/shared
- interface/bril
- interface/bril/shared
- evb
- jobcontrol
- xpci/drv
......@@ -770,7 +770,7 @@ yum:
- xdaq2rc
- interface/evb
- interface/shared
- interface/bril
- interface/bril/shared
- evb
- jobcontrol
- xpci/drv
......
......@@ -34,7 +34,7 @@ PACKAGES= \
xdaq2rc \
interface/evb \
interface/shared \
interface/bril \
interface/bril/shared \
evb \
jobcontrol \
xpci/drv \
......
#ifndef _interface_bril_Utils_h
#define _interface_bril_Utils_h
#include <vector>
#include <string>
namespace interface{ namespace bril{ namespace Utils{
static std::vector<std::string> splitstring(const std::string& input, char separator = ' '){
const char* str=input.c_str();
std::vector<std::string> result;
do{
const char* begin = str;
while(*str != separator && *str){
str++;
}
result.push_back(std::string(begin,str));
} while (0 != *str++);
return result;
}
}}}
#endif
BUILD_HOME:=$(shell pwd)/../..
BUILD_HOME:=$(shell pwd)/../../..
BUILD_SUPPORT=build
PROJECT_NAME=worksuite
......@@ -8,8 +8,8 @@ include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/mfDefs.$(XDAQ_OS)
include $(BUILD_HOME)/mfDefs.$(PROJECT_NAME)
Project=$(PROJECT_NAME)
Package=interface/bril
PackageName=interfacebril
Package=interface/bril/shared
PackageName=interfacebrilshared
Sources=version.cc
IncludeDirs=$(CONFIG_INCLUDE_PREFIX)
......@@ -17,7 +17,7 @@ IncludeDirs=$(CONFIG_INCLUDE_PREFIX)
#
# Compile the source files and create a shared library
#
DynamicLibrary=interfacebril
DynamicLibrary=interfacebrilshared
include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/Makefile.rules
include $(XDAQ_ROOT)/$(BUILD_SUPPORT)/mfRPM.rules
#ifndef _interface_bril_CommonDataFormat_h_
#define _interface_bril_CommonDataFormat_h_
#ifndef _interface_bril_shared_CommonDataFormat_h_
#define _interface_bril_shared_CommonDataFormat_h_
#include <string>
#include "interface/bril/CompoundDataStreamer.h"
#include "interface/bril/shared/CompoundDataStreamer.h"
#define STRINGIZE_NX(z) #z
#define STRINGIZE(z) STRINGIZE_NX(z)
......@@ -10,9 +10,12 @@
#define PPCAT(A,B) PPCAT_NX(A,B)
#define PPCAT_DOT(A,B) PPCAT(PPCAT(A,.),B)
namespace interface{ namespace bril{
namespace interface{
namespace bril{
namespace shared{
//static const std::string DATA_VERSION = STRINGIZE( PPCAT_DOT(INTERFACEBRIL_VERSION_MAJOR,INTERFACEBRIL_VERSION_MINOR) );
//required common property for bril data "DATA_VERSION" to compare with interface::bril::DATA_VERSION
//required common property for bril data "DATA_VERSION" to compare with interface::bril::shared::DATA_VERSION
static const std::string DATA_VERSION = "1.1";
const unsigned int MAX_NUM_LOOKUPITEMS = 26;
......@@ -87,10 +90,10 @@ DEFINE_LOOKUPTABLE(StorageType,StorageType_ENUM)
inline unsigned int payloadsize() const{ return (totsize>sizeof(DatumHead)) ? (totsize-sizeof(DatumHead)):0;}
inline unsigned int nitems() const{
unsigned int id=getStorageTypeID();
if(id==bril::StorageType::UINT16 || id==bril::StorageType::INT16) return (unsigned int)payloadsize()/2;
if(id==bril::StorageType::UINT32 || id==bril::StorageType::INT32 || id==bril::StorageType::FLOAT) return (unsigned int)payloadsize()/4;
if(id==bril::StorageType::UINT64 || id==bril::StorageType::INT64 || id==bril::StorageType::DOUBLE) return (unsigned int)payloadsize()/8;
if(id==bril::StorageType::COMPOUND) return 1;
if(id==bril::shared::StorageType::UINT16 || id==bril::shared::StorageType::INT16) return (unsigned int)payloadsize()/2;
if(id==bril::shared::StorageType::UINT32 || id==bril::shared::StorageType::INT32 || id==bril::shared::StorageType::FLOAT) return (unsigned int)payloadsize()/4;
if(id==bril::shared::StorageType::UINT64 || id==bril::shared::StorageType::INT64 || id==bril::shared::StorageType::DOUBLE) return (unsigned int)payloadsize()/8;
if(id==bril::shared::StorageType::COMPOUND) return 1;
return 0;
}
inline DatumHead& head(){return const_cast<DatumHead&>(static_cast<DatumHead&>(*this));}
......@@ -125,15 +128,15 @@ DEFINE_LOOKUPTABLE(StorageType,StorageType_ENUM)
};//Datum
#define DECLARE_DATUM(Xname) typedef interface::bril::Datum<Xname> Xname##T
#define DEF_TOPICNAME(x) template<> inline std::string interface::bril::Datum<x>::topicname(){ return STRINGIZE(x); }
#define DEF_PAYLOADDICT(x,pd) template<> inline std::string interface::bril::Datum<x>::payloaddict(){ return pd; }
#define DEF_N(x,z) template<> inline size_t interface::bril::Datum<x>::n(){ return z; }
#define DECLARE_DATUM(Xname) typedef interface::bril::shared::Datum<Xname> Xname##T
#define DEF_TOPICNAME(x) template<> inline std::string interface::bril::shared::Datum<x>::topicname(){ return STRINGIZE(x); }
#define DEF_PAYLOADDICT(x,pd) template<> inline std::string interface::bril::shared::Datum<x>::payloaddict(){ return pd; }
#define DEF_N(x,z) template<> inline size_t interface::bril::shared::Datum<x>::n(){ return z; }
#define DEF_SIMPLE_MAXSIZE(x,y,z) template<> inline size_t Datum<x>::maxsize(){ return sizeof(y)*(z)+sizeof(DatumHead); }
#define DEF_COMPOUND_MAXSIZE(x,y) template<> inline size_t Datum<x>::maxsize(){ interface::bril::CompoundDataStreamer c(y); return c.datasize()+sizeof(DatumHead); }
#define DEF_ALGOS(x,a) template<> inline const interface::bril::LookupItem* interface::bril::Datum<x>::algo_lookuptable(){return a;}
#define DEF_DESCRIPTION(x,d) template<> inline std::string interface::bril::Datum<x>::description(){ return d; }
#define DEF_UNIT(x,u) template<> inline std::string interface::bril::Datum<x>::unit(){ return u; }
#define DEF_COMPOUND_MAXSIZE(x,y) template<> inline size_t Datum<x>::maxsize(){ interface::bril::shared::CompoundDataStreamer c(y); return c.datasize()+sizeof(DatumHead); }
#define DEF_ALGOS(x,a) template<> inline const interface::bril::shared::LookupItem* interface::bril::shared::Datum<x>::algo_lookuptable(){return a;}
#define DEF_DESCRIPTION(x,d) template<> inline std::string interface::bril::shared::Datum<x>::description(){ return d; }
#define DEF_UNIT(x,u) template<> inline std::string interface::bril::shared::Datum<x>::unit(){ return u; }
#define DEFINE_COMPOUND_TOPIC(Xname,Xpdict,Xdesc,Xunit) struct Xname{}; \
DECLARE_DATUM(Xname); \
......@@ -188,8 +191,9 @@ static inline std::string NameById(const LookupItem* lookuptable, unsigned int i
index++;
}
return "";
}
}//ns interface
}//ns bril
}
}//ns shared
}//ns bril
}//ns interface
#endif
#ifndef _interface_bril_CompoundDataStreamer_h
#define _interface_bril_CompoundDataStreamer_h
#ifndef _interface_bril_shared_CompoundDataStreamer_h
#define _interface_bril_shared_CompoundDataStreamer_h
#include <string.h>
#include <string>
#include <vector>
#include <stdexcept>
#include <cstdlib>
#include <iostream>
#include "interface/bril/Utils.h"
namespace interface{ namespace bril{
#include "interface/bril/shared/Utils.h"
namespace interface{
namespace bril{
namespace shared{
class CompoundDataStreamer{
public:
......@@ -108,5 +111,5 @@ private:
std::vector<Column> m_columns;
};
}}
}}}
#endif
#ifndef _interface_bril_LUMITopics_hh_
#define _interface_bril_LUMITopics_hh_
#include "interface/bril/CommonDataFormat.h"
namespace interface{ namespace bril{
#ifndef _interface_bril_shared_LUMITopics_hh_
#define _interface_bril_shared_LUMITopics_hh_
#include "interface/bril/shared/CommonDataFormat.h"
namespace interface{
namespace bril{
namespace shared{
DEFINE_COMPOUND_TOPIC(bestlumi,"provider:str8:1 calibtag:str32:1 delivered:float:1 recorded:float:1 avgpu:float:1 bxdelivered:float:3564","best instantaneous luminosity","Hz/ub");
......@@ -9,6 +11,6 @@ namespace interface{ namespace bril{
DEFINE_COMPOUND_TOPIC(dtlumi,"calibtag:str32:1 avgraw:float:1 avg:float:1","instantaneous luminosity", "Hz/ub");
}}//ns interface/bril
}}}//ns interface/bril/shared
#endif
#ifndef _interface_bril_shared_Utils_h
#define _interface_bril_shared_Utils_h
#include <vector>
#include <string>
namespace interface
{
namespace bril
{
namespace shared
{
namespace Utils
{
static std::vector<std::string> splitstring(const std::string& input, char separator = ' ')
{
const char* str=input.c_str();
std::vector<std::string> result;
do
{
const char* begin = str;
while(*str != separator && *str)
{
str++;
}
result.push_back(std::string(begin,str));
} while (0 != *str++);
return result;
}
}
}
}
}
#endif
#ifndef _interface_bril_version_h_
#define _interface_bril_version_h_
#include "interface/bril/CommonDataFormat.h"
#ifndef _interface_bril_shared_version_h_
#define _interface_bril_shared_version_h_
#include "config/PackageInfo.h"
// !!! Edit this line to reflect the latest package version !!!
// version definition moved to DataFormat.h to synchronize rpm and dataversion numbers
#define BRIL_INTERFACEBRIL_VERSION_MAJOR 3
#define BRIL_INTERFACEBRIL_VERSION_MINOR 1
#define BRIL_INTERFACEBRIL_VERSION_PATCH 0
#define BRIL_INTERFACEBRILSHARED_VERSION_MAJOR 3
#define BRIL_INTERFACEBRILSHARED_VERSION_MINOR 1
#define BRIL_INTERFACEBRILSHARED_VERSION_PATCH 0
// If any previous versions available E.g. #define INTERFACEBRIL_PREVIOUS_VERSIONS "3.8.0,3.8.1"
#undef BRIL_INTERFACEBRIL_PREVIOUS_VERSIONS
#undef BRIL_INTERFACEBRILSHARED_PREVIOUS_VERSIONS
//
// Template macros
//
#define BRIL_INTERFACEBRIL_VERSION_CODE PACKAGE_VERSION_CODE(BRIL_INTERFACEBRIL_VERSION_MAJOR,BRIL_INTERFACEBRIL_VERSION_MINOR,BRIL_INTERFACEBRIL_VERSION_PATCH)
#ifndef BRIL_INTERFACEBRIL_PREVIOUS_VERSIONS
#define BRIL_INTERFACEBRIL_FULL_VERSION_LIST PACKAGE_VERSION_STRING(BRIL_INTERFACEBRIL_VERSION_MAJOR,BRIL_INTERFACEBRIL_VERSION_MINOR,BRIL_INTERFACEBRIL_VERSION_PATCH)
#define BRIL_INTERFACEBRILSHARED_VERSION_CODE PACKAGE_VERSION_CODE(BRIL_INTERFACEBRILSHARED_VERSION_MAJOR,BRIL_INTERFACEBRILSHARED_VERSION_MINOR,BRIL_INTERFACEBRILSHARED_VERSION_PATCH)
#ifndef BRIL_INTERFACEBRILSHARED_PREVIOUS_VERSIONS
#define BRIL_INTERFACEBRILSHARED_FULL_VERSION_LIST PACKAGE_VERSION_STRING(BRIL_INTERFACEBRILSHARED_VERSION_MAJOR,BRIL_INTERFACEBRILSHARED_VERSION_MINOR,BRIL_INTERFACEBRILSHARED_VERSION_PATCH)
#else
#define BRIL_INTERFACEBRIL_FULL_VERSION_LIST BRIL_INTERFACEBRIL_PREVIOUS_VERSIONS "," PACKAGE_VERSION_STRING(BRIL_INTERFACEBRIL_VERSION_MAJOR,BRIL_INTERFACEBRIL_VERSION_MINOR,BRIL_INTERFACEBRIL_VERSION_PATCH)
#define BRIL_INTERFACEBRILSHARED_FULL_VERSION_LIST BRIL_INTERFACEBRILSHARED_PREVIOUS_VERSIONS "," PACKAGE_VERSION_STRING(BRIL_INTERFACEBRILSHARED_VERSION_MAJOR,BRIL_INTERFACEBRILSHARED_VERSION_MINOR,BRIL_INTERFACEBRILSHARED_VERSION_PATCH)
#endif
namespace interfacebril
namespace interfacebrilshared
{
const std::string project = "bril";
const std::string package = "interfacebril";
const std::string versions = BRIL_INTERFACEBRIL_FULL_VERSION_LIST;
const std::string package = "interfacebrilshared";
const std::string versions = BRIL_INTERFACEBRILSHARED_FULL_VERSION_LIST;
const std::string summary = "Header files shared with bril eventing publisher/subscriber and other common data headers";
const std::string description = "Header files are required for bril eventing publisher/subscriber";
const std::string authors = "Zhen Xie";
......
#include "interface/bril/shared/version.h"
#include "config/version.h"
GETPACKAGEINFO(interfacebrilshared)
void interfacebrilshared::checkPackageDependencies() {
CHECKDEPENDENCY(config);
}
std::set<std::string, std::less<std::string> > interfacebrilshared::getPackageDependencies()
{
std::set<std::string, std::less<std::string> > dependencies;
ADDDEPENDENCY(dependencies,config);
return dependencies;
}
#include "interface/bril/version.h"
#include "config/version.h"
GETPACKAGEINFO(interfacebril)
void interfacebril::checkPackageDependencies() {
CHECKDEPENDENCY(config);
}
std::set<std::string, std::less<std::string> > interfacebril::getPackageDependencies(){
std::set<std::string, std::less<std::string> > dependencies;
ADDDEPENDENCY(dependencies,config);
return dependencies;
}
......@@ -89,11 +89,11 @@ endif
INTERFACE_SHARED_INCLUDE_PREFIX=$(INTERFACE_SHARED_PREFIX)/include $(INTERFACE_SHARED_PREFIX)/include/$(XDAQ_OS)
INTERFACE_SHARED_LIB_PREFIX=$(INTERFACE_SHARED_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
ifndef INTERFACE_BRIL_PREFIX
INTERFACE_BRIL_PREFIX=$(BUILD_HOME)/interface/bril
ifndef INTERFACE_BRIL_SHARED_PREFIX
INTERFACE_BRIL_SHARED_PREFIX=$(BUILD_HOME)/interface/bril/shared
endif
INTERFACE_BRIL_INCLUDE_PREFIX=$(INTERFACE_BRIL_PREFIX)/include $(INTERFACE_BRIL_PREFIX)/include/$(XDAQ_OS)
INTERFACE_BRIL_LIB_PREFIX=$(INTERFACE_BRIL_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
INTERFACE_BRIL_SHARED_INCLUDE_PREFIX=$(INTERFACE_BRIL_SHARED_PREFIX)/include $(INTERFACE_BRIL_SHARED_PREFIX)/include/$(XDAQ_OS)
INTERFACE_BRIL_SHARED_LIB_PREFIX=$(INTERFACE_BRIL_SHARED_PREFIX)/lib/$(XDAQ_OS)/$(XDAQ_PLATFORM)
ifndef INTERFACE_DFC_PREFIX
INTERFACE_DFC_PREFIX=$(BUILD_HOME)/interface/dfc
......
......@@ -28,7 +28,7 @@
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.1927758137" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/oms/include}&quot;"/>
<listOptionValue builtIn="false" value="/opt/xdaq/include"/>
<listOptionValue builtIn="false" value="/home/xdaq/worksuite/interface/bril/include"/>
<listOptionValue builtIn="false" value="/home/xdaq/worksuite/interface/bril/shared/include"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1100582465" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
......@@ -80,4 +80,4 @@
</target>
</buildTargets>
</storageModule>
</cproject>
\ No newline at end of file
</cproject>
......@@ -57,7 +57,7 @@ IncludeDirs = \
$(XDATA_INCLUDE_PREFIX) \
$(XOAP_INCLUDE_PREFIX) \
$(XGI_INCLUDE_PREFIX) \
$(INTERFACE_BRIL_INCLUDE_PREFIX) \
$(INTERFACE_BRIL_SHARED_INCLUDE_PREFIX) \
/usr/include/boost169/
TestDynamicLibrary = omstest
......@@ -117,9 +117,9 @@ TestLibraryDirs = \
$(XOAP_LIB_PREFIX) \
/usr/lib64/boost169
DependentLibraryDirs=$(INTERFACE_BRIL_LIB_PREFIX)
DependentLibraryDirs=$(INTERFACE_BRIL_SHARED_LIB_PREFIX)
DependentLibraries=interfacebril
DependentLibraries=interfacebrilshared
#
# Compile the source files and create a shared library
......
......@@ -4,9 +4,9 @@
#include "config/PackageInfo.h"
#define WORKSUITE_OMS_VERSION_MAJOR 1
#define WORKSUITE_OMS_VERSION_MINOR 1
#define WORKSUITE_OMS_VERSION_PATCH 2
#define WORKSUITE_OMS_PREVIOUS_VERSIONS "1.0.0,1.0.1,1.0.2,1.0.3,1.1.0,1.1.1"
#define WORKSUITE_OMS_VERSION_MINOR 2
#define WORKSUITE_OMS_VERSION_PATCH 0
#define WORKSUITE_OMS_PREVIOUS_VERSIONS "1.0.0,1.0.1,1.0.2,1.0.3,1.1.0,1.1.1,1.1.2"
#define WORKSUITE_OMS_VERSION_CODE PACKAGE_VERSION_CODE(WORKSUITE_OMS_VERSION_MAJOR,WORKSUITE_OMS_VERSION_MINOR,WORKSUITE_OMS_VERSION_PATCH)
#ifndef WORKSUITE_OMS_PREVIOUS_VERSIONS
......
......@@ -2,9 +2,9 @@
#include <ctime>
#include <string>
#include "interface/bril/CommonDataFormat.h"
#include "interface/bril/CompoundDataStreamer.h"
#include "interface/bril/LUMITopics.hh"
#include "interface/bril/shared/CommonDataFormat.h"
#include "interface/bril/shared/CompoundDataStreamer.h"
#include "interface/bril/shared/LUMITopics.hh"
#include "b2in/nub/Method.h"
#include "xcept/tools.h"
......@@ -120,17 +120,17 @@ void oms::EventingLogger::subscribeToBRILeventing()
{
try
{
getEventingBus(configuration_.eventingBus()).subscribe(interface::bril::bestlumiT::topicname());
getEventingBus(configuration_.eventingBus()).subscribe(interface::bril::shared::bestlumiT::topicname());
std::ostringstream msg;
msg << "Subscribed to topic '" << interface::bril::bestlumiT::topicname()
msg << "Subscribed to topic '" << interface::bril::shared::bestlumiT::topicname()
<< "' on eventing bus '" << configuration_.eventingBus() << "'";
LOG4CPLUS_INFO(getApplicationLogger(), msg.str());
}
catch (eventing::api::exception::Exception& e)
{
std::ostringstream msg;
msg << "Failed to subscribe to topic '" << interface::bril::bestlumiT::topicname()
msg << "Failed to subscribe to topic '" << interface::bril::shared::bestlumiT::topicname()
<< "' on eventing bus '" << configuration_.eventingBus() << "'";
LOG4CPLUS_ERROR(getApplicationLogger(), msg.str() << ": " << xcept::stdformat_exception_history(e));
XCEPT_RETHROW(exception::Eventing, msg.str(), e);
......@@ -164,7 +164,7 @@ void oms::EventingLogger::onMessage(toolbox::mem::Reference* reference, xdata::P
"Failed to deserialize incoming TCDS table: " << xcept::stdformat_exception_history(e));
}
}
else if ( topic == interface::bril::bestlumiT::topicname() )
else if ( topic == interface::bril::shared::bestlumiT::topicname() )
{
try
{
......@@ -433,8 +433,8 @@ oms::BestLumiRecordPtr oms::EventingLogger::parseBestLumiRecord(const toolbox::m
{
BestLumiRecordPtr bestLumiRecord = std::make_unique<BestLumiRecord>();
interface::bril::DatumHead* thead = (interface::bril::DatumHead*)(ref->getDataLocation());
interface::bril::CompoundDataStreamer tc(interface::bril::bestlumiT::payloaddict());
interface::bril::shared::DatumHead* thead = (interface::bril::shared::DatumHead*)(ref->getDataLocation());
interface::bril::shared::CompoundDataStreamer tc(interface::bril::shared::bestlumiT::payloaddict());
bestLumiRecord->fill = thead->fillnum;
bestLumiRecord->run = thead->runnum;
......
......@@ -29,8 +29,8 @@
<packagereq type="mandatory">cmsos-worksuite-interfaceevb-devel</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfaceshared</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfaceshared-devel</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfacebril</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfacebril-devel</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfacebrilshared</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfacebrilshared-devel</packagereq>
<packagereq type="mandatory">cmsos-worksuite-evb</packagereq>
<packagereq type="mandatory">cmsos-worksuite-evb-devel</packagereq>
<packagereq type="mandatory">cmsos-worksuite-xdaq2rc</packagereq>
......@@ -217,7 +217,7 @@
<packagereq type="mandatory">cmsos-worksuite-jobcontrol-debuginfo</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfaceevb-debuginfo</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfaceshared-debuginfo</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfacebril-debuginfo</packagereq>
<packagereq type="mandatory">cmsos-worksuite-interfacebrilshared-debuginfo</packagereq>
<packagereq type="mandatory">cmsos-worksuite-evb-debuginfo</packagereq>
<packagereq type="mandatory">cmsos-worksuite-xdaq2rc-debuginfo</packagereq>
<packagereq type="mandatory">cmsos-worksuite-oracle-debuginfo</packagereq>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment