Use Linux-like indentation in mptp.c

[swifty.git] / src / libswift / swift.h

diff --git a/src/libswift/swift.h b/src/libswift/swift.h
index 3fac390..67092c2 100644 (file)
--- a/src/libswift/swift.h
+++ b/src/libswift/swift.h
@@ -489,7 +489,8 @@ namespace swift {
                static MessageQueue messageQueue;
 
            static tint epoch, start;
-           static uint64_t global_dgrams_up, global_dgrams_down, global_raw_bytes_up, global_raw_bytes_down, global_bytes_up, global_bytes_down;
+           static uint64_t global_dgrams_up, global_dgrams_down, global_raw_bytes_up, global_raw_bytes_down, global_bytes_up, global_bytes_down,
+                                               global_buffers_up, global_syscalls_up, global_buffers_down, global_syscalls_down;
         static void CloseChannelByAddress(const Address &addr);
 
         // SOCKMGMT
@@ -525,7 +526,7 @@ namespace swift {
         void        OnHandshake (struct evbuffer *evb);
         void        OnRandomize (struct evbuffer *evb); //FRAGRAND
         void        AddHandshake (struct evbuffer *evb);
-        bin_t       AddData (struct evbuffer *evb);
+        bin_t       AddData (struct evbuffer **evb);
         void        AddAck (struct evbuffer *evb);
         void        AddHave (struct evbuffer *evb);
         void        AddHint (struct evbuffer *evb);
@@ -791,8 +792,8 @@ namespace swift {
     // Arno: Save transfer's binmap for zero-hashcheck restart
     void Checkpoint(int fdes);
 
-#define MAX_QUEUE_LENGTH 10
-#define TIMER_USEC 100000
+#define MAX_QUEUE_LENGTH 1
+#define TIMER_USEC 10000
 
        class MessageQueue
        {
@@ -845,13 +846,10 @@ namespace swift {
                        }
 
                        int r = Channel::SendTo(sock, addr, evbs);
-                       printf("Sent %d buffers\n", list.size());
                        if (r > 0) {
                                i = 0;
-                               for (EntryList::iterator it = list.begin(); it != list.end(); ++it, ++i) {
+                               for (EntryList::iterator it = list.begin(); it != list.end(); ++it, ++i)
                                        (*it).channel->Sent(evbuffer_get_length((*it).evb), (*it).evb, (*it).tofree);
-                                       printf("Sent %d bytes\n", addr.addr->dests[i].bytes);
-                               }
                        }
                        list.clear();
                }