|
|
@@ -11,6 +11,7 @@ CMDS = ['LOAD', 'CPU', 'BLOCK', 'UNBLOCK', 'EXIT', 'DEADLINE']
|
|
|
|
|
|
def parseData(fin):
|
|
|
ln = 0
|
|
|
+ lastBlock = 0
|
|
|
result = []
|
|
|
|
|
|
for l in fin:
|
|
|
@@ -40,13 +41,18 @@ def parseData(fin):
|
|
|
if accion == 'CPU':
|
|
|
if result[proceso]['ticksCpu'] == 0:
|
|
|
result[proceso]['primerTick'] = tick
|
|
|
- result[proceso]['ticksCpu'] +=1
|
|
|
+ # Si no hubo un block en el mismo tick
|
|
|
+ if lastBlock != tick:
|
|
|
+ result[proceso]['ticksCpu'] +=1
|
|
|
+
|
|
|
|
|
|
# Tick Block
|
|
|
if accion == 'BLOCK':
|
|
|
+ lastBlock = tick
|
|
|
result[proceso]['ticksBlock'] += 1
|
|
|
|
|
|
if accion == 'UNBLOCK':
|
|
|
+ lastBlock -= 1
|
|
|
result[proceso]['ticksBlock'] -= 1
|
|
|
|
|
|
if accion == 'EXIT':
|
