Skip to content
Snippets Groups Projects
Commit eda8ff6c authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

'Comply with ATLAS naming conventions.' (ByteStreamCnvSvcLegacy-00-00-06)

2016-08-11  scott snyder  <snyder@bnl.gov>

	* Tagging ByteStreamCnvSvcLegacy-00-00-06.
	* Comply with ATLAS naming conventions.
	* Tagging ByteStreamCnvSvcLegacy-00-00-05.
	* Fix #include directive.
	* Fix ChangeLog name.

2016-06-22 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Explicitly linking the library against boost_system with
	  CMake. Since tdaq-common pulls in that dependency.
	* Tagging as ByteStreamCnvSvcLegacy-00-00-04

2016-03-24 Andy Salnikov <salnikov@slac.stanford.edu>
	* Fix for compilation warning in v5_Guid.cxx
	* Tagging as ByteStreamCnvSvcLegacy-00-00-03

2016-03-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
	* Added a hand-written CMakeLists.txt file to the package that builds
	  it correctly in the CMake nightly.
...
(Long ChangeLog diff - truncated)


Former-commit-id: dcaa4395
parent c97d2f4d
No related merge requests found
......@@ -334,7 +334,7 @@ public:
int64_t m_latestPosition; // offset of the latest written event
EventStorage::DataWriterCallBack *mp_callBack; // pointer to call-back, for reporting file names
EventStorage::DataWriterCallBack *m_callBack; // pointer to call-back, for reporting file names
freeMetaDataStrings m_fmdStrings; // optional vector of strings, not written out if empty
......
2016-06-22 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Explicitly linking the library against boost_system with
CMake. Since tdaq-common pulls in that dependency.
* Tagging as ByteStreamCnvSvcLegacy-00-00-04
2016-03-24 Andy Salnikov <salnikov@slac.stanford.edu>
* Fix for compilation warning in v5_Guid.cxx
* Tagging as ByteStreamCnvSvcLegacy-00-00-03
2016-03-23 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
* Added a hand-written CMakeLists.txt file to the package that builds
it correctly in the CMake nightly.
* Removed the executable flag from all files of the package.
* Tagging as ByteStreamCnvSvcLegacy-00-00-02
2016-03-16 Jack Cranshaw <cranshaw@anl.gov>
* ByteStreamCnvSvcLegacy-00-00-01
* First version
......@@ -59,24 +59,24 @@ private:
};
offline_EventStorage_v5::DataBuffer::DataBuffer():
rep(new implementation())
m_rep(new implementation())
{}
offline_EventStorage_v5::DataBuffer::DataBuffer(const uint32_t& size):
rep(new implementation(size))
m_rep(new implementation(size))
{}
offline_EventStorage_v5::DataBuffer::~DataBuffer()
{ delete rep; }
{ delete m_rep; }
void offline_EventStorage_v5::DataBuffer::realloc(const uint32_t& newsize)
{ return rep->realloc(newsize); }
{ return m_rep->realloc(newsize); }
void offline_EventStorage_v5::DataBuffer::grow(const uint32_t& newsize)
{ return rep->grow(newsize); }
{ return m_rep->grow(newsize); }
void* offline_EventStorage_v5::DataBuffer::handle()
{ return rep->handle(); }
{ return m_rep->handle(); }
uint32_t offline_EventStorage_v5::DataBuffer::buffersize() const
{ return rep->buffersize(); }
{ return m_rep->buffersize(); }
......@@ -9,7 +9,7 @@
#define OFFLINE_EVENTSTORAGE_V5_DATABUFFER_H
#include <string>
#include <v5_ESCompression.h>
#include "v5_ESCompression.h"
namespace offline_EventStorage_v5 {
......@@ -30,7 +30,7 @@ namespace offline_EventStorage_v5 {
private:
class implementation;
implementation * rep;
implementation * m_rep;
DataBuffer(const DataBuffer& aBuf);
DataBuffer& operator= (const offline_EventStorage_v5::DataBuffer & aBuf);
......
......@@ -174,7 +174,7 @@ initDW(const string writingPath,
m_cFileOpen=false;
m_openFailed = false;
mp_callBack = NULL;
m_callBack = NULL;
m_fmdStrings = fmdStrings;
......@@ -471,9 +471,9 @@ DWError DataWriter::closeFile()
if(fileExists(nameFile(FINISHED)) && m_cFileOpen)
{
ERS_DEBUG(2,"Finished file "<<nameFile(FINISHED));
if(mp_callBack != NULL) {
if(m_callBack != NULL) {
ERS_DEBUG(3,"Execute callback from DataWriter.");
mp_callBack->FileWasClosed(
m_callBack->FileWasClosed(
m_filenamecallback->getCurrentFileName(),
nameFile(FINISHED),
m_streamType,
......@@ -597,9 +597,9 @@ void DataWriter::openNextFile()
m_cFileOpen = m_cFile.good();
m_openFailed = !m_cFile.good();
if((mp_callBack != NULL) && m_cFileOpen) {
if((m_callBack != NULL) && m_cFileOpen) {
ERS_DEBUG(3,"Execute callback from DataWriter.");
mp_callBack->FileWasOpened(
m_callBack->FileWasOpened(
m_filenamecallback->getCurrentFileName(),
nameFile(UNFINISHED),
m_streamType,
......@@ -730,9 +730,9 @@ void DataWriter::file_record(const offline_EventStorage_v5::freeMetaDataStrings&
}
void DataWriter::registerCallBack(DataWriterCallBack *pUserCBclass) {
mp_callBack = pUserCBclass;
if(mp_callBack != NULL) {
mp_callBack->FileWasOpened(
m_callBack = pUserCBclass;
if(m_callBack != NULL) {
m_callBack->FileWasOpened(
m_filenamecallback->getCurrentFileName(),
nameFile(UNFINISHED),
m_streamType,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment