radio95/rds95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/rds95.git synced 2026-02-27 12:53:53 +01:00
Code Issues Wiki Activity

refactor control pipe handling for improved command processing

Browse Source
This commit is contained in:
KubaPro010
2025-03-13 21:08:55 +01:00
parent 1cf52927a5
commit d6cbd8e956
1 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/control_pipe.c
View File

@@ -2,19 +2,13 @@
#include "ascii_cmd.h" #include "ascii_cmd.h"
#include "control_pipe.h" #include "control_pipe.h"
static int fd = -1; static int fd;
static struct pollfd poller; static struct pollfd poller;
/* /*
* Opens a file (pipe) to be used to control the RDS coder. * Opens a file (pipe) to be used to control the RDS coder.
* Returns 0 on success, -1 on failure.
*/ */
int open_control_pipe(char *filename) { int open_control_pipe(char *filename) {
if (!filename) return -1;
// Close existing pipe if open
if (fd >= 0) close(fd);
fd = open(filename, O_RDONLY | O_NONBLOCK); fd = open(filename, O_RDONLY | O_NONBLOCK);
if (fd == -1) return -1; if (fd == -1) return -1;
@@ -32,47 +26,41 @@ int open_control_pipe(char *filename) {
void poll_control_pipe() { void poll_control_pipe() {
static unsigned char pipe_buf[CTL_BUFFER_SIZE]; static unsigned char pipe_buf[CTL_BUFFER_SIZE];
static unsigned char cmd_buf[CMD_BUFFER_SIZE]; static unsigned char cmd_buf[CMD_BUFFER_SIZE];
char *token, *saveptr; struct timeval timeout;
int read_bytes; int ret;
fd_set set;
char *token;
// Return early if file descriptor is invalid FD_ZERO(&set);
if (fd < 0) return; FD_SET(fd, &set);
timeout.tv_sec = 0;
timeout.tv_usec = READ_TIMEOUT_MS * 1000;
// Check for new commands with a single poll call /* check for new commands */
if (poll(&poller, 1, READ_TIMEOUT_MS) <= 0) return; if (poll(&poller, 1, READ_TIMEOUT_MS) <= 0) return;
// Return early if there are no new commands /* return early if there are no new commands */
if (!(poller.revents & POLLIN)) return; if (poller.revents == 0) return;
// Clear buffer before reading
memset(pipe_buf, 0, CTL_BUFFER_SIZE); memset(pipe_buf, 0, CTL_BUFFER_SIZE);
// Read data directly - select is redundant with poll already used above ret = select(fd + 1, &set, NULL, NULL, &timeout);
read_bytes = read(fd, pipe_buf, CTL_BUFFER_SIZE - 1); if (ret == -1 || ret == 0) {
if (read_bytes <= 0) return; return;
} else {
read(fd, pipe_buf, CTL_BUFFER_SIZE - 1);
}
// Ensure null-termination /* handle commands per line this is really good because if were sending text commands very quick after eachother then we can get a rt of for example 'Now its 12:00RT Now its 12:01' */
pipe_buf[read_bytes] = '\0'; token = strtok((char *)pipe_buf, "\n");
/* Process commands line by line */
token = strtok_r((char *)pipe_buf, "\n", &saveptr);
while (token != NULL) { while (token != NULL) {
size_t cmd_len = strlen(token);
if (cmd_len > 0 && cmd_len < CMD_BUFFER_SIZE) {
memset(cmd_buf, 0, CMD_BUFFER_SIZE); memset(cmd_buf, 0, CMD_BUFFER_SIZE);
memcpy(cmd_buf, token, cmd_len); memcpy(cmd_buf, token, CMD_BUFFER_SIZE - 1);
token = strtok(NULL, "\n");
process_ascii_cmd(cmd_buf); process_ascii_cmd(cmd_buf);
} }
token = strtok_r(NULL, "\n", &saveptr);
} }
}
/*
* Closes the control pipe.
*/
void close_control_pipe() { void close_control_pipe() {
if (fd >= 0) { if (fd > 0) close(fd);
close(fd);
fd = -1;
}
} }