Fixes in online reconstruction, Event Display and Storage Manager

[u/mrichter/AliRoot.git] / MONITOR / MONITORzmq / AliStorageEventManager.cxx

diff --git a/MONITOR/MONITORzmq/AliStorageEventManager.cxx b/MONITOR/MONITORzmq/AliStorageEventManager.cxx
index 2c5a360753d4534a2a774047bcb1ba4a623e7c39..82ad2e744250c6cd5b440a7b92aebc652e37c019 100644 (file)
--- a/MONITOR/MONITORzmq/AliStorageEventManager.cxx
+++ b/MONITOR/MONITORzmq/AliStorageEventManager.cxx
@@ -291,8 +291,18 @@ void AliStorageEventManager::Send(vector<serverListStruct> list,storageSockets s
     if(tmpMessage){delete tmpMessage;}
 }
 
-void AliStorageEventManager::Send(struct serverRequestStruct *request,storageSockets socket)
+bool AliStorageEventManager::Send(struct serverRequestStruct *request,storageSockets socket,int timeout)
 {
+  
+  if(timeout>=0)
+    {
+      pollitem_t items[1] =  {{*fSockets[socket],0,ZMQ_POLLIN,0}};
+      if(poll (&items[0], 1, timeout)==0){
+       cout<<"Event Manager -- couldn't send serverRequestStruct -- timeout"<<endl;
+       return 0;
+      }
+    }
+
     char *buffer = (char*)(request);
     message_t *requestMessage = new message_t((void*)buffer,
                                               sizeof(struct serverRequestStruct)
@@ -304,17 +314,20 @@ void AliStorageEventManager::Send(struct serverRequestStruct *request,storageSoc
     catch(const zmq::error_t &e)
     {
         cout<<"MANAGER -- send serverRequestStruct -- "<<e.what()<<endl;
+       return 0;
     }
+    return 1;
 }
 
 bool AliStorageEventManager::Send(struct clientRequestStruct *request,storageSockets socket,int timeout)
 {
-    pollitem_t items[1] =  {{*fSockets[socket],0,ZMQ_POLLIN,0}} ;
-    
+    if(timeout>=0){
+      pollitem_t items[1] =  {{*fSockets[socket],0,ZMQ_POLLIN,0}};
+      if(poll (&items[0], 1, timeout)==0){return 0;}
+    }
     
     char *buffer = (char*)(request);
-    message_t *requestMessage = new message_t((void*)buffer,
-                                              sizeof(struct clientRequestStruct),freeBuff);
+    message_t *requestMessage = new message_t((void*)buffer,sizeof(struct clientRequestStruct),freeBuff);
     
     try{
         fSockets[socket]->send(*requestMessage);
@@ -330,14 +343,7 @@ bool AliStorageEventManager::Send(struct clientRequestStruct *request,storageSoc
         return 0;
         
     }
-    if(timeout>=0)
-    {
-        if(poll (&items[0], 1, timeout)==0)
-        {
-            delete requestMessage;
-            return 0;
-        }
-    }
+    
     delete requestMessage;
     return 1;
 }
@@ -391,7 +397,7 @@ void AliStorageEventManager::Send(AliESDEvent *event, storageSockets socket)
     TMessage tmess(kMESS_OBJECT);
     tmess.Reset();
     tmess.WriteObject(event);
-    //  TMessage::EnableSchemaEvolutionForAll(kTRUE);
+    //TMessage::EnableSchemaEvolutionForAll(kTRUE);
     
     int bufsize = tmess.Length();
     char* buf = (char*) malloc(bufsize * sizeof(char));
@@ -582,7 +588,7 @@ AliESDEvent* AliStorageEventManager::GetEvent(storageSockets socket,int timeout)
        try{(poll (&items[0], 1, timeout)==0);}
        catch(const zmq::error_t &e){
          cout<<"EVENT MANAGER -- GetEvent():"<<e.what()<<endl;
-           return NULL;
+         return NULL;
          }
     }
     message_t* message = new message_t();