radio95/rds95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/rds95.git synced 2026-07-31 09:19:15 +02:00
Code Issues Wiki Activity

try to optimize control_pipe.c

Browse Source
This commit is contained in:
kuba
2025-03-13 21:19:29 +01:00
parent 0ed934efe1
commit 60769e935b
1 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/control_pipe.c
+31 -40
View File
@@ -9,14 +9,13 @@ 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.
*/ */
int open_control_pipe(char *filename) { int open_control_pipe(char *filename) {
fd = open(filename, O_RDONLY | O_NONBLOCK); fd = open(filename, O_RDONLY | O_NONBLOCK);
if (fd == -1) return -1; if (fd == -1) return -1;
/* setup the poller */ /* setup the poller */
poller.fd = fd; poller.fd = fd;
poller.events = POLLIN; poller.events = POLLIN;
return 0;
return 0;
} }
/* /*
@@ -24,43 +23,35 @@ int open_control_pipe(char *filename) {
* calls process_ascii_cmd. * calls process_ascii_cmd.
*/ */
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];
struct timeval timeout; int bytes_read;
int ret; char *token;
fd_set set;
char *token;
FD_ZERO(&set); /* check for new commands - return early if none */
FD_SET(fd, &set); if (poll(&poller, 1, READ_TIMEOUT_MS) <= 0) return;
timeout.tv_sec = 0; if (!(poller.revents & POLLIN)) return;
timeout.tv_usec = READ_TIMEOUT_MS * 1000;
/* check for new commands */ /* read data from pipe */
if (poll(&poller, 1, READ_TIMEOUT_MS) <= 0) return; memset(pipe_buf, 0, CTL_BUFFER_SIZE);
bytes_read = read(fd, pipe_buf, CTL_BUFFER_SIZE - 1);
/* return early if there are no new commands */ if (bytes_read <= 0) return;
if (poller.revents == 0) return;
memset(pipe_buf, 0, CTL_BUFFER_SIZE); /* process each command line */
token = strtok((char *)pipe_buf, "\n");
ret = select(fd + 1, &set, NULL, NULL, &timeout); while (token != NULL) {
if (ret == -1 || ret == 0) { size_t cmd_len = strlen(token);
return; if (cmd_len > 0 && cmd_len < CMD_BUFFER_SIZE) {
} else { memset(cmd_buf, 0, CMD_BUFFER_SIZE);
read(fd, pipe_buf, CTL_BUFFER_SIZE - 1); strncpy((char *)cmd_buf, token, CMD_BUFFER_SIZE - 1);
} process_ascii_cmd(cmd_buf);
}
/* 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' */ token = strtok(NULL, "\n");
token = strtok((char *)pipe_buf, "\n"); }
while (token != NULL) {
memset(cmd_buf, 0, CMD_BUFFER_SIZE);
memcpy(cmd_buf, token, CMD_BUFFER_SIZE - 1);
token = strtok(NULL, "\n");
process_ascii_cmd(cmd_buf);
}
} }
void close_control_pipe() { void close_control_pipe() {
if (fd > 0) close(fd); if (fd > 0) close(fd);
fd = -1;
} }