Jeroen Vreeken
10 months ago
23 changed files with 222 additions and 621 deletions
Split View
Diff Options
-
+3 -4Makefile.am
-
+7 -0configure.ac
-
+1 -0dml/dml.h
-
+2 -1dml/dml_connection.h
-
+0 -45dml/dml_poll.h
-
+3 -1dml/dml_server.h
-
+11 -8dml_client.c
-
+17 -11dml_connection.c
-
+10 -18dml_fprs_db.c
-
+5 -8dml_host.c
-
+24 -20dml_httpd.c
-
+1 -2dml_list.c
-
+0 -339dml_poll.c
-
+14 -23dml_reflector.c
-
+8 -7dml_server.c
-
+2 -2dml_stream_client.c
-
+1 -2dml_stream_client_codec2.c
-
+11 -15dml_stream_client_simple.c
-
+12 -12dml_streamer.c
-
+28 -35dml_trx.c
-
+28 -31dmld.c
-
+13 -14fprs_aprsis.c
-
+21 -23trx_dv.c
+ 3
- 4
Makefile.am
View File
+ 7
- 0
configure.ac
View File
+ 1
- 0
dml/dml.h
View File
+ 2
- 1
dml/dml_connection.h
View File
+ 0
- 45
dml/dml_poll.h
View File
| @ -1,45 +0,0 @@ | |||
| /* | |||
| Copyright Jeroen Vreeken (jeroen@vreeken.net), 2015 | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 3 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #ifndef _INCLUDE_DML_POLL_H_ | |||
| #define _INCLUDE_DML_POLL_H_ | |||
| #include <time.h> | |||
| #include <stdbool.h> | |||
| #include <poll.h> | |||
| int dml_poll_add(void *arg, | |||
| int (*in_cb)(void *arg), | |||
| int (*out_cb)(void *arg), | |||
| int (*time_cb)(void *arg) | |||
| ); | |||
| int dml_poll_add_multiple(void *arg, | |||
| int (*in_cb)(void *arg), | |||
| int (*out_cb)(void *arg), | |||
| int (*time_cb)(void *arg), | |||
| short (*revents_cb)(void *arg, struct pollfd *fds, int count), | |||
| int nr_fds, | |||
| struct pollfd **fds | |||
| ); | |||
| int dml_poll_remove(void *arg); | |||
| int dml_poll_fd_set(void *arg, int fd); | |||
| int dml_poll_in_set(void *arg, bool enable); | |||
| int dml_poll_out_set(void *arg, bool enable); | |||
| int dml_poll_timeout(void *arg, struct timespec *ts); | |||
| int dml_poll_loop(void); | |||
| #endif /* _INCLUDE_DML_POLL_H_ */ | |||
+ 3
- 1
dml/dml_server.h
View File
+ 11
- 8
dml_client.c
View File
+ 17
- 11
dml_connection.c
View File
+ 10
- 18
dml_fprs_db.c
View File
+ 5
- 8
dml_host.c
View File
+ 24
- 20
dml_httpd.c
View File
+ 1
- 2
dml_list.c
View File
+ 0
- 339
dml_poll.c
View File
| @ -1,339 +0,0 @@ | |||
| /* | |||
| Copyright Jeroen Vreeken (jeroen@vreeken.net), 2015 | |||
| This program is free software: you can redistribute it and/or modify | |||
| it under the terms of the GNU General Public License as published by | |||
| the Free Software Foundation, either version 3 of the License, or | |||
| (at your option) any later version. | |||
| This program is distributed in the hope that it will be useful, | |||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| GNU General Public License for more details. | |||
| You should have received a copy of the GNU General Public License | |||
| along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
| #include <dml/dml_poll.h> | |||
| #include <poll.h> | |||
| #include <stdlib.h> | |||
| #include <stdio.h> | |||
| #include <string.h> | |||
| #include <stdint.h> | |||
| //#define DEBUG_T | |||
| struct dml_poll { | |||
| struct dml_poll *next; | |||
| int pfd_nr; | |||
| int pfd_size; | |||
| bool use_revents_cb; | |||
| void *arg; | |||
| int (*in_cb)(void *arg); | |||
| int (*out_cb)(void *arg); | |||
| int (*time_cb)(void *arg); | |||
| struct timespec timeout; | |||
| short (*revents_cb)(void *arg, struct pollfd *fds, int count); | |||
| }; | |||
| static struct dml_poll *dml_poll_list; | |||
| static struct pollfd *pfds = NULL; | |||
| static nfds_t nfds = 0; | |||
| int dml_poll_add(void *arg, | |||
| int (*in_cb)(void *arg), | |||
| int (*out_cb)(void *arg), | |||
| int (*time_cb)(void *arg) | |||
| ) | |||
| { | |||
| struct dml_poll *dp; | |||
| int pfd_nr; | |||
| // printf("+add: %p\n", arg); | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| if (dp->arg == arg) | |||
| break; | |||
| } | |||
| if (!dp) { | |||
| pfds = realloc(pfds, sizeof(struct pollfd) * (nfds + 1)); | |||
| pfd_nr = nfds; | |||
| memset(pfds + pfd_nr, 0, sizeof(struct pollfd)); | |||
| pfds[pfd_nr].fd = -1; | |||
| nfds++; | |||
| dp = calloc(1, sizeof(struct dml_poll)); | |||
| dp->pfd_nr = pfd_nr; | |||
| dp->pfd_size = 1; | |||
| dp->arg = arg; | |||
| dp->next = dml_poll_list; | |||
| dml_poll_list = dp; | |||
| } | |||
| dp->in_cb = in_cb; | |||
| dp->out_cb = out_cb; | |||
| dp->time_cb = time_cb; | |||
| // printf("=add: %p\n", dp); | |||
| return 0; | |||
| } | |||
| int dml_poll_add_multiple(void *arg, | |||
| int (*in_cb)(void *arg), | |||
| int (*out_cb)(void *arg), | |||
| int (*time_cb)(void *arg), | |||
| short (*revents_cb)(void *arg, struct pollfd *fds, int count), | |||
| int nr_fds, | |||
| struct pollfd **fds | |||
| ) | |||
| { | |||
| struct dml_poll *dp; | |||
| int pfd_nr; | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| if (dp->arg == arg) | |||
| break; | |||
| } | |||
| if (!dp) { | |||
| int i; | |||
| pfds = realloc(pfds, sizeof(struct pollfd) * (nfds + nr_fds)); | |||
| pfd_nr = nfds; | |||
| memset(pfds + pfd_nr, 0, sizeof(struct pollfd) * nr_fds); | |||
| for (i = 0; i < nr_fds; i++) | |||
| pfds[pfd_nr + i].fd = -1; | |||
| *fds = pfds + pfd_nr; | |||
| nfds += nr_fds; | |||
| dp = calloc(1, sizeof(struct dml_poll)); | |||
| dp->pfd_nr = pfd_nr; | |||
| dp->pfd_size = nr_fds; | |||
| dp->arg = arg; | |||
| dp->use_revents_cb = true; | |||
| dp->next = dml_poll_list; | |||
| dml_poll_list = dp; | |||
| } | |||
| dp->in_cb = in_cb; | |||
| dp->out_cb = out_cb; | |||
| dp->time_cb = time_cb; | |||
| dp->revents_cb = revents_cb; | |||
| // printf("=add: %p\n", dp); | |||
| return 0; | |||
| } | |||
| int dml_poll_remove(void *arg) | |||
| { | |||
| struct dml_poll **dp; | |||
| int pfd_nr = -1; | |||
| int pfd_size = 0; | |||
| for (dp = &dml_poll_list; *dp; dp = &(*dp)->next) { | |||
| if ((*dp)->arg == arg) { | |||
| struct dml_poll *old = *dp; | |||
| pfd_nr = old->pfd_nr; | |||
| pfd_size = old->pfd_size; | |||
| *dp = old->next; | |||
| free(old); | |||
| break; | |||
| } | |||
| } | |||
| // printf("remove prd_nr %d %d\n", (int)pfd_nr, (int) nfds); | |||
| if (pfd_nr < 0) | |||
| return 0; | |||
| for (dp = &dml_poll_list; *dp; dp = &(*dp)->next) { | |||
| // printf("- %p %d\n", *dp, (*dp)->pfd_nr); | |||
| if ((*dp)->pfd_nr > pfd_nr) | |||
| (*dp)->pfd_nr -= pfd_size; | |||
| } | |||
| memmove(pfds + pfd_nr, pfds + pfd_nr + pfd_size, sizeof(*pfds) * (nfds - pfd_nr - pfd_size)); | |||
| nfds -= pfd_size; | |||
| pfds = realloc(pfds, sizeof(*pfds) * nfds); | |||
| return 0; | |||
| } | |||
| int dml_poll_fd_set(void *arg, int fd) | |||
| { | |||
| struct dml_poll *dp; | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| if (dp->arg == arg) | |||
| pfds[dp->pfd_nr].fd = fd; | |||
| } | |||
| return 0; | |||
| } | |||
| int dml_poll_in_set(void *arg, bool enable) | |||
| { | |||
| struct dml_poll *dp; | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| if (dp->arg == arg) { | |||
| pfds[dp->pfd_nr].events &= ~POLLIN; | |||
| pfds[dp->pfd_nr].events |= enable ? POLLIN : 0; | |||
| } | |||
| } | |||
| return 0; | |||
| } | |||
| int dml_poll_out_set(void *arg, bool enable) | |||
| { | |||
| struct dml_poll *dp; | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| if (dp->arg == arg) { | |||
| pfds[dp->pfd_nr].events &= ~POLLOUT; | |||
| pfds[dp->pfd_nr].events |= enable ? POLLOUT : 0; | |||
| } | |||
| } | |||
| return 0; | |||
| } | |||
| int dml_poll_timeout(void *arg, struct timespec *ts) | |||
| { | |||
| struct dml_poll *dp; | |||
| struct timespec now; | |||
| clock_gettime(CLOCK_MONOTONIC, &now); | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| if (dp->arg == arg) { | |||
| if (!ts->tv_sec && !ts->tv_nsec) { | |||
| dp->timeout.tv_sec = 0; | |||
| return 0; | |||
| } | |||
| dp->timeout.tv_sec = ts->tv_sec + now.tv_sec; | |||
| dp->timeout.tv_nsec = ts->tv_nsec + now.tv_nsec; | |||
| if (dp->timeout.tv_nsec >= 1000000000) { | |||
| dp->timeout.tv_nsec -= 1000000000; | |||
| dp->timeout.tv_sec++; | |||
| } | |||
| // printf("set timeout %d %d\n", (int)dp->timeout.tv_sec, (int)dp->timeout.tv_nsec); | |||
| return 0; | |||
| } | |||
| } | |||
| return 0; | |||
| } | |||
| #ifdef DEBUG_T | |||
| static struct timespec dml_poll_t; | |||
| static double t_max = 0; | |||
| static void dml_poll_tstart(void) | |||
| { | |||
| clock_gettime(CLOCK_MONOTONIC, &dml_poll_t); | |||
| } | |||
| static void dml_poll_tend(char *name) | |||
| { | |||
| struct timespec t; | |||
| clock_gettime(CLOCK_MONOTONIC, &t); | |||
| double dur = t.tv_sec - dml_poll_t.tv_sec; | |||
| dur += (double)(t.tv_nsec - dml_poll_t.tv_nsec) / 1000000000.0; | |||
| if (dur > t_max || dur > 0.002) { | |||
| t_max = dur; | |||
| printf("dml_poll callback '%s' duration: %f\n", name, dur); | |||
| } | |||
| } | |||
| #else | |||
| static void dml_poll_tstart(void) | |||
| { | |||
| } | |||
| static void dml_poll_tend(char *name) | |||
| { | |||
| } | |||
| #endif | |||
| int dml_poll_loop(void) | |||
| { | |||
| do { | |||
| int64_t t = 0; | |||
| struct dml_poll *dp; | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| if (dp->timeout.tv_sec) { | |||
| int64_t dptimeout = (int64_t)dp->timeout.tv_sec * 1000; | |||
| dptimeout += ((int64_t)dp->timeout.tv_nsec + 999999) / 1000000; | |||
| if (t) | |||
| t = t > dptimeout ? dptimeout : t; | |||
| else | |||
| t = dptimeout; | |||
| } | |||
| // printf("%d %d\n", (int)dp->timeout, (int)t); | |||
| } | |||
| int timeout; | |||
| if (t) { | |||
| struct timespec now; | |||
| clock_gettime(CLOCK_MONOTONIC, &now); | |||
| t -= (int64_t)now.tv_sec * 1000; | |||
| t -= (int64_t)now.tv_nsec / 1000000; | |||
| timeout = t; | |||
| if (timeout < 0) | |||
| timeout = 0; | |||
| } else { | |||
| timeout = -1; | |||
| } | |||
| // printf("Poll with %d fds and timeout: %d\n", (int)nfds, timeout); | |||
| poll(pfds, nfds, timeout); | |||
| for (dp = dml_poll_list; dp; dp = dp->next) { | |||
| struct pollfd *p = &pfds[dp->pfd_nr]; | |||
| // printf("%p %p nr: %d fd: %d\n", dp, dp->arg, (int)dp->pfd_nr, p->fd); | |||
| if (p->fd >= 0) { | |||
| short revents; | |||
| if (!dp->use_revents_cb) { | |||
| revents = p->revents; | |||
| } else { | |||
| dml_poll_tstart(); | |||
| revents = dp->revents_cb(dp->arg, p, dp->pfd_size); | |||
| dml_poll_tend("revents_cb"); | |||
| } | |||
| // printf("%p %d: %x %x\n", dp, dp->pfd_nr, p->revents, p->events); | |||
| if (revents & POLLIN) { | |||
| dml_poll_tstart(); | |||
| dp->in_cb(dp->arg); | |||
| dml_poll_tend("in_cb"); | |||
| break; | |||
| } | |||
| if (revents & POLLOUT) { | |||
| dml_poll_tstart(); | |||
| dp->out_cb(dp->arg); | |||
| dml_poll_tend("out_cb"); | |||
| break; | |||
| } | |||
| } | |||
| if (dp->timeout.tv_sec) { | |||
| struct timespec now; | |||
| clock_gettime(CLOCK_MONOTONIC, &now); | |||
| if (dp->timeout.tv_sec < now.tv_sec || | |||
| (dp->timeout.tv_sec == now.tv_sec && | |||
| dp->timeout.tv_nsec <= now.tv_nsec)) { | |||
| dp->timeout.tv_sec = 0; | |||
| dml_poll_tstart(); | |||
| dp->time_cb(dp->arg); | |||
| dml_poll_tend("time_cb"); | |||
| break; | |||
| } | |||
| } | |||
| } | |||
| } while (1); | |||
| return 0; | |||
| } | |||