buflen = 1024 bytes + added total and kb/s output for stream

diff --git a/receive.c b/receive.c
index 5c6e7dd46863ec638974f9ce40d629d09aa6c268..9fe86e256bb98ff132608ffa01f173d64c984cd1 100644 (file)
--- a/receive.c
+++ b/receive.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 /* defines ... */
-#define MAX_SIZE 1000
+#define MAX_SIZE 1024
 
 int main(int argc, char *argv[]) {
   int receive_fd;

diff --git a/stream.c b/stream.c
index b97a670e77a10f78c5750c0c6ee9afd88b8f02b7..aa8c52a4f10748b35d86b44dc08d8e9c2e8d0b4b 100644 (file)
--- a/stream.c
+++ b/stream.c
@@ -26,14 +26,40 @@
 /* read, close */
 #include <unistd.h>
 
+/* timing stuff */
+#include <sys/time.h>
+
 /* defines ... */
-#define MAX_SIZE 1000
+#define MAX_SIZE 1024
+#define PRINT_RATE 100
+
+int print_rate(struct timeval *time_start,int t) {
+  struct timeval now;
+  int sec_t,usec_t;
+  unsigned int delta_t;
+  unsigned int kbs_t;
+  int count;
+
+  gettimeofday(&now,NULL);
+  sec_t=now.tv_sec-time_start->tv_sec;
+  usec_t=(now.tv_usec<time_start->tv_usec)
+    ?1000000-time_start->tv_usec+now.tv_usec
+    :now.tv_usec-time_start->tv_usec;
+  delta_t=sec_t*1000000+usec_t;
+  kbs_t=(t/delta_t)*(1000000/1024);
+  count=printf("total: %d MByte - average: %d kB/s",t/(1024*1024),kbs_t);
+  while(count--) printf("\b");
+
+  return 1;
+}
 
 int main(int argc, char *argv[]) {
   int listen_fd, send_fd;
   struct sockaddr_in local_addr, remote_addr;
   socklen_t remote_addr_len;
-  int send_bytes, read_bytes;
+  int send_bytes, read_bytes, total_read=0, total_send=0;
+  struct timeval time_start;
+  int i=0;
 
   if(argc!=2) {
     printf("usage: %s <port>\n",argv[0]);
@@ -68,18 +94,25 @@ int main(int argc, char *argv[]) {
     inet_ntoa(remote_addr.sin_addr),
     ntohs(remote_addr.sin_port));
 
-      /* send stuff .... */
-      read_bytes=1;
-      while(read_bytes>0) {
-       unsigned char buf[MAX_SIZE];
-       read_bytes=read(0,buf,sizeof(buf));
-        send_bytes=send(send_fd,buf,read_bytes,0);
-      }
+    /* time init */
+    gettimeofday(&time_start,NULL);
+
+    /* send stuff .... */
+    read_bytes=1;
+    while(read_bytes>0) {
+      unsigned char buf[MAX_SIZE];
+
+      read_bytes=read(0,buf,sizeof(buf));
+      total_read+=read_bytes;
+      send_bytes=send(send_fd,buf,read_bytes,0);
+      total_send+=send_bytes;
+      if(!((i++)%PRINT_RATE)) print_rate(&time_start,total_send);
+    }
 
       close(send_fd);
       close(listen_fd);
       printf("connection closed ...\n");
-      printf("%d from %d total bytes sent.\n",send_bytes,read_bytes);
+      printf("%d from %d total bytes sent.\n",total_send,total_read);
   }
   return 0;
 }