From 8ca955f371f0f82d4425bc63e25ae286b403c040 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Sun, 20 Mar 2016 19:44:57 +0100
Subject: [PATCH] better forwarder
---
tracer/defs.h | 3 +++
tracer/forward.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
tracer/main.c | 37 +++++++++++++++++++++++++++++---
tracer/plot.c | 18 ----------------
4 files changed, 92 insertions(+), 21 deletions(-)
diff --git a/tracer/defs.h b/tracer/defs.h
index d9074d35d7..69b379ce0b 100644
--- a/tracer/defs.h
+++ b/tracer/defs.h
@@ -6,6 +6,8 @@
#define PLOT_IQ_POINTS 1
#define PLOT_MINMAX 2
+void new_thread(void *(*f)(void *), void *data);
+
/* ... is { int count; int type; char *color; } for 'nplots' plots */
void *make_plot(int width, int height, char *title, int nplots, ...);
void plot_set(void *plot, float *data, int len, int pos, int pp);
@@ -23,5 +25,6 @@ void on_off(void *d, char *item, int *a, int onoff);
void *forwarder(char *ip, int port);
void forward(void *forwarder, char *buf, int size);
+void forward_start_client(void *forwarder, int socket);
#endif /* _TRACER_DEFS_H_ */
diff --git a/tracer/forward.c b/tracer/forward.c
index 9e0df61fbf..cfb837f9e5 100644
--- a/tracer/forward.c
+++ b/tracer/forward.c
@@ -4,11 +4,60 @@
#include <netinet/ip.h>
#include <arpa/inet.h>
#include <unistd.h>
+#include <pthread.h>
typedef struct {
int s;
+ int sc;
+ pthread_mutex_t lock;
} forward_data;
+static void do_forward(forward_data *f, int from, int to, int lock)
+{
+ int l, len;
+ char *b;
+ char buf[1024];
+ while (1) {
+ len = read(from, buf, 1024);
+ if (len <= 0) break;
+ b = buf;
+
+ if (lock) if (pthread_mutex_lock(&f->lock)) abort();
+
+ while (len) {
+ l = write(to, b, len);
+ if (l <= 0) break;
+ len -= l;
+ b += l;
+ }
+
+ if (lock) if (pthread_mutex_unlock(&f->lock)) abort();
+ }
+}
+
+static void *forward_s_to_sc(void *_f)
+{
+ forward_data *f = _f;
+ do_forward(f, f->s, f->sc, 0);
+ return NULL;
+}
+
+static void *forward_sc_to_s(void *_f)
+{
+ forward_data *f = _f;
+ do_forward(f, f->sc, f->s, 1);
+ printf("INFO: forwarder exits\n");
+ return NULL;
+}
+
+void forward_start_client(void *_f, int s)
+{
+ forward_data *f = _f;
+ f->sc = s;
+ new_thread(forward_s_to_sc, f);
+ new_thread(forward_sc_to_s, f);
+}
+
void *forwarder(char *ip, int port)
{
forward_data *f;
@@ -16,6 +65,8 @@ void *forwarder(char *ip, int port)
f = malloc(sizeof(*f)); if (f == NULL) abort();
+ pthread_mutex_init(&f->lock, NULL);
+
f->s = socket(AF_INET, SOCK_STREAM, 0);
if (f->s == -1) { perror("socket"); exit(1); }
@@ -33,10 +84,14 @@ void forward(void *_forwarder, char *buf, int size)
{
forward_data *f = _forwarder;
+ if (pthread_mutex_lock(&f->lock)) abort();
+
while (size) {
int l = write(f->s, buf, size);
if (l <= 0) { printf("forward error\n"); exit(1); }
size -= l;
buf += l;
}
+
+ if (pthread_mutex_unlock(&f->lock)) abort();
}
diff --git a/tracer/main.c b/tracer/main.c
index ba6dc043c3..317644f5a5 100644
--- a/tracer/main.c
+++ b/tracer/main.c
@@ -8,6 +8,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <math.h>
+#include <pthread.h>
#include "defs.h"
@@ -368,6 +369,23 @@ void init_shm(void)
#endif /* T_USE_SHARED_MEMORY */
+void new_thread(void *(*f)(void *), void *data)
+{
+ pthread_t t;
+ pthread_attr_t att;
+
+ if (pthread_attr_init(&att))
+ { fprintf(stderr, "pthread_attr_init err\n"); exit(1); }
+ if (pthread_attr_setdetachstate(&att, PTHREAD_CREATE_DETACHED))
+ { fprintf(stderr, "pthread_attr_setdetachstate err\n"); exit(1); }
+ if (pthread_attr_setstacksize(&att, 10000000))
+ { fprintf(stderr, "pthread_attr_setstacksize err\n"); exit(1); }
+ if (pthread_create(&t, &att, f, data))
+ { fprintf(stderr, "pthread_create err\n"); exit(1); }
+ if (pthread_attr_destroy(&att))
+ { fprintf(stderr, "pthread_attr_destroy err\n"); exit(1); }
+}
+
void usage(void)
{
printf(
@@ -473,6 +491,8 @@ int main(int n, char **v)
if (remote_local) f = forwarder(remote_ip, remote_port);
#endif
+ if (remote_local) goto no_database;
+
if (database_filename == NULL) {
printf("ERROR: provide a database file (-d)\n");
exit(1);
@@ -485,6 +505,10 @@ int main(int n, char **v)
if (do_list_groups) { list_groups(database); return 0; }
if (do_dump_database) { dump_database(database); return 0; }
+ for (i = 0; i < on_off_n; i++)
+ on_off(database, on_off_name[i], is_on, on_off_action[i]);
+
+no_database:
if (do_xforms) {
ul_plot = make_plot(512, 100, "UL Input Signal", 1,
7680*10, PLOT_VS_TIME, BLUE);
@@ -501,13 +525,18 @@ int main(int n, char **v)
10240, PLOT_MINMAX, BLUE);
}
- for (i = 0; i < on_off_n; i++)
- on_off(database, on_off_name[i], is_on, on_off_action[i]);
-
#ifdef T_USE_SHARED_MEMORY
init_shm();
#endif
s = get_connection("127.0.0.1", 2020);
+
+ if (remote_local) {
+#ifdef T_USE_SHARED_MEMORY
+ forward_start_client(f, s);
+#endif
+ goto no_init_message;
+ }
+
/* send the first message - activate all traces */
t = 0;
if (write(s, &t, 1) != 1) abort();
@@ -518,6 +547,8 @@ int main(int n, char **v)
if (is_on[l])
if (write(s, &l, sizeof(int)) != sizeof(int)) abort();
+no_init_message:
+
/* read messages */
while (1) {
#ifdef T_USE_SHARED_MEMORY
diff --git a/tracer/plot.c b/tracer/plot.c
index 58f25fd41c..7447384288 100644
--- a/tracer/plot.c
+++ b/tracer/plot.c
@@ -6,7 +6,6 @@
#include <pthread.h>
#include <math.h>
#include <unistd.h>
-#include <pthread.h>
#include <sys/select.h>
#include <stdarg.h>
@@ -146,23 +145,6 @@ static void *plot_thread(void *_p)
return NULL;
}
-static void new_thread(void *(*f)(void *), void *data)
-{
- pthread_t t;
- pthread_attr_t att;
-
- if (pthread_attr_init(&att))
- { fprintf(stderr, "pthread_attr_init err\n"); exit(1); }
- if (pthread_attr_setdetachstate(&att, PTHREAD_CREATE_DETACHED))
- { fprintf(stderr, "pthread_attr_setdetachstate err\n"); exit(1); }
- if (pthread_attr_setstacksize(&att, 10000000))
- { fprintf(stderr, "pthread_attr_setstacksize err\n"); exit(1); }
- if (pthread_create(&t, &att, f, data))
- { fprintf(stderr, "pthread_create err\n"); exit(1); }
- if (pthread_attr_destroy(&att))
- { fprintf(stderr, "pthread_attr_destroy err\n"); exit(1); }
-}
-
void *make_plot(int width, int height, char *title, int nplots, ...)
{
plot *p;
--
GitLab