Full working state

trx_ecpri.c

@@ -99,6 +99,8 @@ IQ throughput (4 * 20 MHz): 3 932 160 000 bytes
 
 One ethernet frame = 8862
 
+Frames / second ~= 443 710
+
         14                   4                  4               8          8832
 +-----------------+---------------------+----------------+-------------+------------+
 | Ethernet header | eCPRI common header | IQ data header | oRAN header | IQ payload |
@@ -295,12 +297,12 @@ static void print_stats(FILE * f, int print_header) {
       "\n",
       N_SAMPLES * sizeof(float) * 2 * rx_drop_counter.counter / IQ_PAYLOAD,
       N_SAMPLES * sizeof(float) * 2 * tx_drop_counter.counter / IQ_PAYLOAD,
-      recv_counter.counter / 4,
-      decode_counter.counter / 4,
+      recv_counter.counter,
+      decode_counter.counter,
       N_SAMPLES * sizeof(float) * 2 * read_counter.counter / IQ_PAYLOAD,
       N_SAMPLES * sizeof(float) * 2 * write_counter.counter / IQ_PAYLOAD,
-      encode_counter.counter / 4,
-      sent_counter.counter / 4,
+      encode_counter.counter,
+      sent_counter.counter,
       recv_counter.pps,
       decode_counter.pps,
       read_counter.pps,
@@ -397,7 +399,7 @@ static void *recv_thread(void *p) {
                 "Not enough space in RX buffer (%d < %d)\n",
                 rbuf_write_amount(&rx_rbuf), RX_BURST_SIZE * PACKET_SIZE);
     for(int j = 0; j < RX_BURST_SIZE; j++) {
-      msgv[j].iov_base = rbuf_write(&rx_rbuf) + j * PACKET_SIZE;
+      msgv[j].iov_base = rx_rbuf.buffer + (rx_rbuf.write_index + j * PACKET_SIZE) % rx_rbuf.buf_len;
       msgv[j].iov_len = PACKET_SIZE;
       msgh[j].msg_hdr.msg_iov = &msgv[j];
       msgh[j].msg_hdr.msg_iovlen = 1;
@@ -636,7 +638,7 @@ static void *statistic_thread(void *p) {
     add_ns(&next, s->statistics_refresh_rate_ns);
     print_stats(stats_file_desc, (i % 17) == 0);
 #ifdef DEBUG
-    print_debug(stats_file_desc, ((i + 9) % 17) == 0);
+    //print_debug(stats_file_desc, ((i + 9) % 17) == 0);
 #endif
     fflush(stats_file_desc);