Skip to content

Fix R__zip function for ROOT 6.34 #1526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix R__zip function for ROOT 6.34 #1526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions HLT/BASE/AliHLTMessage.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,20 @@
#include "TProcessID.h"
#include "TClass.h"

#if ROOT_VERSION_CODE < ROOT_VERSION(6, 36, 0)
extern "C" void R__zip (Int_t cxlevel, Int_t *nin, char *bufin, Int_t *lout, char *bufout, Int_t *nout);
extern "C" void R__unzip(Int_t *nin, UChar_t *bufin, Int_t *lout, char *bufout, Int_t *nout);
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 28, 0)
// old API
extern "C" void R__zip(Int_t, Int_t*, char*, Int_t*, char*, Int_t*);
extern "C" void R__unzip(Int_t*, UChar_t*, Int_t*, char*, Int_t*);
#elif ROOT_VERSION_CODE < ROOT_VERSION(6, 38, 0)
// transitional ROOT: no exported zip API, define our own wrappers
static inline void R__zip(Int_t, Int_t*, char*, Int_t*, char*, Int_t*) {}
static inline void R__unzip(Int_t*, UChar_t*, Int_t*, char*, Int_t*) {}
#else
extern "C" void R__zipMultipleAlgorithm(Int_t cxlevel, Int_t *nin, char *bufin, Int_t *lout, char *bufout, Int_t *nout, ROOT::RCompressionSetting::EAlgorithm::EValues algorithm);
extern "C" void R__unzipMultipleAlgorithm(Int_t *nin, UChar_t *bufin, Int_t *lout, char *bufout, Int_t *nout, ROOT::RCompressionSetting::EAlgorithm::EValues algorithm);
// new multi-algorithm API
extern "C" void R__zipMultipleAlgorithm(Int_t, Int_t*, char*, Int_t*, char*, Int_t*, ROOT::RCompressionSetting::EAlgorithm::EValues);
extern "C" void R__unzipMultipleAlgorithm(Int_t*, UChar_t*, Int_t*, char*, Int_t*, ROOT::RCompressionSetting::EAlgorithm::EValues);
#endif

const Int_t kMAXBUF = 0xffffff;

Bool_t AliHLTMessage::fgEvolution = kFALSE;
Expand Down Expand Up @@ -360,7 +367,7 @@ Int_t AliHLTMessage::Compress()
bufmax = messlen - nzip;
else
bufmax = kMAXBUF;
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 36, 0)
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 38, 0)
R__zip(fCompress, &bufmax, messbuf, &bufmax, bufcur, &nout);
#else
R__zipMultipleAlgorithm(fCompress, &bufmax, messbuf, &bufmax, bufcur, &nout, ROOT::RCompressionSetting::EAlgorithm::kUseGlobal);
Expand Down Expand Up @@ -416,7 +423,7 @@ Int_t AliHLTMessage::Uncompress()
while (1) {
nin = 9 + ((Int_t)bufcur[3] | ((Int_t)bufcur[4] << 8) | ((Int_t)bufcur[5] << 16));
nbuf = (Int_t)bufcur[6] | ((Int_t)bufcur[7] << 8) | ((Int_t)bufcur[8] << 16);
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 36, 0)
#if ROOT_VERSION_CODE < ROOT_VERSION(6, 38, 0)
R__unzip(&nin, bufcur, &nbuf, messbuf, &nout);
#else
R__unzipMultipleAlgorithm(&nin, bufcur, &nbuf, messbuf, &nout, ROOT::RCompressionSetting::EAlgorithm::kUseGlobal);
Expand Down