Added time measure to upload

Author: EbnerAndreas

client.py

@@ -8,6 +8,7 @@
 import random
 import signal
 import logging
+import time
 
 import srp
 
@@ -87,6 +88,9 @@ def __init__(self, loop, path, packets_per_second, username, password):
         self.fetch_intercal = 10.0 # should be ~ 30s in production
         self.pending_update_callback = None
 
+        # For time measurements
+        self.times = None
+
         self.username = username
         self.authenticator = srp.User(
             username, password, hash_alg=srp.SHA256, ng_type=srp.NG_2048)

lib/protocol.py

@@ -10,6 +10,7 @@
 import os
 import io
 import random
+import time
 
 from typing import Any, Dict, Tuple
 from enum import Enum, unique
@@ -107,6 +108,10 @@ def __init__(self, loop, path, packets_per_second):
         # stores the fileinfo for the local files
         self.fileinfo = dict()
 
+        # For time measurements
+        self.times_create = dict()
+        self.times_start = dict()
+
         # list dir
         local_files = files.list(path)
         for file in local_files:
@@ -1887,6 +1892,8 @@ def upload_file(self, session_id, filename, fileinfo=None, addr=None) -> None:
         """
         Upload the given file to server.
         """
+        self.times_create[filename] = time.monotonic()
+
         if fileinfo is None:
             fileinfo = self.get_fileinfo(filename.decode('utf8'))
             # prevent double uploads do to IO-notifications (e.g. create and
@@ -2009,6 +2016,8 @@ async def do_upload(self, session_id, filename, fileinfo, upload_id, resume_at_b
         File_Upload packets. It then waits for acknowledgment and resends
         the packet if the sent chunk is not acknowledged.
         """
+        self.times_start[filename] = time.monotonic()
+
         filepath = self.path + filename.decode('utf8')
         size = fileinfo['size']
         try:
@@ -2092,6 +2101,18 @@ async def do_upload(self, session_id, filename, fileinfo, upload_id, resume_at_b
 
         del self.active_uploads[filename]
         self.epoch += 1
+
+        # print upload times TODO maybe logging?
+        atm_time = time.monotonic()
+        create_time = self.times_create[filename]
+        start_time = self.times_start[filename]
+        print("Create time: %fs, Start time: %fs, End time: %fs" % (create_time, start_time, atm_time))
+        print("Time till start of upload: %fs, Duration upload: %fs" %(start_time - create_time, atm_time - start_time))
+        
+        # Clean lists
+        self.times_create.pop(filename)
+        self.times_start.pop(filename)
+
         print("Upload of file \"%s\" was finished" % filename)
 
     def resend_chunks(self, session_id: int, expired_chunks, upload_id: int, chunk_buffer, addr):