Merge from trunk

[disorder] / clients / rtpmon.c

diff --git a/clients/rtpmon.c b/clients/rtpmon.c
index cf83328e0e1a76a1157f9ccda1af9632db95ee07..e64b08e404a23da6dce8bc7886607a54e9c458c2 100644 (file)
--- a/clients/rtpmon.c
+++ b/clients/rtpmon.c
@@ -35,6 +35,7 @@
 #include <locale.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <sys/uio.h>
 
 #include "syscalls.h"
 #include "timeval.h"
@@ -61,7 +62,7 @@ static unsigned bpf = 4;
 static uint32_t serial;
 
 /** @brief Size of ring buffer */
-#define RINGSIZE 16384
+#define RINGSIZE 131072
 
 /** @brief Ring buffer */
 static struct entry ring[RINGSIZE];
@@ -112,7 +113,15 @@ static void frames(const struct timeval *when, size_t n) {
   ringtail = (ringtail + 1) % RINGSIZE;
   // Report once a second
   if(prev != when->tv_sec) {
-    if(printf("%8.2f  %8.2f  %8.2f\n",
+    if(printf("%8.2f  %8.2f  %8.2f  %8.2f  %8.2f  %8.2f  %8.2f\n",
+              rate((ringtail - RINGSIZE / 128) % RINGSIZE,
+                   (ringtail - 1) % RINGSIZE),
+              rate((ringtail - RINGSIZE / 64) % RINGSIZE,
+                   (ringtail - 1) % RINGSIZE),
+              rate((ringtail - RINGSIZE / 32) % RINGSIZE,
+                   (ringtail - 1) % RINGSIZE),
+              rate((ringtail - RINGSIZE / 16) % RINGSIZE,
+                   (ringtail - 1) % RINGSIZE),
               rate((ringtail - RINGSIZE / 8) % RINGSIZE,
                    (ringtail - 1) % RINGSIZE),
               rate((ringtail - RINGSIZE / 4) % RINGSIZE,