Log bytes sent and lost better.

diff --git a/client.cpp b/client.cpp
index f2d60a62653ea13abad4ff9366e8a2e5fa55ca97..3a2552172d6a924ad41d68db874edbf4f1db17b7 100644 (file)
--- a/client.cpp
+++ b/client.cpp
@@ -17,7 +17,10 @@ Client::Client(int sock)
          state(Client::READING_REQUEST),
          stream(NULL),
          header_or_error_bytes_sent(0),
-         stream_pos(0)
+         stream_pos(0),
+         bytes_sent(0),
+         bytes_lost(0),
+         num_loss_events(0)
 {
        request.reserve(1024);
 
@@ -49,7 +52,10 @@ Client::Client(const ClientProto &serialized, Stream *stream)
          stream(stream),
          header_or_error(serialized.header_or_error()),
          header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
-         stream_pos(serialized.stream_pos())
+         stream_pos(serialized.stream_pos()),
+         bytes_sent(serialized.bytes_sent()),
+         bytes_lost(serialized.bytes_lost()),
+         num_loss_events(serialized.num_loss_events())
 {
        if (stream != NULL && stream->mark_pool != NULL) {
                fwmark = stream->mark_pool->get_mark();
@@ -75,6 +81,9 @@ ClientProto Client::serialize() const
        serialized.set_header_or_error(header_or_error);
        serialized.set_header_or_error_bytes_sent(serialized.header_or_error_bytes_sent());
        serialized.set_stream_pos(stream_pos);
+       serialized.set_bytes_sent(bytes_sent);
+       serialized.set_bytes_lost(bytes_lost);
+       serialized.set_num_loss_events(num_loss_events);
        return serialized;
 }
        
@@ -84,6 +93,8 @@ ClientStats Client::get_stats() const
        stats.stream_id = stream_id;
        stats.remote_addr = remote_addr;
        stats.connect_time = connect_time;
-       stats.bytes_sent = stream_pos;
+       stats.bytes_sent = bytes_sent;
+       stats.bytes_lost = bytes_lost;
+       stats.num_loss_events = num_loss_events;
        return stats;
 }

diff --git a/client.h b/client.h
index 47770d19e820d0ba472ab8f576bb24f17e88f0c2..db1fea51c69ae090f8a1d70db7b75aaf6f31f62d 100644 (file)
--- a/client.h
+++ b/client.h
@@ -16,6 +16,8 @@ struct ClientStats {
        std::string remote_addr;
        time_t connect_time;
        size_t bytes_sent;
+       size_t bytes_lost;
+       size_t num_loss_events;
 };
 
 struct Client {
@@ -62,6 +64,13 @@ struct Client {
        // Number of bytes we are into the stream (ie., the end of last send).
        // Only relevant for SENDING_DATA.
        size_t stream_pos;
+
+       // Number of bytes we've sent of data. Only relevant for SENDING_DATA.
+       size_t bytes_sent;
+
+       // Number of times we've skipped forward due to the backlog being too big,
+       // and how many bytes we've skipped over in all. Only relevant for SENDING_DATA.
+       size_t bytes_lost, num_loss_events;
 };
 
 #endif  // !defined(_CLIENT_H)

diff --git a/server.cpp b/server.cpp
index 9517b5480e5f55ce6c5decee9ab6ad726edf3167..730bb4463c7433c7734a49d19a9e5ea9d08331fd 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -363,6 +363,8 @@ sending_data_again:
                                client->sock,
                                (long long int)(bytes_to_send - stream->backlog_size));
                        client->stream_pos = stream->bytes_received - stream->backlog_size;
+                       client->bytes_lost += bytes_to_send - stream->backlog_size;
+                       ++client->num_loss_events;
                        bytes_to_send = stream->backlog_size;
                }
 
@@ -392,6 +394,7 @@ sending_data_again:
                        return;
                }
                client->stream_pos += ret;
+               client->bytes_sent += ret;
 
                if (client->stream_pos == stream->bytes_received) {
                        // We don't have any more data for this client, so put it to sleep.

diff --git a/state.proto b/state.proto
index 9644120a81b268c263a691fb8096b4f103d2f04b..bfacdbf4ecf202fea59e602dd673ecee345d6110 100644 (file)
--- a/state.proto
+++ b/state.proto
@@ -9,6 +9,9 @@ message ClientProto {
        optional bytes header_or_error = 5;
        optional int64 header_or_error_bytes_sent = 6;
        optional int64 stream_pos = 7;
+       optional int64 bytes_sent = 10;
+       optional int64 bytes_lost = 11;
+       optional int64 num_loss_events = 12;
 };
 
 // Corresponds to struct Stream.

diff --git a/stats.cpp b/stats.cpp
index 49106eed04fbcf7fffc0e2a8f5c8b6de79e1c081..c9af688327be6d1e2a8745e05b68a68f598baa16 100644 (file)
--- a/stats.cpp
+++ b/stats.cpp
@@ -50,11 +50,13 @@ void StatsThread::do_work()
                now = time(NULL);
                client_stats = servers->get_client_stats();
                for (size_t i = 0; i < client_stats.size(); ++i) {
-                       fprintf(fp, "%s %s %d %llu\n",
+                       fprintf(fp, "%s %s %d %llu %llu %llu\n",
                                client_stats[i].remote_addr.c_str(),
                                client_stats[i].stream_id.c_str(),
                                int(now - client_stats[i].connect_time),
-                               (long long unsigned)(client_stats[i].bytes_sent));
+                               (long long unsigned)(client_stats[i].bytes_sent),
+                               (long long unsigned)(client_stats[i].bytes_lost),
+                               (long long unsigned)(client_stats[i].num_loss_events));
                }
                if (fclose(fp) == EOF) {
                        perror("fclose");