Update master to aliroot

[u/mrichter/AliRoot.git] / SHUTTLE / AliShuttleTrigger.h

diff --git a/SHUTTLE/AliShuttleTrigger.h b/SHUTTLE/AliShuttleTrigger.h
index db0b8e068a453d8103aa8767d7c353ef5b03ef43..e79f43251a71503b222b9b004e9ce20e7d693d1d 100644 (file)
--- a/SHUTTLE/AliShuttleTrigger.h
+++ b/SHUTTLE/AliShuttleTrigger.h
@@ -29,16 +29,15 @@ class TerminateSignalHandler: public TSignalHandler {
 public:
        TerminateSignalHandler(): TSignalHandler((ESignals) 0,0), fTrigger(0) { }
        TerminateSignalHandler(AliShuttleTrigger* trigger, ESignals signal):
-               TSignalHandler(signal, kFALSE), fTrigger(trigger) {}
+       TSignalHandler(signal, kFALSE), fTrigger(trigger) {}
 
        virtual ~TerminateSignalHandler() { }
        virtual Bool_t Notify();
 
 private:
-
-       TerminateSignalHandler(const TerminateSignalHandler& other);    
-       TerminateSignalHandler& operator= (const TerminateSignalHandler& other);        
-
+       TerminateSignalHandler(const TerminateSignalHandler& other);
+       TerminateSignalHandler& operator= (const TerminateSignalHandler& other);
+  
        AliShuttleTrigger* fTrigger;  // pointer to the current AliShuttleTrigger
 
        ClassDef(TerminateSignalHandler, 0)
@@ -47,14 +46,12 @@ private:
 class AliShuttleTrigger: public TObject {
 
 public:
-       AliShuttleTrigger(const AliShuttleConfig* config, UInt_t timeout = 5000, Int_t retries = 5);
+       AliShuttleTrigger(const AliShuttleConfig* config);
        ~AliShuttleTrigger();
 
        AliShuttle* GetShuttle() {return fShuttle;}
 
-       Bool_t Collect(Int_t run);
-       Bool_t CollectNew();
-       Bool_t CollectAll();
+       Bool_t Collect(Int_t run = -1);
 
        virtual Bool_t Notify();
        void Terminate();
@@ -65,6 +62,9 @@ private:
        AliShuttleTrigger(const AliShuttleTrigger& other);
        AliShuttleTrigger& operator= (const AliShuttleTrigger& other);
 
+       Bool_t SendMailDiskSpace(Short_t percentage);
+       void CheckTerminate();
+
        const AliShuttleConfig* fConfig;
 
        AliShuttle* fShuttle;           // Pointer to the actual Shuttle instance
@@ -75,8 +75,10 @@ private:
        TMutex fMutex;                  // Mutex
        TCondition fCondition;          // Condition 
 
-       TerminateSignalHandler fQuitSignalHandler;              // Quit signal 
-       TerminateSignalHandler fInterruptSignalHandler;         // Interrupt signal
+       TerminateSignalHandler* fQuitSignalHandler;             // Quit signal
+       TerminateSignalHandler* fInterruptSignalHandler;        // Interrupt signal
+
+       time_t fLastMailDiskSpace;       // timestamp when the last mail was sent
 
 
        ClassDef(AliShuttleTrigger, 0)