mirror of
https://github.com/FairRootGroup/FairMQ.git
synced 2025-10-15 09:31:45 +00:00
Enable new callback API
- OnData() channel data handler. - ConditionalRun() for devices without incoming data. - Header file with common main(), to be extended with getDevice/addCustomOptions. - Update examples (MQ/Tutorial3) to use the new API and config. - NewSimpleMessage() for simpler creation of small messages (additional copy). - Replace SetProperty/GetProperty with fConfig access. - Runtime configurable channel names for common devices. - Configurable logging interval per channel. - FairMQMultiplier for distributing same data to multiple outputs. - Cleanup state machine messages. - Cmd option to toggle signal handling. - Simpler API for send/receive timeouts. - Enable --log-to-file. - Fix coverity issues, warnings. - Various code cleanup and minor tweaks.
This commit is contained in:
committed by
Mohammad Al-Turany
parent
d5b98567db
commit
da10c64800
@@ -12,9 +12,6 @@
|
||||
* @author A. Rybalchenko
|
||||
*/
|
||||
|
||||
#include <boost/thread.hpp>
|
||||
#include <boost/bind.hpp>
|
||||
|
||||
#include "FairMQExample5Server.h"
|
||||
#include "FairMQLogger.h"
|
||||
|
||||
@@ -22,32 +19,28 @@ using namespace std;
|
||||
|
||||
FairMQExample5Server::FairMQExample5Server()
|
||||
{
|
||||
OnData("data", &FairMQExample5Server::HandleData);
|
||||
}
|
||||
|
||||
void FairMQExample5Server::CustomCleanup(void* /*data*/, void *hint)
|
||||
bool FairMQExample5Server::HandleData(FairMQMessagePtr& request, int /*index*/)
|
||||
{
|
||||
delete static_cast<string*>(hint);
|
||||
}
|
||||
LOG(INFO) << "Received request from client: \"" << string(static_cast<char*>(request->GetData()), request->GetSize()) << "\"";
|
||||
|
||||
void FairMQExample5Server::Run()
|
||||
{
|
||||
while (CheckCurrentState(RUNNING))
|
||||
string* text = new string("Thank you for the \"" + string(static_cast<char*>(request->GetData()), request->GetSize()) + "\"!");
|
||||
|
||||
LOG(INFO) << "Sending reply to client.";
|
||||
|
||||
FairMQMessagePtr reply(NewMessage(const_cast<char*>(text->c_str()), // data
|
||||
text->length(), // size
|
||||
[](void* /*data*/, void* object) { delete static_cast<string*>(object); }, // deletion callback
|
||||
text)); // object that manages the data
|
||||
|
||||
if (Send(reply, "data") > 0)
|
||||
{
|
||||
unique_ptr<FairMQMessage> request(NewMessage());
|
||||
|
||||
if (Receive(request, "data") >= 0)
|
||||
{
|
||||
LOG(INFO) << "Received request from client: \"" << string(static_cast<char*>(request->GetData()), request->GetSize()) << "\"";
|
||||
|
||||
string* text = new string("Thank you for the \"" + string(static_cast<char*>(request->GetData()), request->GetSize()) + "\"!");
|
||||
|
||||
LOG(INFO) << "Sending reply to client.";
|
||||
|
||||
unique_ptr<FairMQMessage> reply(NewMessage(const_cast<char*>(text->c_str()), text->length(), CustomCleanup, text));
|
||||
|
||||
Send(reply, "data");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
FairMQExample5Server::~FairMQExample5Server()
|
||||
|
Reference in New Issue
Block a user