- Make FairMQSampler generic.

- Remove fairroot dependency from fairmq.

fairmq/nanomsg/FairMQMessageNN.cxx

@@ -12,7 +12,6 @@
 #include "FairMQMessageNN.h"
 #include "FairMQLogger.h"
 
-
 FairMQMessageNN::FairMQMessageNN() :
   fSize(0),
   fMessage(NULL)
@@ -22,7 +21,7 @@ FairMQMessageNN::FairMQMessageNN() :
 FairMQMessageNN::FairMQMessageNN(size_t size)
 {
   fMessage = nn_allocmsg(size, 0);
-  if(!fMessage){
+  if (!fMessage){
     stringstream logmsg;
     logmsg << "failed allocating message, reason: " << nn_strerror(errno);
     FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
@@ -33,7 +32,7 @@ FairMQMessageNN::FairMQMessageNN(size_t size)
 FairMQMessageNN::FairMQMessageNN(void* data, size_t size)
 {
   fMessage = nn_allocmsg(size, 0);
-  if(!fMessage){
+  if (!fMessage){
     stringstream logmsg;
     logmsg << "failed allocating message, reason: " << nn_strerror(errno);
     FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
@@ -53,7 +52,7 @@ void FairMQMessageNN::Rebuild(size_t size)
 {
   Clear();
   fMessage = nn_allocmsg(size, 0);
-  if(!fMessage){
+  if (!fMessage){
     stringstream logmsg;
     logmsg << "failed allocating message, reason: " << nn_strerror(errno);
     FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
@@ -65,11 +64,12 @@ void FairMQMessageNN::Rebuild(void* data, size_t size)
 {
   Clear();
   fMessage = nn_allocmsg(size, 0);
-  if(!fMessage){
+  if (!fMessage){
     stringstream logmsg;
     logmsg << "failed allocating message, reason: " << nn_strerror(errno);
     FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
   }
+  memcpy (fMessage, data, size);
   fSize = size;
 }
 
@@ -96,9 +96,9 @@ void FairMQMessageNN::SetMessage(void* data, size_t size)
 
 void FairMQMessageNN::Copy(FairMQMessage* msg)
 {
-  if(fMessage){
+  if (fMessage){
     int rc = nn_freemsg(fMessage);
-    if( rc < 0 ){
+    if ( rc < 0 ){
       stringstream logmsg;
       logmsg << "failed freeing message, reason: " << nn_strerror(errno);
       FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
@@ -108,7 +108,7 @@ void FairMQMessageNN::Copy(FairMQMessage* msg)
   size_t size = msg->GetSize();
 
   fMessage = nn_allocmsg(size, 0);
-  if(!fMessage){
+  if (!fMessage){
     stringstream logmsg;
     logmsg << "failed allocating message, reason: " << nn_strerror(errno);
     FairMQLogger::GetInstance()->Log(FairMQLogger::ERROR, logmsg.str());
@@ -117,7 +117,7 @@ void FairMQMessageNN::Copy(FairMQMessage* msg)
   fSize = size;
 }
 
-void FairMQMessageNN::Clear()
+inline void FairMQMessageNN::Clear()
 {
   int rc = nn_freemsg(fMessage);
   if (rc < 0) {

fairmq/nanomsg/FairMQMessageNN.h

@@ -19,7 +19,7 @@ class FairMQMessageNN : public FairMQMessage
     FairMQMessageNN();
     FairMQMessageNN(size_t size);
     FairMQMessageNN(void* data, size_t size);
-
+    
     virtual void Rebuild();
     virtual void Rebuild(size_t size);
     virtual void Rebuild(void* data, size_t site);
@@ -28,16 +28,18 @@ class FairMQMessageNN : public FairMQMessage
     virtual void* GetData();
     virtual size_t GetSize();
 
-    virtual void Copy(FairMQMessage* msg);
+    virtual void SetMessage(void* data, size_t size);
 
-    void SetMessage(void* data, size_t size);
-    void Clear();
+    virtual void CloseMessage() {};
+    virtual void Copy(FairMQMessage* msg);
 
     virtual ~FairMQMessageNN();
 
   private:
     void* fMessage;
     size_t fSize;
+
+    void Clear();
 };
 
 #endif /* FAIRMQMESSAGENN_H_ */

fairmq/nanomsg/FairMQSocketNN.cxx

@@ -81,7 +81,7 @@ size_t FairMQSocketNN::Send(FairMQMessage* msg)
 
 size_t FairMQSocketNN::Receive(FairMQMessage* msg)
 {
-  void* ptr = msg->GetMessage();
+  void* ptr = NULL;
   int rc = nn_recv(fSocket, &ptr, NN_MSG, 0);
   if (rc < 0) {
     stringstream logmsg;
@@ -98,7 +98,7 @@ size_t FairMQSocketNN::Receive(FairMQMessage* msg)
 
 void* FairMQSocketNN::GetSocket()
 {
-  return NULL;// dummy method to compy with the interface. functionality not possible in zeromq.
+  return NULL; // dummy method to comply with the interface. functionality not possible in zeromq.
 }
 
 int FairMQSocketNN::GetSocket(int nothing)

fairmq/nanomsg/FairMQTransportFactoryNN.cxx

@@ -9,7 +9,7 @@
 
 FairMQTransportFactoryNN::FairMQTransportFactoryNN()
 {
-
+  FairMQLogger::GetInstance()->Log(FairMQLogger::INFO, "Using NanoMsg library");
 }
 
 FairMQMessage* FairMQTransportFactoryNN::CreateMessage()