detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 10:07:59 +02:00
Code Issues Actions Packages Releases Activity

Merge pull request #3 from esrf-bliss/add-slsReceiver-ctor-overload

Browse Source 
merge for Add slsReceiver ctor overload and sls::make_unique
This commit is contained in:
Dhanya Thattil
2019-02-13 09:10:33 +01:00
committed by GitHub
parent 2bcf88e434 f125b94a7d
commit 75a75b6cf6
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsReceiverSoftware/include/slsReceiver.h
View File

@ -4,10 +4,9 @@
* @short creates the UDP and TCP class objects * @short creates the UDP and TCP class objects
***********************************************/ ***********************************************/
#include <memory>
#include "slsReceiverTCPIPInterface.h"
class slsReceiverTCPIPInterface;
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
@ -29,9 +28,13 @@ class slsReceiver : private virtual slsDetectorDefs {
slsReceiver(int argc, char *argv[]); slsReceiver(int argc, char *argv[]);
/** /**
* Destructor * Constructor
* Starts up a Receiver server. Reads configuration file, options, and
* assembles a Receiver using TCP and UDP detector interfaces
* throws an exception in case of failure
* @param tcpip_port_no TCP/IP port number
*/ */
~slsReceiver(); slsReceiver(int tcpip_port_no = 1954);
/** /**
* starts listening on the TCP port for client comminication * starts listening on the TCP port for client comminication
@ -95,6 +98,5 @@ class slsReceiver : private virtual slsDetectorDefs {
private: private:
slsReceiverTCPIPInterface* tcpipInterface; std::unique_ptr<slsReceiverTCPIPInterface> tcpipInterface;
}; };

16
slsReceiverSoftware/include/slsReceiverUsers.h
View File

@ -3,8 +3,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <memory>
class slsReceiver; #include "slsReceiver.h"
/** /**
@short Class for implementing the SLS data receiver in the users application. Callbacks can be defined for processing and/or saving data @short Class for implementing the SLS data receiver in the users application. Callbacks can be defined for processing and/or saving data
@ -24,9 +25,13 @@ public:
*/ */
slsReceiverUsers(int argc, char *argv[], int &success); slsReceiverUsers(int argc, char *argv[], int &success);
/**
/** Destructor */ * Constructor
~slsReceiverUsers(); * reads config file, creates socket, assigns function table
* @param tcpip_port_no TCP/IP port
* @throws
*/
slsReceiverUsers(int tcpip_port_no = 1954);
/** /**
* starts listening on the TCP port for client comminication * starts listening on the TCP port for client comminication
@ -83,6 +88,5 @@ public:
char* datapointer, uint32_t &revDatasize, void*),void *arg); char* datapointer, uint32_t &revDatasize, void*),void *arg);
//receiver object //receiver object
slsReceiver* receiver; std::unique_ptr<slsReceiver> receiver;
}; };

11
slsReceiverSoftware/src/slsReceiver.cpp
View File

@ -11,6 +11,7 @@
#include <map> #include <map>
#include <getopt.h> #include <getopt.h>
#include "container_utils.h" // For sls::make_unique<>
#include "slsReceiver.h" #include "slsReceiver.h"
#include "slsReceiverTCPIPInterface.h" #include "slsReceiverTCPIPInterface.h"
@ -78,14 +79,14 @@ slsReceiver::slsReceiver(int argc, char *argv[]):
} }
// might throw an exception // might throw an exception
tcpipInterface = new slsReceiverTCPIPInterface(tcpip_port_no); tcpipInterface = sls::make_unique<slsReceiverTCPIPInterface>(tcpip_port_no);
} }
slsReceiver::~slsReceiver() { slsReceiver::slsReceiver(int tcpip_port_no)
if(tcpipInterface) {
delete tcpipInterface; // might throw an exception
tcpipInterface = sls::make_unique<slsReceiverTCPIPInterface>(tcpip_port_no);
} }

10
slsReceiverSoftware/src/slsReceiverUsers.cpp
View File

@ -1,19 +1,19 @@
#include "container_utils.h" // For sls::make_unique<>
#include "slsReceiverUsers.h" #include "slsReceiverUsers.h"
#include "slsReceiver.h"
slsReceiverUsers::slsReceiverUsers(int argc, char *argv[], int &success) { slsReceiverUsers::slsReceiverUsers(int argc, char *argv[], int &success) {
// catch the exception here to limit it to within the library (for current version) // catch the exception here to limit it to within the library (for current version)
try { try {
slsReceiver* r = new slsReceiver(argc, argv); receiver = sls::make_unique<slsReceiver>(argc, argv);
receiver = r;
success = slsDetectorDefs::OK; success = slsDetectorDefs::OK;
} catch (...) { } catch (...) {
success = slsDetectorDefs::FAIL; success = slsDetectorDefs::FAIL;
} }
} }
slsReceiverUsers::~slsReceiverUsers() { slsReceiverUsers::slsReceiverUsers(int tcpip_port_no) {
delete receiver; receiver = sls::make_unique<slsReceiver>(tcpip_port_no);
} }
int slsReceiverUsers::start() { int slsReceiverUsers::start() {