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

merge conflict sorted, removing rest

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-05 11:25:10 +01:00
parent 28211af5af 536203b6dc
commit 0ef52138e1
17 changed files with 34 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/src/UDPInterface.cpp
View File

@ -13,10 +13,6 @@ using namespace std;
#include "UDPInterface.h"
#include "UDPBaseImplementation.h"
#include "UDPStandardImplementation.h"
#ifdef REST
#include "UDPRESTImplementation.h"
#endif
using namespace std;
@ -26,12 +22,6 @@ UDPInterface * UDPInterface::create(string receiver_type){
FILE_LOG(logINFO) << "Starting " << receiver_type;
return new UDPStandardImplementation();
}
#ifdef REST
else if (receiver_type == "REST"){
FILE_LOG(logINFO) << "Starting " << receiver_type;
return new UDPRESTImplementation();
}
#endif
else{
FILE_LOG(logERROR) << "UDP interface not supported, using base implementation";
return new UDPBaseImplementation();

381
slsReceiverSoftware/src/UDPRESTImplementation.cpp
View File

@ -1,381 +0,0 @@
#ifdef SLS_RECEIVER_UDP_FUNCTIONS
/********************************************//**
* @file UDPRESTImplementation.cpp
* @short does all the functions for a receiver, set/get parameters, start/stop etc.
***********************************************/
#include "UDPRESTImplementation.h"
#include <stdlib.h> // exit()
#include <iomanip> // set precision
#include <map> // map
#include <iostream>
#include <string.h>
#include <stdint.h>
#include <sstream>
#include "logger.h"
//#include "utilities.h"
using namespace std;
/*
TODO
+ filePath != getFilePath
+ better state handling. Now it is only IDLE - RUNNING - IDLE
*/
UDPRESTImplementation::UDPRESTImplementation(){
FILE_LOG(logINFO) << "PID: " + __AT__ + " called";
//TODO I do not really know what to do with bottom...
// Default values
isInitialized = true;
rest = NULL;
rest_hostname = "localhost";
rest_port = 8080;
is_main_receiver = false;
}
UDPRESTImplementation::~UDPRESTImplementation(){
delete rest;
}
void UDPRESTImplementation::configure(map<string, string> config_map){
// am I ever getting there?
FILE_LOG(logINFO) << __AT__ << "configure called";
map<string, string>::const_iterator pos;
pos = config_map.find("rest_hostname");
if (pos != config_map.end() ){
rest_hostname = config_map["rest_hostname"];
/*
string host_port_str = pos->second;
std::size_t pos = host_port_str.find(":"); // position of "live" in str
if(pos != string::npos){
istringstream (host_port_str.substr (pos)) >> rest_port;
rest_hostname = host_port_str.substr(0, pos);
std::cout << "YEEEEEEEEEEEEEEEE" << rest_hostname << " " << rest_port << std::endl;
} */
FILE_LOG(logINFO) << "REST hostname " << rest_hostname << std::endl;
}
//initialize_REST();
/*
for(map<string, string>::const_iterator i=config_map.begin(); i != config_map.end(); i++){
std::cout << i->first << " " << i->second<< std::endl;
}
*/
}
string UDPRESTImplementation::get_rest_state(RestHelper * rest/*, string *rest_state*/){
JsonBox::Value answer;
string rest_state = "";
int code = rest->get_json("api/v1/state", &answer);
if ( code != -1 ){
//rest_state = answer["global_state"].getString();
rest_state = answer["state"]["status"].getString();
}
//rest_state = *prs;
std::cout << "REST STATE " << rest_state << std::endl;
return rest_state;
}
void UDPRESTImplementation::initialize_REST(){
FILE_LOG(logDEBUG1) << __AT__ << " called";
FILE_LOG(logINFO) << __AT__ << " REST status is initialized: " + std::string(isInitialized ? "True" : "False");
string rest_state = "";
std::string answer = "";
/*
* HORRIBLE FIX to get the main receiver
* TODO: use detID (from baseclass)
* it i set by the client before calling initialize()
*/
string filename = getFileName();
int code;
//if (filename.substr(filename.length() - 2) == "d0"){
if(detID == 0){
is_main_receiver = true;
}
if (rest_hostname.empty()) {
FILE_LOG(logWARNING) << __AT__ << "can't initialize with empty string or NULL for detectorHostname";
throw;
}
rest = new RestHelper() ;
//std::cout << rest_hostname << " - " << rest_port << std::endl;
rest->init(rest_hostname);
rest->set_connection_params(1, 3);
FILE_LOG(logINFO) << "REST init called";
if (!is_main_receiver){
isInitialized = true;
status = slsReceiverDefs::IDLE;
return;
}
if (isInitialized == true) {
FILE_LOG(logWARNING) << "already initialized, can't initialize several times";
}
else {
FILE_LOG(logINFO) << "with receiverHostName=" << rest_hostname;
try{
rest_state = get_rest_state(rest);
if (rest_state == ""){
FILE_LOG(logERROR) << " REST state returned: " << rest_state;
throw;
}
else{
isInitialized = true;
status = slsReceiverDefs::IDLE;
}
FILE_LOG(logDEBUG1) << "Answer: " << answer;
}
catch(std::string e){
FILE_LOG(logERROR) << __AT__ << ": " << e;
throw;
}
// HORRIBLE FIX to get the main receiver
string filename = getFileName();
int code;
//JsonBox::Object json_object;
//json_object["configfile"] = JsonBox::Value("FILENAME");
JsonBox::Value json_request;
//json_request["configfile"] = "config.py";
json_request["path"] = filePath;
stringstream ss;
string test;
//std::cout << "GetSTring: " << json_request << std::endl;
json_request.writeToStream(ss, false);
//ss << json_request;
ss >> test;
rest_state = get_rest_state(rest);
//code = rest->get_json("api/v1/state", &answer);
//FILE_LOG(logDEBUG1, __AT__ << " state got " + std::string(code) << " " + answer + "\n";
if (rest_state != "INITIALIZED"){
test = "{\"path\":\"" + string( getFilePath() ) + "\", \"n_frames\":10}";
code = rest->post_json("api/v1/initialize", &answer, test);
}
else{
test = "{\"path\":\"" + string( getFilePath() ) + "\"}";
test = "{\"path\":\"" + string( getFilePath() ) + "\", \"n_frames\":10}";
code = rest->post_json("api/v1/configure", &answer, test);
}
//FILE_LOG(logDEBUG1) << " state/configure got " + std::string(code);
rest_state = get_rest_state(rest);
FILE_LOG(logINFO) << " state got " + std::string(rest_state) << "\n";
/*
std::std::cout << string << std::endl; << "---- REST test 3: true, json object "<< std::endl;
JsonBox::Value json_value;
code = rest.get_json("status", &json_value);
std::cout << "JSON " << json_value["status"] << std::endl;
*/
}
FILE_LOG(logDEBUG1) << ": configure() done";
}
/** acquisition functions */
int UDPRESTImplementation::startReceiver(char message[]){
//int i;
FILE_LOG(logINFO) << __AT__ << " starting";
initialize_REST();
FILE_LOG(logINFO) << __AT__ << " initialized";
std::string answer;
int code;
//char *intStr = itoa(a);
//string str = string(intStr);
// TODO: remove hardcode!!!
stringstream ss;
ss << getDynamicRange();
string str_dr = ss.str();
stringstream ss2;
ss2 << getNumberOfFrames();
string str_n = ss2.str();
stringstream ss3;
ss3 << acquisitionPeriod;
string sAP = ss3.str();
string rest_state = "";
std::string request_body = "{\"settings\": {\"bit_depth\": " + str_dr + ", \"n_frames\": " + str_n + ", \"period\": " + sAP + "}}";
//std::string request_body = "{\"settings\": {\"nimages\":1, \"scanid\":999, \"bit_depth\":16}}";
if(is_main_receiver){
FILE_LOG(logDEBUG1) << " sending this configuration body: " << request_body;
code = rest->post_json("api/v1/configure", &answer, request_body);
code = rest->get_json("api/v1/state", &answer);
FILE_LOG(logDEBUG1) << " got: " << answer;
rest_state = get_rest_state(rest);
code = rest->post_json("api/v1/open", &answer);
}
status = RUNNING;
return OK;
}
void UDPRESTImplementation::stopReceiver(){
FILE_LOG(logINFO) << "called";
if(status == RUNNING)
startReadout();
/**
* while(status == TRANSMITTING)
* usleep(5000);
* This has been changed, you check if all the threads are done processing
* and set the final status
*/
//change status
status = IDLE;
FILE_LOG(logDEBUG1) << "exited, status IDLE";
}
void UDPRESTImplementation::startReadout(){
FILE_LOG(logINFO) << " starting";
status = TRANSMITTING;
//kill udp socket to tell the listening thread to push last packet
shutDownUDPSockets();
FILE_LOG(logDEBUG1) << " done";
}
/* FIXME
* Its also called by TCP in case of illegal shut down such as Ctrl + c.
* Upto you what you want to do with it.
*/
void UDPRESTImplementation::shutDownUDPSockets(){
FILE_LOG(logDEBUG1) << "called";
// this is just to be sure, it could be removed
/*
for(int i=0;i<numListeningThreads;i++){
if(udpSocket[i]){
FILE_LOG(logDEBUG1) << __AT__ << " closing UDP socket #" << i;
udpSocket[i]->ShutDownSocket();
delete udpSocket[i];
udpSocket[i] = NULL;
}
}
*/
JsonBox::Value answer;
int code;
string rest_state = "";
//FILE_LOG(logDEBUG1) << __AT__ << " numListeningThreads=" << numListeningThreads;
if (rest == NULL){
FILE_LOG(logWARNING) << "No REST object initialized, closing...";
//return OK;
}
// getting the state
if (is_main_receiver){
FILE_LOG(logWARNING) << "PLEASE WAIT WHILE CHECKING AND SHUTTING DOWN ALL CONNECTIONS!";
rest_state = get_rest_state(rest);
std::cout << rest_state << std::endl;
while (rest_state != "OPEN"){
rest_state = get_rest_state(rest);
std::cout << rest_state << std::endl;
usleep(1000000);
}
//while (rest_state != "TRANSIENT"){
// rest_state = get_rest_state(rest);
// usleep(10000);
//}
code = rest->post_json("api/v1/close", &answer);
rest_state = get_rest_state(rest);
std::cout << rest_state << std::endl;
while (rest_state != "CLOSED"){
rest_state = get_rest_state(rest);
std::cout << rest_state << std::endl;
usleep(1000000);
}
std::cout << "After close" << rest_state << std::endl;
code = rest->post_json("api/v1/reset", &answer);
//rest_state = get_rest_state(rest);
std::cout << rest_state << std::endl;
std::cout << "After reset" << rest_state << std::endl;
}
status = slsReceiverDefs::RUN_FINISHED;
//LEO: not sure it's needed
//delete rest;
FILE_LOG(logDEBUG1) << "finished";
// Leo: how state is handled now?
//return OK;
}
uint64_t UDPRESTImplementation::getTotalFramesCaught() const{
FILE_LOG(logDEBUG1) << " starting";
return (0);
}
#endif

77
slsReceiverSoftware/src/slsReceiver.cpp
View File

@ -18,51 +18,36 @@ using namespace std;
slsReceiver::slsReceiver(int argc, char *argv[], int &success) {
/**
* Constructor method to start up a Receiver server. Reads configuration file, options, and
* assembles a Receiver using TCP and UDP detector interfaces
*
* @param iarg
*
* @return
*/
slsReceiver::slsReceiver(int argc, char *argv[], int &success):
tcpipInterface (NULL),
udp_interface (NULL)
{
success=OK;
udp_interface = NULL;
tcpipInterface = NULL;
//creating base receiver
// options
map<string, string> configuration_map;
int tcpip_port_no = 1954;
success=OK;
string fname = "";
string udp_interface_type = "standard";
string rest_hostname = "localhost:8081";
udp_interface = NULL;
//parse command line for config
static struct option long_options[] = {
/* These options set a flag. */
// These options set a flag.
//{"verbose", no_argument, &verbose_flag, 1},
/* These options don’t set a flag.
We distinguish them by their indices. */
{"type", required_argument, 0, 't'},
{"config", required_argument, 0, 'f'},
{"rx_tcpport", required_argument, 0, 'b'},
{"rest_hostname", required_argument, 0, 'r'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
// These options don’t set a flag. We distinguish them by their indices.
{"config", required_argument, 0, 'f'},
{"rx_tcpport", required_argument, 0, 't'},
{"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
/* getopt_long stores the option index here. */
// getopt_long stores the option index here.
int option_index = 0;
int c=0;
optind = 1;
while ( c != -1 ){
c = getopt_long (argc, argv, "bfhtr", long_options, &option_index);
c = getopt_long (argc, argv, "hf:t:", long_options, &option_index);
/* Detect the end of the options. */
// Detect the end of the options.
if (c == -1)
break;
@ -75,27 +60,16 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success) {
#endif
break;
case 'b':
case 't':
sscanf(optarg, "%d", &tcpip_port_no);
break;
case 't':
udp_interface_type = optarg;
break;
case 'r':
rest_hostname = optarg;
configuration_map["rest_hostname"] = rest_hostname;
break;
case 'h':
string help_message = """\nSLS Receiver Server\n\n""";
help_message += """usage: slsReceiver --config config_fname [--rx_tcpport port]\n\n""";
help_message += """\t--config:\t configuration filename for SLS Detector receiver\n""";
help_message += """\t--rx_tcpport:\t TCP Communication Port with the client. Default: 1954.\n\n""";
help_message += """\t--rest_hostname:\t Receiver hostname:port. It applies only to REST receivers, and indicates the hostname of the REST backend. Default: localhost:8081.\n\n""";
help_message += """\t--type:\t Type of the receiver. Possible arguments are: standard, REST. Default: standard.\n\n""";
string help_message = "\nSLS Receiver Server\n\n";
help_message += "Usage: slsReceiver [arguments]\nPossible arguments are:\n";
help_message += "\t-f, --config: Configuration filename\n";
help_message += "\t-t, --rx_tcpport: TCP Port with the client. Default: 1954.\n"
"\t Required for multiple receivers\n\n";
FILE_LOG(logINFO) << help_message << endl;
break;
@ -103,9 +77,6 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success) {
}
}
// if required fname parameter not available, fail
//if (fname == "")
// success = FAIL;
if( !fname.empty() ){
try{
FILE_LOG(logINFO) << "config file name " << fname;
@ -119,11 +90,7 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success) {
}
if (success==OK){
FILE_LOG(logINFO) << "SLS Receiver starting " << udp_interface_type << " on port " << tcpip_port_no << endl;
#ifdef REST
udp_interface = UDPInterface::create(udp_interface_type);
udp_interface->configure(configuration_map);
#endif
FILE_LOG(logINFO) << "SLS Receiver starting TCP Server on port " << tcpip_port_no << endl;
tcpipInterface = new slsReceiverTCPIPInterface(success, udp_interface, tcpip_port_no);
}
}

4
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -776,9 +776,8 @@ int slsReceiverTCPIPInterface::set_detector_type(){
break;
}
if(ret == OK) {
#ifndef REST
if(receiverBase == NULL){
receiverBase = UDPInterface::create("standard");
receiverBase = UDPInterface::create();
if(startAcquisitionCallBack)
receiverBase->registerCallBackStartAcquisition(startAcquisitionCallBack,pStartAcquisition);
if(acquisitionFinishedCallBack)
@ -786,7 +785,6 @@ int slsReceiverTCPIPInterface::set_detector_type(){
if(rawDataReadyCallBack)
receiverBase->registerCallBackRawDataReady(rawDataReadyCallBack,pRawDataReady);
}
#endif
myDetectorType = dr;
ret = receiverBase->setDetectorType(myDetectorType);
retval = myDetectorType;