From d2450633c5c011d23c9287b5658bebfd5e499651 Mon Sep 17 00:00:00 2001 From: cvetan Date: Fri, 18 Jan 2008 17:23:16 +0000 Subject: [PATCH] Moving from 32-bit to 64-bit return value of the file close method. Last modification which will allow to write big file in alimdc and mStreamRecorder --- RAW/AliMDC.cxx | 4 ++-- RAW/AliMDC.h | 2 +- RAW/AliRawCastorDB.cxx | 4 ++-- RAW/AliRawCastorDB.h | 2 +- RAW/AliRawDB.cxx | 4 ++-- RAW/AliRawDB.h | 2 +- RAW/AliRawNullDB.cxx | 4 ++-- RAW/AliRawNullDB.h | 2 +- RAW/AliRawRFIODB.cxx | 4 ++-- RAW/AliRawRFIODB.h | 2 +- RAW/AliRawRootdDB.cxx | 4 ++-- RAW/AliRawRootdDB.h | 2 +- RAW/mdc.cxx | 2 +- RAW/mdc.h | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/RAW/AliMDC.cxx b/RAW/AliMDC.cxx index 63ccc25c0da..6901ce43ffd 100644 --- a/RAW/AliMDC.cxx +++ b/RAW/AliMDC.cxx @@ -429,14 +429,14 @@ Long64_t AliMDC::GetTotalSize() } //______________________________________________________________________________ -Int_t AliMDC::Close() +Long64_t AliMDC::Close() { // close the current raw DB file if (!fRawDB) return -1; fRawDB->WriteStats(fStats); - Int_t filesize = fRawDB->Close(); + Long64_t filesize = fRawDB->Close(); delete fRawDB; fRawDB = NULL; delete fStats; diff --git a/RAW/AliMDC.h b/RAW/AliMDC.h index 4306430e5bd..00392b3bcd0 100644 --- a/RAW/AliMDC.h +++ b/RAW/AliMDC.h @@ -72,7 +72,7 @@ public: const char* fs1 = NULL, const char* fs2 = NULL); Int_t ProcessEvent(void* event, Bool_t isIovecArray = kFALSE); Long64_t GetTotalSize(); - Int_t Close(); + Long64_t Close(); Int_t Run(const char* inputFile, Bool_t loop, EWriteMode mode, Double_t maxFileSize, diff --git a/RAW/AliRawCastorDB.cxx b/RAW/AliRawCastorDB.cxx index 1f99b4d67b5..f94b68709bc 100644 --- a/RAW/AliRawCastorDB.cxx +++ b/RAW/AliRawCastorDB.cxx @@ -103,7 +103,7 @@ const char *AliRawCastorDB::GetFileName() const } //______________________________________________________________________________ -Int_t AliRawCastorDB::Close() +Long64_t AliRawCastorDB::Close() { // Close raw CASTOR/rootd DB. @@ -124,7 +124,7 @@ Int_t AliRawCastorDB::Close() // Close DB, this also deletes the fTree fRawDB->Close(); - Int_t filesize = fRawDB->GetEND(); + Long64_t filesize = fRawDB->GetEND(); if (fDeleteFiles) { TUrl u(fRawDB->GetName()); diff --git a/RAW/AliRawCastorDB.h b/RAW/AliRawCastorDB.h index 1ac85a2ffa4..ecec025e4be 100644 --- a/RAW/AliRawCastorDB.h +++ b/RAW/AliRawCastorDB.h @@ -26,7 +26,7 @@ public: const char *GetOpenOption() const { return "-RECREATE"; } Int_t GetNetopt() const { return 0; } - Int_t Close(); + Long64_t Close(); private: const char *GetFileName() const; diff --git a/RAW/AliRawDB.cxx b/RAW/AliRawDB.cxx index c066a3567fb..22515f0efde 100644 --- a/RAW/AliRawDB.cxx +++ b/RAW/AliRawDB.cxx @@ -300,7 +300,7 @@ void AliRawDB::MakeTree() } //______________________________________________________________________________ -Int_t AliRawDB::Close() +Long64_t AliRawDB::Close() { // Close raw DB. if (!fRawDB) return 0; @@ -320,7 +320,7 @@ Int_t AliRawDB::Close() // Close DB, this also deletes the fTree fRawDB->Close(); - Int_t filesize = fRawDB->GetEND(); + Long64_t filesize = fRawDB->GetEND(); if (fDeleteFiles) { gSystem->Unlink(fRawDB->GetName()); diff --git a/RAW/AliRawDB.h b/RAW/AliRawDB.h index 58593051abf..ceb7063ea6a 100644 --- a/RAW/AliRawDB.h +++ b/RAW/AliRawDB.h @@ -49,7 +49,7 @@ public: virtual const char *GetOpenOption() const { return "RECREATE"; } virtual Int_t GetNetopt() const { return 0; } virtual Bool_t Create(const char* fileName = NULL); - virtual Int_t Close(); + virtual Long64_t Close(); Int_t Fill(); Long64_t GetTotalSize(); diff --git a/RAW/AliRawNullDB.cxx b/RAW/AliRawNullDB.cxx index c615425d41d..070ef953a03 100644 --- a/RAW/AliRawNullDB.cxx +++ b/RAW/AliRawNullDB.cxx @@ -48,7 +48,7 @@ const char *AliRawNullDB::GetFileName() const } //______________________________________________________________________________ -Int_t AliRawNullDB::Close() +Long64_t AliRawNullDB::Close() { // Close raw RFIO DB. @@ -69,7 +69,7 @@ Int_t AliRawNullDB::Close() // Close DB, this also deletes the fTree fRawDB->Close(); - Int_t filesize = fRawDB->GetEND(); + Long64_t filesize = fRawDB->GetEND(); delete fRawDB; fRawDB = 0; diff --git a/RAW/AliRawNullDB.h b/RAW/AliRawNullDB.h index 8f5c5f58dfb..5cd65007ff2 100644 --- a/RAW/AliRawNullDB.h +++ b/RAW/AliRawNullDB.h @@ -24,7 +24,7 @@ public: const char* fileName); ~AliRawNullDB() { Close(); } - Int_t Close(); + Long64_t Close(); private: const char *GetFileName() const; diff --git a/RAW/AliRawRFIODB.cxx b/RAW/AliRawRFIODB.cxx index eaf2dfe41de..0860e2a0547 100644 --- a/RAW/AliRawRFIODB.cxx +++ b/RAW/AliRawRFIODB.cxx @@ -103,7 +103,7 @@ const char *AliRawRFIODB::GetFileName() const } //______________________________________________________________________________ -Int_t AliRawRFIODB::Close() +Long64_t AliRawRFIODB::Close() { // Close raw RFIO DB. @@ -124,7 +124,7 @@ Int_t AliRawRFIODB::Close() // Close DB, this also deletes the fTree fRawDB->Close(); - Int_t filesize = fRawDB->GetEND(); + Long64_t filesize = fRawDB->GetEND(); if (fDeleteFiles) { TUrl u(fRawDB->GetName()); diff --git a/RAW/AliRawRFIODB.h b/RAW/AliRawRFIODB.h index 13b4fb30455..ffde041f4b8 100644 --- a/RAW/AliRawRFIODB.h +++ b/RAW/AliRawRFIODB.h @@ -24,7 +24,7 @@ public: const char* fileName = NULL); ~AliRawRFIODB() { Close(); } - Int_t Close(); + Long64_t Close(); private: const char *GetFileName() const; diff --git a/RAW/AliRawRootdDB.cxx b/RAW/AliRawRootdDB.cxx index 7828aeca2f3..ec1ba140cba 100644 --- a/RAW/AliRawRootdDB.cxx +++ b/RAW/AliRawRootdDB.cxx @@ -87,7 +87,7 @@ const char *AliRawRootdDB::GetFileName() const } //______________________________________________________________________________ -Int_t AliRawRootdDB::Close() +Long64_t AliRawRootdDB::Close() { // Close raw rootd DB. @@ -108,7 +108,7 @@ Int_t AliRawRootdDB::Close() // Close DB, this also deletes the fTree fRawDB->Close(); - Int_t filesize = fRawDB->GetEND(); + Long64_t filesize = fRawDB->GetEND(); #if 0 // can use services of TFTP diff --git a/RAW/AliRawRootdDB.h b/RAW/AliRawRootdDB.h index 48b3477d3ad..7bacc1139fe 100644 --- a/RAW/AliRawRootdDB.h +++ b/RAW/AliRawRootdDB.h @@ -24,7 +24,7 @@ public: const char* fileName = NULL); ~AliRawRootdDB() { Close(); } - Int_t Close(); + Long64_t Close(); private: const char *GetFileName() const; diff --git a/RAW/mdc.cxx b/RAW/mdc.cxx index 07205273d76..8c7237a41d7 100644 --- a/RAW/mdc.cxx +++ b/RAW/mdc.cxx @@ -58,7 +58,7 @@ long long alimdcGetTotalFileSize(void* alimdc) return ((AliMDC*)alimdc)->GetTotalSize(); } -int alimdcClose(void* alimdc) +long long alimdcClose(void* alimdc) { // close the raw DB diff --git a/RAW/mdc.h b/RAW/mdc.h index 37db1927ba8..5cee1ee6037 100644 --- a/RAW/mdc.h +++ b/RAW/mdc.h @@ -21,7 +21,7 @@ void* alimdcCreate(int compress, int filterMode, int alimdcOpen(void* alimdc, int mode, const char* fileName); int alimdcProcessEvent(void* alimdc, void* event, int isIovecArray); long long alimdcGetTotalFileSize(void* alimdc); -int alimdcClose(void* alimdc); +long long alimdcClose(void* alimdc); void alimdcDelete(void* alimdc); void alimdcEnableDebug(); -- 2.43.5