detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 04:47:14 +02:00
Code Issues Actions Packages Releases Activity

merge insignificant conflicts

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-10 11:19:36 +02:00
parent 0219d09067 df11f41416
commit 11943c4b5c
5 changed files with 133 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsReceiverSoftware/Makefile
View File

@ -48,6 +48,15 @@ $(info # In slsReceiverSoftware Makefile #)
$(info #######################################)
$(info )
ifeq ($(REST), yes)
$(info )
$(info !#####################################!)
$(info ! PLEASE ENSURE THAT VARIABLES !)
$(info ! POCODIR and JSONBOXDIR !)
$(info ! ARE PROPERLY SETUP!!! !)
$(info !#####################################!)
$(info )
endif
.PHONY: all intdoc package eigerReceiver clean
@ -57,7 +66,6 @@ dummy: $(DESTDIR)/dummyReceiver
intdoc: $(SRC_H) $(SRC_CLNT)
doxygen doxy.config
$(BUILDDIR)/%.o : $(SRCDIR)/%.cpp $(INCDIR)/%.h $(DEPSINCLUDES) Makefile
ifeq ($(ROOTSLS),yes)

1
slsReceiverSoftware/include/UDPRESTImplementation.h
View File

@ -8,6 +8,7 @@
#include "UDPBaseImplementation.h"
#include "RestHelper.h"
#include "logger.h"
#include <string.h>
#include <stdio.h>

2
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@ -1,5 +1,5 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
#define SVNURL "https://git.psi.ch/sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "abdbd15341f292983b3943639c54404c700fbdb8"
//#define SVNREV 0x627

174
slsReceiverSoftware/src/UDPRESTImplementation.cpp
View File

@ -13,6 +13,8 @@
#include <string.h>
#include <stdint.h>
#include <sstream>
#include "logger.h"
//#include "utilities.h"
using namespace std;
@ -24,7 +26,7 @@ using namespace std;
UDPRESTImplementation::UDPRESTImplementation(){
FILE_LOG(logDEBUG) << "PID: " << getpid() << __AT__ << " called";
FILE_LOG(logINFO) << "PID: " + __AT__ + " called";
//TODO I do not really know what to do with bottom...
// Default values
@ -43,20 +45,28 @@ UDPRESTImplementation::~UDPRESTImplementation(){
void UDPRESTImplementation::configure(map<string, string> config_map){
// am I ever getting there?
FILE_LOG(logWARNING) << __AT__ << " called";
FILE_LOG(logINFO) << __AT__ << "configure called";
map<string, string>::const_iterator pos;
pos = config_map.find("rest_hostname");
if (pos != config_map.end() ){
string host_port_str = pos->second;
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;
@ -71,11 +81,13 @@ string UDPRESTImplementation::get_rest_state(RestHelper * rest/*, string *rest_s
JsonBox::Value answer;
string rest_state = "";
int code = rest->get_json("v1/state", &answer);
int code = rest->get_json("api/v1/state", &answer);
if ( code != -1 ){
rest_state = answer["global_state"].getString();
//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;
}
@ -83,8 +95,8 @@ string UDPRESTImplementation::get_rest_state(RestHelper * rest/*, string *rest_s
void UDPRESTImplementation::initialize_REST(){
FILE_LOG(logDEBUG) << __AT__ << " called";
FILE_LOG(logDEBUG) << __AT__ << " REST status is initialized: " << isInitialized;
FILE_LOG(logDEBUG1) << __AT__ << " called";
FILE_LOG(logINFO) << __AT__ << " REST status is initialized: " + std::string(isInitialized ? "True" : "False");
string rest_state = "";
@ -96,19 +108,23 @@ void UDPRESTImplementation::initialize_REST(){
* it i set by the client before calling initialize()
*/
string filename = getFileName();
if (filename.substr(filename.length() - 2) == "d0"){
int code;
//if (filename.substr(filename.length() - 2) == "d0"){
if(detID == 0){
is_main_receiver = true;
}
if (rest_hostname.empty()) {
FILE_LOG(logDEBUG) << __AT__ <<"can't initialize with empty string or NULL for detectorHostname";
FILE_LOG(logWARNING) << __AT__ << "can't initialize with empty string or NULL for detectorHostname";
throw;
}
rest = new RestHelper() ;
rest->init(rest_hostname, rest_port);
//std::cout << rest_hostname << " - " << rest_port << std::endl;
rest->init(rest_hostname);
rest->set_connection_params(1, 3);
int code;
FILE_LOG(logINFO) << "REST init called";
if (!is_main_receiver){
isInitialized = true;
@ -117,29 +133,32 @@ void UDPRESTImplementation::initialize_REST(){
}
if (isInitialized == true) {
FILE_LOG(logDEBUG) << __AT__ << "already initialized, can't initialize several times";
FILE_LOG(logWARNING) << "already initialized, can't initialize several times";
}
else {
FILE_LOG(logDEBUG) << __AT__ << "with receiverHostName=" << rest_hostname << ":" << rest_port;
FILE_LOG(logINFO) << "with receiverHostName=" << rest_hostname;
try{
rest_state = get_rest_state(rest);
if (rest_state == ""){
FILE_LOG(logERROR) << __AT__ << " REST state returned: " << rest_state;
FILE_LOG(logERROR) << " REST state returned: " << rest_state;
throw;
}
else{
isInitialized = true;
status = slsReceiverDefs::IDLE;
}
FILE_LOG(logDEBUG) << __func__ << "Answer: " << answer;
FILE_LOG(logDEBUG1) << "Answer: " << answer;
}
catch(std::string e){
FILE_LOG(logERROR) << __func__ << ": " << 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");
@ -156,22 +175,22 @@ void UDPRESTImplementation::initialize_REST(){
rest_state = get_rest_state(rest);
//code = rest->get_json("v1/state", &answer);
FILE_LOG(logDEBUG) << __AT__ << " state got " << code << " " << answer << "\n";
//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("v1/state/initialize", &answer, test);
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("v1/state/configure", &answer, test);
code = rest->post_json("api/v1/configure", &answer, test);
}
FILE_LOG(logDEBUG) << __AT__ << " state/configure got " << code;
//FILE_LOG(logDEBUG1) << " state/configure got " + std::string(code);
rest_state = get_rest_state(rest);
FILE_LOG(logDEBUG) << __AT__ << " state got " << rest_state << "\n";
FILE_LOG(logINFO) << " state got " + std::string(rest_state) << "\n";
/*
@ -181,7 +200,7 @@ void UDPRESTImplementation::initialize_REST(){
std::cout << "JSON " << json_value["status"] << std::endl;
*/
}
FILE_LOG(logDEBUG) << __func__ << ": initialize() done";
FILE_LOG(logDEBUG1) << ": configure() done";
}
@ -194,9 +213,9 @@ void UDPRESTImplementation::initialize_REST(){
int UDPRESTImplementation::startReceiver(char message[]){
//int i;
FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " starting";
FILE_LOG(logINFO) << __AT__ << " starting";
initialize_REST();
FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " initialized";
FILE_LOG(logINFO) << __AT__ << " initialized";
std::string answer;
int code;
@ -210,19 +229,22 @@ int UDPRESTImplementation::startReceiver(char message[]){
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 + "}}";
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(logDEBUG) << __FILE__ << "::" << " sending this configuration body: " << request_body;
code = rest->post_json("v1/state/configure", &answer, request_body);
code = rest->get_json("v1/state", &answer);
FILE_LOG(logDEBUG) << __FILE__ << "::" << " got: " << answer;
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("v1/state/open", &answer);
code = rest->post_json("api/v1/open", &answer);
}
status = RUNNING;
@ -235,7 +257,7 @@ int UDPRESTImplementation::startReceiver(char message[]){
void UDPRESTImplementation::stopReceiver(){
FILE_LOG(logDEBUG) << __AT__ << "called";
FILE_LOG(logINFO) << "called";
if(status == RUNNING)
startReadout();
@ -251,7 +273,8 @@ void UDPRESTImplementation::stopReceiver(){
//change status
status = IDLE;
FILE_LOG(logDEBUG) << __AT__ << "exited, status " << endl;
FILE_LOG(logDEBUG1) << "exited, status IDLE";
}
@ -259,13 +282,13 @@ void UDPRESTImplementation::stopReceiver(){
void UDPRESTImplementation::startReadout(){
FILE_LOG(logDEBUG) << __AT__ << " starting";
FILE_LOG(logINFO) << " starting";
status = TRANSMITTING;
//kill udp socket to tell the listening thread to push last packet
shutDownUDPSockets();
FILE_LOG(logDEBUG) << __FILE__ << "::" << __func__ << " done";
status = TRANSMITTING;
//kill udp socket to tell the listening thread to push last packet
shutDownUDPSockets();
FILE_LOG(logDEBUG1) << " done";
}
@ -279,13 +302,13 @@ void UDPRESTImplementation::startReadout(){
*/
void UDPRESTImplementation::shutDownUDPSockets(){
FILE_LOG(logDEBUG) << __AT__ << "called";
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(logDEBUG) << __AT__ << " closing UDP socket #" << i;
FILE_LOG(logDEBUG1) << __AT__ << " closing UDP socket #" << i;
udpSocket[i]->ShutDownSocket();
delete udpSocket[i];
udpSocket[i] = NULL;
@ -296,10 +319,10 @@ void UDPRESTImplementation::shutDownUDPSockets(){
int code;
string rest_state = "";
//FILE_LOG(logDEBUG) << __AT__ << " numListeningThreads=" << numListeningThreads;
//FILE_LOG(logDEBUG1) << __AT__ << " numListeningThreads=" << numListeningThreads;
if (rest == NULL){
FILE_LOG(logWARNING) << __AT__ << "No REST object initialized, closing...";
return;
FILE_LOG(logWARNING) << "No REST object initialized, closing...";
//return OK;
}
// getting the state
@ -307,34 +330,77 @@ void UDPRESTImplementation::shutDownUDPSockets(){
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);
usleep(10000);
std::cout << rest_state << std::endl;
usleep(1000000);
}
//while (rest_state != "TRANSIENT"){
// rest_state = get_rest_state(rest);
// usleep(10000);
//}
code = rest->post_json("v1/state/close", &answer);
code = rest->post_json("v1/state/reset", &answer);
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 << 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(logDEBUG) << __AT__ << "finished";
FILE_LOG(logDEBUG1) << "finished";
// Leo: how state is handled now?
//return OK;
}
/* FIXME
* do you really need this, this is called if registerDataCallback() is activated
* in your gui to get data from receiver. you probably have a different way
* of reconstructing complete data set from all receivers
*/
/*
void UDPRESTImplementation::readFrame(char* c,char** raw, uint64_t &startAcq, uint64_t &startFrame){
FILE_LOG(logDEBUG1) << " called";
strcpy(c,"");
*raw = NULL;
>>>>>>> 3.0-rcrest
}
*/
/* FIXME
* Its called by TCP in case of illegal shut down such as Ctrl + c.
* Upto you what you want to do with it.
*/
// Leo: not in the base class
/*
void UDPRESTImplementation::closeFiles(){
FILE_LOG(logDEBUG1) << "called for thread ";
FILE_LOG(logDEBUG1) << "exited for thread ";
}
*/
uint64_t UDPRESTImplementation::getTotalFramesCaught() const{
FILE_LOG(logDEBUG) << __AT__ << " starting";
FILE_LOG(logDEBUG1) << " starting";
return (0);
}

4
slsReceiverSoftware/src/slsReceiver.cpp
View File

@ -58,7 +58,7 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success) {
int option_index = 0;
int c=0;
optind = 1;
while ( c != -1 ){
c = getopt_long (argc, argv, "bfhtr", long_options, &option_index);
@ -85,6 +85,7 @@ slsReceiver::slsReceiver(int argc, char *argv[], int &success) {
case 'r':
rest_hostname = optarg;
configuration_map["rest_hostname"] = rest_hostname;
break;
case 'h':
@ -105,7 +106,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;