@@ -117,9 +117,7 @@ def print_line(self, ta, tb, nb, np, nm, extra=""):
117
117
if self .udp :
118
118
if self .reverse :
119
119
print (
120
- " %6.3f ms %u/%u (%.1f%%)"
121
- % (0 , nm , np , 100 * nm / (max (1 , np + nm ))),
122
- end = "" ,
120
+ " %6.3f ms %u/%u (%.1f%%)" % (0 , nm , np , 100 * nm / (max (1 , np + nm ))), end = ""
123
121
)
124
122
else :
125
123
print (" %u" % np , end = "" )
@@ -337,9 +335,7 @@ def server():
337
335
338
336
339
337
def client (host , udp = False , reverse = False , bandwidth = 10 * 1024 * 1024 ):
340
- print (
341
- "CLIENT MODE:" , "UDP" if udp else "TCP" , "receiving" if reverse else "sending"
342
- )
338
+ print ("CLIENT MODE:" , "UDP" if udp else "TCP" , "receiving" if reverse else "sending" )
343
339
344
340
param = {
345
341
"client_version" : "3.6" ,
@@ -352,9 +348,7 @@ def client(host, udp=False, reverse=False, bandwidth=10 * 1024 * 1024):
352
348
if udp :
353
349
param ["udp" ] = True
354
350
param ["len" ] = 1500 - 42
355
- param [
356
- "bandwidth"
357
- ] = bandwidth # this should be should be intended bits per second
351
+ param ["bandwidth" ] = bandwidth # this should be should be intended bits per second
358
352
udp_interval = 1000000 * 8 * param ["len" ] // param ["bandwidth" ]
359
353
else :
360
354
param ["tcp" ] = True
@@ -403,9 +397,7 @@ def client(host, udp=False, reverse=False, bandwidth=10 * 1024 * 1024):
403
397
if udp :
404
398
if reverse :
405
399
recvninto (s_data , buf )
406
- udp_in_sec , udp_in_usec , udp_in_id = struct .unpack_from (
407
- ">III" , buf , 0
408
- )
400
+ udp_in_sec , udp_in_usec , udp_in_id = struct .unpack_from (">III" , buf , 0 )
409
401
# print(udp_in_sec, udp_in_usec, udp_in_id)
410
402
if udp_in_id != udp_packet_id + 1 :
411
403
stats .add_lost_packets (udp_in_id - (udp_packet_id + 1 ))
@@ -417,12 +409,7 @@ def client(host, udp=False, reverse=False, bandwidth=10 * 1024 * 1024):
417
409
udp_last_send += udp_interval
418
410
udp_packet_id += 1
419
411
struct .pack_into (
420
- ">III" ,
421
- buf ,
422
- 0 ,
423
- t // 1000000 ,
424
- t % 1000000 ,
425
- udp_packet_id ,
412
+ ">III" , buf , 0 , t // 1000000 , t % 1000000 , udp_packet_id
426
413
)
427
414
n = s_data .sendto (buf , ai [- 1 ])
428
415
stats .add_bytes (n )
@@ -505,9 +492,7 @@ def client(host, udp=False, reverse=False, bandwidth=10 * 1024 * 1024):
505
492
elif cmd == DISPLAY_RESULTS :
506
493
s_ctrl .sendall (bytes ([IPERF_DONE ]))
507
494
s_ctrl .close ()
508
- time .sleep (
509
- 1
510
- ) # delay so server is ready for any subsequent client connections
495
+ time .sleep (1 ) # delay so server is ready for any subsequent client connections
511
496
return
512
497
513
498
stats .update ()
0 commit comments