Skip to content

couple of mini bug fixes #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nesnes merged 2 commits into from
Apr 30, 2026
Merged

couple of mini bug fixes #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0777cad
couple of mini bug fixes
trns1997 Apr 24, 2026
febf624
fire and forget mechanism
trns1997 Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions clients/cpp/Telecmd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define TELECMD_INPUT_BUFFER_SIZE 1024
class Telecmd {
public:
Telecmd(std::string address) : address_(address)
Telecmd(std::string address) : sockfd_(-1), sockfdOut_(-1), address_(address)
{
#ifdef TELECMD_DISABLE
return ;
Expand All @@ -37,9 +37,9 @@ class Telecmd {
serv_.sin_port = htons(47268);

// Set addr reuse
uint8_t yes = 1;
setsockopt(sockfd_, SOL_SOCKET, SO_REUSEADDR, (char*) &yes, sizeof(yes));
setsockopt(sockfd_, SOL_SOCKET, SO_REUSEPORT, (const char*)&yes, sizeof(yes));
int yes = 1;
setsockopt(sockfd_, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
setsockopt(sockfd_, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes));

// Set socket timeout
struct timeval timeout;
Expand All @@ -61,7 +61,13 @@ class Telecmd {
std::cout << "Telecmd init failed" <<std::endl;
}
};
~Telecmd() = default;
~Telecmd() {
#ifdef TELECMD_DISABLE
return;
#endif
if (sockfd_ >= 0) { (void)::close(sockfd_); sockfd_ = -1; }
if (sockfdOut_ >= 0) { (void)::close(sockfdOut_); sockfdOut_ = -1; }
}

// Static localhost instance
static Telecmd &localhost() {static Telecmd telecmd("127.0.0.1"); return telecmd;}
Expand Down Expand Up @@ -97,7 +103,7 @@ class Telecmd {
{
cmdList += registeredCmd.first + "|";
}
sendto(sockfdOut_, cmdList.c_str(), cmdList.size(), MSG_CONFIRM, (const struct sockaddr *) &servOut_, sizeof(servOut_));
sendto(sockfdOut_, cmdList.c_str(), cmdList.size(), 0, (const struct sockaddr *) &servOut_, sizeof(servOut_));
}

void parseFunctionCall(std::string const& cmd) {
Expand Down
29 changes: 20 additions & 9 deletions clients/cpp/Teleplot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@
#define TELEPLOT_H

#include <iostream>
#include <iomanip>
#include <iomanip>
#include <arpa/inet.h>
#include <cerrno>
#include <fcntl.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <sstream>
#include <sstream>
#include <map>
#include <chrono>

Expand Down Expand Up @@ -199,7 +201,8 @@ class ShapeTeleplot {
class Teleplot {
public:
Teleplot(std::string address, unsigned int port=47269, unsigned int bufferingFrequencyHz = 30)
: address_(address)
: sockfd_(-1)
, address_(address)
, bufferingFrequencyHz_(bufferingFrequencyHz)
{
#ifdef TELEPLOT_DISABLE
Expand All @@ -210,8 +213,17 @@ class Teleplot {
serv_.sin_family = AF_INET;
serv_.sin_port = htons(port);
serv_.sin_addr.s_addr = inet_addr(address_.c_str());
if (sockfd_ >= 0) {
int fl = fcntl(sockfd_, F_GETFL, 0);
if (fl >= 0) (void)fcntl(sockfd_, F_SETFL, fl | O_NONBLOCK);
}
};
~Teleplot() = default;
~Teleplot() {
#ifdef TELEPLOT_DISABLE
return;
#endif
if (sockfd_ >= 0) { (void)::close(sockfd_); sockfd_ = -1; }
}

// Static localhost instance
static Teleplot &localhost() {static Teleplot teleplot("127.0.0.1"); return teleplot;}
Expand Down Expand Up @@ -258,8 +270,8 @@ class Teleplot {
if(updateTimestampsUs_.find(key) == updateTimestampsUs_.end()) {
return true;
}
int64_t elasped = nowUs - updateTimestampsUs_[key];
if(elasped >= static_cast<int64_t>(1e6/frequency)) {
int64_t elapsed = nowUs - updateTimestampsUs_[key];
if(elapsed >= static_cast<int64_t>(1e6/frequency)) {
return true;
}
return false;
Expand Down Expand Up @@ -353,8 +365,8 @@ class Teleplot {
void flushBuffer(std::string const& key, std::string const& flags, std::string unit, bool force, bool is3D = false) {
// Flush the buffer if the frequency is reached
int64_t nowUs = std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::system_clock::now()).time_since_epoch().count();
int64_t elasped = nowUs - bufferingFlushTimestampsUs_[key];
if(force || elasped >= static_cast<int64_t>(1e6/bufferingFrequencyHz_)) {
int64_t elapsed = nowUs - bufferingFlushTimestampsUs_[key];
if(force || elapsed >= static_cast<int64_t>(1e6/bufferingFrequencyHz_)) {
emit(formatPacket(key, bufferingMap_[key], flags, unit, is3D));
bufferingMap_[key].clear();
bufferingFlushTimestampsUs_[key] = nowUs;
Expand All @@ -373,7 +385,6 @@ class Teleplot {
std::string address_;
sockaddr_in serv_;
unsigned int bufferingFrequencyHz_;
int64_t lastBufferingFlushTimestampUs_=0;
};

#endif