Skip to content

W
White Rabbit Switch - Testing
Commit f7551b6f authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

networkTool: fixes to compile it with gcc and not g++, now cross-compilation to… 

networkTool: fixes to compile it with gcc and not g++, now cross-compilation to WR Switch is also possible
parent f039a318
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 14 deletions
sw/networkTool/Makefile
View file @ f7551b6f
CC = g++ CC = gcc
CFLAGS = -g3 -O0 -lm -w -Wall CFLAGS = -g3 -O0 -w -Wall
LDFLAGS = -lm
TESTER = test TESTER = test
DECODER = networkTool DECODER = networkTool
...@@ -9,7 +10,7 @@ DECODER = networkTool ...@@ -9,7 +10,7 @@ DECODER = networkTool
all : $(OBJS) all : $(OBJS)
$(CC) $(CFLAGS) $(OBJS) -o $(OUTPUT) $(CC) $(CFLAGS) $(OBJS) -o $(OUTPUT) $(LDFLAGS)
clean: clean:
rm -f $(OBJS) $(TESTER) $(DECODER) rm -f $(OBJS) $(TESTER) $(DECODER)
......
sw/networkTool/networkTool.c
View file @ f7551b6f
...@@ -20,7 +20,7 @@ void delay(int d) ...@@ -20,7 +20,7 @@ void delay(int d)
asm volatile ("nop"); asm volatile ("nop");
} }
my_socket *create_socket(wr_sockaddr_t *bind_addr,RunTimeOpts *rtOpts) my_socket_t *create_socket(wr_sockaddr_t *bind_addr,RunTimeOpts *rtOpts)
{ {
struct sockaddr_ll sll; struct sockaddr_ll sll;
struct my_socket *s; struct my_socket *s;
...@@ -78,10 +78,10 @@ my_socket *create_socket(wr_sockaddr_t *bind_addr,RunTimeOpts *rtOpts) ...@@ -78,10 +78,10 @@ my_socket *create_socket(wr_sockaddr_t *bind_addr,RunTimeOpts *rtOpts)
s->local_mac[4], s->local_mac[4],
s->local_mac[5] ); s->local_mac[5] );
return (my_socket*)s; return (my_socket_t*)s;
} }
int rxfrom(my_socket *sock, wr_sockaddr_t *from, void *data, size_t data_length) int rxfrom(my_socket_t *sock, wr_sockaddr_t *from, void *data, size_t data_length)
{ {
struct my_socket *s = (struct my_socket *)sock; struct my_socket *s = (struct my_socket *)sock;
struct bench_pkt pkt; struct bench_pkt pkt;
...@@ -117,7 +117,7 @@ int rxfrom(my_socket *sock, wr_sockaddr_t *from, void *data, size_t data_length) ...@@ -117,7 +117,7 @@ int rxfrom(my_socket *sock, wr_sockaddr_t *from, void *data, size_t data_length)
return (ret); return (ret);
} }
int rx_seq_from(my_socket *sock, wr_sockaddr_t *from, int *data, size_t data_length, int rx_seq_from(my_socket_t *sock, wr_sockaddr_t *from, int *data, size_t data_length,
RunTimeOpts *rtOpts, long *acc_latency, long *acc_interval, timeval_t *last_rx) RunTimeOpts *rtOpts, long *acc_latency, long *acc_interval, timeval_t *last_rx)
{ {
struct my_socket *s = (struct my_socket *)sock; struct my_socket *s = (struct my_socket *)sock;
...@@ -195,7 +195,7 @@ int rx_seq_from(my_socket *sock, wr_sockaddr_t *from, int *data, size_t data_len ...@@ -195,7 +195,7 @@ int rx_seq_from(my_socket *sock, wr_sockaddr_t *from, int *data, size_t data_len
return (ret); return (ret);
} }
int rx_fastest_burst_from(my_socket *sock, wr_sockaddr_t *from, int *data, size_t data_length, int rx_fastest_burst_from(my_socket_t *sock, wr_sockaddr_t *from, int *data, size_t data_length,
RunTimeOpts *rtOpts, rx_data_t rx_data[]) RunTimeOpts *rtOpts, rx_data_t rx_data[])
{ {
struct my_socket *s = (struct my_socket *)sock; struct my_socket *s = (struct my_socket *)sock;
...@@ -263,7 +263,7 @@ int rx_fastest_burst_from(my_socket *sock, wr_sockaddr_t *from, int *data, size_ ...@@ -263,7 +263,7 @@ int rx_fastest_burst_from(my_socket *sock, wr_sockaddr_t *from, int *data, size_
return (total_msg_cnt); return (total_msg_cnt);
} }
int tx_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_number, int tx_burst_to(my_socket_t *sock, wr_sockaddr_t *to, int burst_id, int burst_number,
size_t data_length, int pkt_time_interval, RunTimeOpts *rtOpts) size_t data_length, int pkt_time_interval, RunTimeOpts *rtOpts)
{ {
...@@ -284,7 +284,7 @@ int tx_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_numb ...@@ -284,7 +284,7 @@ int tx_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_numb
data_length = 60; data_length = 60;
/* alloc packet */ /* alloc packet */
p = (bench_pkt*)calloc(1, data_length); p = (bench_pkt_t*)calloc(1, data_length);
if (!p) exit(5); if (!p) exit(5);
p->burst_id = burst_id; p->burst_id = burst_id;
...@@ -305,7 +305,7 @@ int tx_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_numb ...@@ -305,7 +305,7 @@ int tx_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_numb
{ {
if(rtOpts->randomized) { if(rtOpts->randomized) {
data_length = rand()%(ETHER_MTU-8-120)+60; data_length = rand()%(ETHER_MTU-8-120)+60;
p = (bench_pkt*)calloc(1, data_length); p = (bench_pkt_t*)calloc(1, data_length);
if (!p) exit(5); if (!p) exit(5);
p->burst_id = burst_id; p->burst_id = burst_id;
p->size = data_length; p->size = data_length;
...@@ -362,7 +362,7 @@ int tx_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_numb ...@@ -362,7 +362,7 @@ int tx_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_numb
* send burst as fast as possible, record time of sending to calculate average frame * send burst as fast as possible, record time of sending to calculate average frame
* sending intervals * sending intervals
*/ */
int tx_fasters_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int burst_number, int tx_fasters_burst_to(my_socket_t *sock, wr_sockaddr_t *to, int burst_id, int burst_number,
size_t data_length, RunTimeOpts *rtOpts, timeval_t tx_timestamps[], size_t data_length, RunTimeOpts *rtOpts, timeval_t tx_timestamps[],
int pkt_time_interval) int pkt_time_interval)
{ {
...@@ -376,7 +376,7 @@ int tx_fasters_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int bu ...@@ -376,7 +376,7 @@ int tx_fasters_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int bu
if(data_length > ETHER_MTU-8) return -EINVAL; if(data_length > ETHER_MTU-8) return -EINVAL;
if(data_length < sizeof(struct bench_pkt)) return -EINVAL; if(data_length < sizeof(struct bench_pkt)) return -EINVAL;
/* alloc packet */ /* alloc packet */
p = (bench_pkt*)calloc(1, data_length); p = (bench_pkt_t*)calloc(1, data_length);
if (!p) exit(5); if (!p) exit(5);
p->burst_id = burst_id; p->burst_id = burst_id;
...@@ -411,7 +411,7 @@ int tx_fasters_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int bu ...@@ -411,7 +411,7 @@ int tx_fasters_burst_to(my_socket *sock, wr_sockaddr_t *to, int burst_id, int bu
return i; return i;
} }
int txto(my_socket *sock, wr_sockaddr_t *to, void *data, size_t data_length) int txto(my_socket_t *sock, wr_sockaddr_t *to, void *data, size_t data_length)
{ {
struct etherpacket pkt; struct etherpacket pkt;
......
sw/networkTool/networkTool.h
View file @ f7551b6f
...@@ -77,6 +77,9 @@ PACKED struct bench_pkt { ...@@ -77,6 +77,9 @@ PACKED struct bench_pkt {
struct timeval rx; struct timeval rx;
char payload[0]; char payload[0];
}; };
typedef struct bench_pkt bench_pkt_t;
enum rxfrom_mode { enum rxfrom_mode {
RETURN_SEQ_NUM, RETURN_SEQ_NUM,
RETURN_DATA}; RETURN_DATA};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment