detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
Erik Frojdh 2019-05-28 13:27:43 +02:00
parent e64f57ecac
commit 8f4009bfb6
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -111,7 +111,8 @@ void slsReceiverTCPIPInterface::startTCPServer() {
while (true) {
try {
auto socket = server->accept();
socket.setReceiveTimeout(static_cast<int>(5E6));
constexpr int time_us = 5000000;
socket.setReceiveTimeout(time_us);
ret = decode_function(socket);
// if tcp command was to exit server

6
slsSupportLib/include/DataSocket.h
View File

@ -18,9 +18,9 @@ class DataSocket {
int getSocketId() const {
return socketId_;
}
size_t sendData(const void *buffer, size_t size);
size_t receiveData(void *buffer, size_t size);
ssize_t read(void *buffer, size_t size);
int sendData(const void *buffer, size_t size);
int receiveData(void *buffer, size_t size);
int read(void *buffer, size_t size);
int setTimeOut(int t_seconds);
int setReceiveTimeout(int us);
void close();

8
slsSupportLib/src/DataSocket.cpp
View File

@ -40,7 +40,7 @@ DataSocket &DataSocket::operator=(DataSocket &&move) noexcept {
return *this;
}
size_t DataSocket::receiveData(void *buffer, size_t size) {
int DataSocket::receiveData(void *buffer, size_t size) {
size_t dataRead = 0;
while (dataRead < size) {
dataRead +=
@ -50,7 +50,7 @@ size_t DataSocket::receiveData(void *buffer, size_t size) {
return dataRead;
}
ssize_t DataSocket::read(void *buffer, size_t size){
int DataSocket::read(void *buffer, size_t size){
return ::read(getSocketId(), reinterpret_cast<char *>(buffer), size);
}
@ -63,8 +63,8 @@ int DataSocket::setReceiveTimeout(int us) {
}
size_t DataSocket::sendData(const void *buffer, size_t size) {
size_t dataSent = 0;
int DataSocket::sendData(const void *buffer, size_t size) {
int dataSent = 0;
while (dataSent < size) {
dataSent +=
write(getSocketId(), reinterpret_cast<const char *>(buffer) + dataSent,