ha7ilm/openwebrx
1
0
Fork 0
mirror of https://github.com/ha7ilm/openwebrx.git synced 2026-02-01 21:14:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

/proc/stat looks different for cygwin, so list index is out of range

Browse source
This commit is contained in:
ha7ilm 2016-06-29 23:32:31 +02:00
parent 79caad228e
commit f886b88ca4
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
openwebrx.py
View file

@ -492,7 +492,7 @@ class WebRXHandler(BaseHTTPRequestHandler):
if smeter_level == None: break
except:
break
if smeter_level!=None:
if smeter_level!=None:
myclient.loopstat=31
rxws.send(self, "MSG s={0}".format(smeter_level))
@ -657,22 +657,21 @@ def get_cpu_usage():
global last_worktime, last_idletime
try:
f=open("/proc/stat","r")
line=""
while not "cpu " in line: line=f.readline()
f.close()
spl=line.split(" ")
worktime=int(spl[2])+int(spl[3])+int(spl[4])
idletime=int(spl[5])
dworktime=(worktime-last_worktime)
didletime=(idletime-last_idletime)
rate=float(dworktime)/(didletime+dworktime)
last_worktime=worktime
last_idletime=idletime
if(last_worktime==0): return 0
return rate
except:
return 0 #Workaround, possibly we're on a Mac
line=""
while not "cpu " in line: line=f.readline()
f.close()
spl=line.split(" ")
worktime=int(spl[2])+int(spl[3])+int(spl[4])
idletime=int(spl[5])
dworktime=(worktime-last_worktime)
didletime=(idletime-last_idletime)
rate=float(dworktime)/(didletime+dworktime)
last_worktime=worktime
last_idletime=idletime
if(last_worktime==0): return 0
return rate
return 0 #Workaround, possibly we're on a Mac or Cygwin
if __name__=="__main__":
main()