Changeset 44 in ntrip for trunk

Timestamp:

Jul 18, 2006, 10:55:30 AM (18 years ago)

Author:

stoecker

Message:

added bitrate

File:

• trunk/ntripclient/NtripLinuxClient.c (modified) (11 diffs)

trunk/ntripclient/NtripLinuxClient.c

@@ -1 +1 @@
 /*
   Easy example NTRIP client for Linux/Unix.
-  $Id: NtripLinuxClient.c,v 1.19 2006/07/04 08:05:45 stoecker Exp $
+  $Id: NtripLinuxClient.c,v 1.20 2006/07/04 12:53:43 stoecker Exp $
   Copyright (C) 2003-2005 by Dirk Stoecker <soft@dstoecker.de>
     
@@ -32 +32 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
+#include <time.h>
 
 /* The string, which is send as agent in HTTP request */
@@ -40 +41 @@
 
 /* CVS revision and version */
-static char revisionstr[] = "$Revision: 1.19 $";
-static char datestr[]     = "$Date: 2006/07/04 08:05:45 $";
+static char revisionstr[] = "$Revision: 1.20 $";
+static char datestr[]     = "$Date: 2006/07/04 12:53:43 $";
 
 struct Args
@@ -50 +51 @@
   const char *password;
   const char *data;
+  int         bitrate;
 };
 
@@ -58 +60 @@
 #define LONG_OPT(a) a
 static struct option opts[] = {
+{ "bitrate",    no_argument,       0, 'b'},
 { "data",       required_argument, 0, 'd'},
 { "server",     required_argument, 0, 's'},
@@ -66 +69 @@
 {0,0,0,0}};
 #endif
-#define ARGOPT "-d:hp:r:s:u:"
+#define ARGOPT "-d:bhp:r:s:u:"
 
 #ifdef __GNUC__
@@ -164 +167 @@
   args->password = "";
   args->data = 0;
+  args->bitrate = 0;
   help = 0;
 
@@ -178 +182 @@
     case 'p': args->password = optarg; break;
     case 'd': args->data = optarg; break;
+    case 'b': args->bitrate = 1; break;
     case 'h': help=1; break;
     case 1:
@@ -220 +225 @@
     " -r " LONG_OPT("--port     ") "the server port number (default 80)\n"
     " -u " LONG_OPT("--user     ") "the user name\n"
+    " -b " LONG_OPT("--bitrate  ") "output bitrate\n"
     "or using an URL:\n%s ntrip:mountpoint[/username[:password]][@server[:port]]\n"
     , revisionstr, datestr, argv[0], argv[0]);
@@ -359 +365 @@
     {
       int k = 0;
+      int starttime = time(0);
+      int lastout = starttime;
+      int totalbytes = 0;
 
       while((numbytes=recv(sockfd, buf, MAXDATASIZE-1, 0)) != -1)
@@ -379 +388 @@
         else
         {
+          totalbytes += numbytes;
+          if(totalbytes < 0) /* overflow */
+          {
+            totalbytes = 0;
+            starttime = time(0);
+            lastout = starttime;
+          }
           fwrite(buf, (size_t)numbytes, 1, stdout);
           fflush(stdout);
+          if(args.bitrate)
+          {
+            int t = time(0);
+            if(t > lastout + 60)
+            {
+              lastout = t;
+              fprintf(stderr, "Bitrate is %d/s (%d seconds accumulated).\n",
+              totalbytes/(t-starttime), t-starttime);
+            }
+          }
         }
       }