Updated buffer handling with mutex and faster response

diff --git a/EVE/EveHLT/AliEveEventBuffer.cxx b/EVE/EveHLT/AliEveEventBuffer.cxx
index d064439bd52384e1133313d000ab31f275744b71..483732790a285338a6aaf372cb28076643f1f9c9 100644 (file)
--- a/EVE/EveHLT/AliEveEventBuffer.cxx
+++ b/EVE/EveHLT/AliEveEventBuffer.cxx
@@ -84,6 +84,7 @@ void AliEveEventBuffer::CreateBufferThread() {
       cout << "Started BufferThread"<<endl;
     } else { 
       cout << "Buffer is full already"<<endl;
       cout << "Started BufferThread"<<endl;
     } else { 
       cout << "Buffer is full already"<<endl;

+      fMutex->UnLock();

     }
   }
 }
     }
   }
 }

diff --git a/EVE/EveHLT/AliEveHLTEventManagerHomer.cxx b/EVE/EveHLT/AliEveHLTEventManagerHomer.cxx
index 635743d2cd7039958eaf7d2de672892bf9323717..b1f558c4757930ace2933fc830926513f54c1427 100644 (file)
--- a/EVE/EveHLT/AliEveHLTEventManagerHomer.cxx
+++ b/EVE/EveHLT/AliEveHLTEventManagerHomer.cxx
@@ -13,22 +13,25 @@
 #include "TList.h"
 #include "AliEveHOMERManager.h"
 #include "TEveManager.h"
 #include "TList.h"
 #include "AliEveHOMERManager.h"
 #include "TEveManager.h"

+#include "TTimer.h"
+#include "TGLOverlayButton.h"

 
 ClassImp(AliEveHLTEventManagerHomer)
 
 AliEveHLTEventManagerHomer::AliEveHLTEventManagerHomer() : 
   AliEveHLTEventManager(),
 
 ClassImp(AliEveHLTEventManagerHomer)
 
 AliEveHLTEventManagerHomer::AliEveHLTEventManagerHomer() : 
   AliEveHLTEventManager(),

-  fEventBuffer(NULL)
+  fEventBuffer(NULL), 
+  fNextEventTimer(NULL),
+  fInfoButton(NULL)

 {
   // see header file for class documentation
 {
   // see header file for class documentation

-  // or
-  // refer to README to build package
-  // or
-  // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt
+

   fEventBuffer = new AliEveEventBufferHomer();
   fEventBuffer->StartBufferMonitor();
   fEventBuffer = new AliEveEventBufferHomer();
   fEventBuffer->StartBufferMonitor();

-  //AliEveHOMERManager * hm = fEventBuffer->GetHomerManager();
-  //if(hm) GetEveManager()->AddToListTree(hm, kTRUE);
+    
+  fNextEventTimer = new TTimer();
+  fNextEventTimer->Connect("Timeout()", "AliEveHLTEventManagerHomer", this, "TryNextEvent()" );
+   

   
 
 }
   
 
 }


@@ -51,17 +54,22 @@ void AliEveHLTEventManagerHomer::ProcessList(TList * blockList) {
   UpdateDisplay();
 
 }
   UpdateDisplay();
 
 }

-
-
+void AliEveHLTEventManagerHomer::NextEvent() {
+  fNextEventTimer->Start(1000);
+}

 
 ///________________________________________________________________________________
 
 ///________________________________________________________________________________

-void AliEveHLTEventManagerHomer::NextEvent() {
+void AliEveHLTEventManagerHomer::TryNextEvent() {

   //See header file for documentation
   //See header file for documentation

-  if(fEventBuffer->LockMutex() ) {
-    cout << "event buffer already busy"<<endl;
+    
+  if ( fEventBuffer->LockMutex() ) {
+    cout << "try again in 1 sec"<<endl;

     return;
     return;

-  } else {
-
+  }
+  
+  fNextEventTimer->Stop();
+    
+  cout << "Mutex is freeee!!"<<endl;

   TList * aSyncEvent = fEventBuffer->GetASyncEvent();
   TList * event = static_cast<TList*>(fEventBuffer->NextEvent());
   if(event) {
   TList * aSyncEvent = fEventBuffer->GetASyncEvent();
   TList * event = static_cast<TList*>(fEventBuffer->NextEvent());
   if(event) {


@@ -83,14 +91,6 @@ void AliEveHLTEventManagerHomer::NextEvent() {
     cout << "couldn't get the sync event"<<endl;
   }
   
     cout << "couldn't get the sync event"<<endl;
   }
   

-  //  cout  << "doint async block"<<endl;
-  //  TList * async = static_cast<TList*>(fEventBuffer->GetAList());
-  //  if(async) {
-  //   ProcessEvent(async);
-  //   }  else {
-  //    cout << "No async bloc"<<endl;
-  // }
-  }

   
   fEventBuffer->UnLockMutex();
 }
   
   fEventBuffer->UnLockMutex();
 }

diff --git a/EVE/EveHLT/AliEveHLTEventManagerHomer.h b/EVE/EveHLT/AliEveHLTEventManagerHomer.h
index 7548720d7c0c0a834792a714294a0feaba261383..36a1457c43fe849e0fe9c018cdf59822e274f668 100644 (file)
--- a/EVE/EveHLT/AliEveHLTEventManagerHomer.h
+++ b/EVE/EveHLT/AliEveHLTEventManagerHomer.h
@@ -1,3 +1,6 @@
+// Author: 2010 Svein Lindal <slindal@fys.uio.no>                        *
+//         for The ALICE HLT Project.                                    *
+

 #ifndef ALIEVEHLTEVENTMANAGERHOMER_H
 #define ALIEVEHLTEVENTMANAGERHOMER_H
 
 #ifndef ALIEVEHLTEVENTMANAGERHOMER_H
 #define ALIEVEHLTEVENTMANAGERHOMER_H
 


@@ -7,6 +10,8 @@ class AliESDEvent;
 #include "AliEveEventBufferHomer.h"
 #include "AliEveEventBuffer.h"
 class TList;
 #include "AliEveEventBufferHomer.h"
 #include "AliEveEventBuffer.h"
 class TList;

+class TTimer;
+class TGLOverlayButton;

 
 class AliEveHLTEventManagerHomer : public AliEveHLTEventManager { 
 
 
 class AliEveHLTEventManagerHomer : public AliEveHLTEventManager { 
 


@@ -17,10 +22,16 @@ public:
   
   virtual ~AliEveHLTEventManagerHomer();
 
   
   virtual ~AliEveHLTEventManagerHomer();
 

+  //Get Next Event

   void NextEvent();
   void NextEvent();

+  //Try to get the next event
+  void TryNextEvent();
+  //Get next event in buffer

   void NavigateFwd();
   void NavigateFwd();

+  //Get Previous event in buffer

   void NavigateBack();
 
   void NavigateBack();
 

+  //Process block list

   void ProcessList(TList * blockList);
 
  private:
   void ProcessList(TList * blockList);
 
  private:


@@ -32,11 +43,19 @@ public:
   /** assignment operator prohibited */
   AliEveHLTEventManagerHomer& operator=(const AliEveHLTEventManagerHomer&);
   
   /** assignment operator prohibited */
   AliEveHLTEventManagerHomer& operator=(const AliEveHLTEventManagerHomer&);
   

-  AliEveEventBufferHomer * fEventBuffer;
+  AliEveEventBufferHomer * fEventBuffer; //Event buffer
+  ///Get event buffer

   AliEveEventBuffer * GetEventBuffer() { return dynamic_cast<AliEveEventBuffer*>(fEventBuffer); }
 
   AliEveEventBuffer * GetEventBuffer() { return dynamic_cast<AliEveEventBuffer*>(fEventBuffer); }
 

+  
+  TTimer * fNextEventTimer;  //Timer to fetch next event
+  TGLOverlayButton * fInfoButton; //Information button
+
+

   ClassDef(AliEveHLTEventManagerHomer, 0);
 
   ClassDef(AliEveHLTEventManagerHomer, 0);
 

+
+

 };
 
 #endif
 };
 
 #endif