提交 5d828684 编写于 作者: N Nicolas Hennion

Corect a bug on Windows and IO

上级 67f0ebb7
Changelog
=========
%%version%% (unreleased)
------------------------
- Merge pull request #100 from mxjeff/locale-issue. [Nicolas Hennion]
Fixed Portuguese locale name.
- Fixed Portuguese locale name. [kaliko]
On POSIX system locale follow "language[_territory]" naming scheme.
- Merge pull request #98 from mxjeff/html_issue. [Nicolas Hennion]
Fixed broken HTML output (issue #97) Action (for me): make a formal
validation of the HTML and CSV module
- Fixed broken HTML output (issue #97) [kaliko]
- Version 1.4.2.1. [Nicolas Hennion]
- Test as_dict()... [Nicolas Hennion]
- Version 1.4.2. [Nicolas Hennion]
- Clean the code... [Nicolas Hennion]
- Clean the code, go back try / except. [Nicolas Hennion]
- New function: Get process stats. [Nicolas Hennion]
- New function: Get process stats. [Nicolas Hennion]
- Cache OS information. [Nicolas Hennion]
- Merge pull request #91 from rberaldo/master. [Nicolas Hennion]
Brazilian Portuguese Translation
- Files for the Brazilian Portuguese translation. [Rafael Beraldo]
- Add Top process in the log. [Nicolas Hennion]
- Test code for IO ps. [Nicolas Hennion]
- Use the news virtual_memory() and virtual_swap() fct. [Nicolas
Hennion]
- Merge pull request #88 from dmd/patch-1. [Nicolas Hennion]
eliminate redundant 'per'
- Eliminate redundant 'per' [Daniel M. Drucker]
If you're measuring the rate of X, you can say Xps or X/s, but saying
X/ps is redundant and wrong.
- Update installation doc. [Nicolas Hennion]
- Pip install Glances / Better than pip install glances. [Nicolas
Hennion]
- After the 2to3 / Python 3 compatibility. [Nicolas Hennion]
- Merge branch 'master' of github.com:nicolargo/glances. [Nicolas
Hennion]
- After the 2to3 / Python 3 compatibility. [Nicolas Hennion]
- Update README.md. [Nicolas Hennion]
- Merge pull request #85 from luxflux/patch-1. [Nicolas Hennion]
Fix typo
- Fix typo. [Raffael Schmid]
- Add logo to HitHub doc 2. [Nicolas Hennion]
- Add logo to HitHub doc. [Nicolas Hennion]
- Merge pull request #81 from dlion/master. [Nicolas Hennion]
Italian translation added ! Very nice works :) Thank ou for the
contribution !
- Compiled file for italian translation. [dlion]
- File for italian translation. [dlion]
- Compiled file for italian translation. [dlion]
- Italian translation file compiled. [dlion]
- File for Italian Translation. [dlion]
- Version 1.4.1.1. [Nicolas Hennion]
- Version 1.4.1. [Nicolas Hennion]
- Merge pull request #75 from dlion/master. [Nicolas Hennion]
Uninstall script
- A simple uninstall script. [dlion]
- Add a switch -b to display network rate in byte per second. [Nicolas
Hennion]
- Add Process IO Read/Write information, if space is available. [Nicolas
Hennion]
- Add Process IO Read/Write information, if space is available. [Nicolas
Hennion]
- Merge pull request #71 from xiongchiamiov/master. [Nicolas Hennion]
Fix typos/misspellings in README
- Merge pull request #70 from pigmonkey/master. [Nicolas Hennion]
Fix README typo
- Fix typos/misspellings in README. [xiongchiamiov]
I didn't include the change made in pull #70:
https://github.com/nicolargo/glances/pull/70/files I also didn't make
any changes to the French version, assuming that it is already
correct.
- Fix README typo. [Pig Monkey]
- Merge pull request #66 from xorpaul/patch-1. [Nicolas Hennion]
fixed small spelling mistakes
- Fixed small spelling mistakes. [Andreas Paul]
- Fixed small spelling mistakes. [Andreas Paul]
- Update installation documentation for OS X. [Nicolas Hennion]
- Add first code for process IO / no display. [Nicolas Hennion]
- Merge pull request #60 from qzio/patch-1. [Nicolas Hennion]
link to correct flattr "thing"
- Merge pull request #58 from crcastle/patch-1. [Nicolas Hennion]
Add OSX install instructions
- Link to correct flattr "thing" [joel hansson]
- Add OSX install instructions. [Chris Castle]
- Uses Homebrew package manager (and pip)
- Add the '1' key to switch between per CPU / per core stats. [Nicolas
Hennion]
- Minor indentation change. [Nicolas Hennion]
- Add unitest script. [Nicolas Hennion]
- Update doc. [Nicolas Hennion]
- Add per CPU information. [Nicolas Hennion]
- Change installation procedure. [Nicolas Hennion]
- Change installation procedure. [Nicolas Hennion]
- Add depdencies in the documentation. [Nicolas Hennion]
- Change installation procedure. [Nicolas Hennion]
- Solve the issue #52 with Python 2.x. [Nicolas Hennion]
- Solve the issue #52 with Python 2.x. [Nicolas Hennion]
- Fix Setup.py issue. [Nicolas Hennion]
- Merge pull request #51 from asergi/master. [Nicolas Hennion]
Fix package build problem
- Fix setup.py. [asergi]
- Add glances dir. [asergi]
- Rename src => glances. [asergi]
- Change the setup.py. [Nicolas Hennion]
- Version 1.4. [Nicolas Hennion]
- Change process nice for PsUtil 0.5.0. [Nicolas Hennion]
- A bunch of new features (#48) by Alessio Sergi. [Nicolas Hennion]
- Add sort processes by MEM% (replace sort by VIRT) + other minor
changes. [asergi]
- Fix bare except: statements. [asergi]
- Strip leading/trailing whitespaces from all files. [asergi]
- Delete old backup files. [asergi]
- Code style cleaning. [asergi]
- Update help screen. [asergi]
- Fix display of minutes in TIME+ [asergi]
- Add MEM%, NICE, STATUS and TIME+ to the processes infos. [asergi]
- Put process summary on one line. [asergi]
- Load: fix viewing on FreeBSD/Mac OS X. [asergi]
- Mem/Swap: new layout and add percentage of usage. [asergi]
- Fix formatting of log messages. [asergi]
- No decimal places for values < GB. [asergi]
- Improve system info. Add Arch Linux support. Fix FreeBSD system info.
[asergi]
- Allow user to disable module from the command line. [nicolargo]
- Add PID/UID to the processes informations. [nicolargo]
- Add mem to CSV output and manage flush. [nicolargo]
- Merge pull request #46 from asergi/experimental. [Nicolas Hennion]
Thanks for your contrib !
- Fixed (another) broken multiline strings. [asergi]
- Minor aesthetic fixes. [asergi]
- Fixed broken multiline strings. [asergi]
- Fix naming conventions issue. [asergi]
- Fixed typos. [asergi]
- Improved .gitignore. [asergi]
- README. [nicolargo]
- PEP8. [nicolargo]
- Bug correct on screen. [nicolargo]
- Code checked with PEP8 checker. [nicolargo]
- Patch on the Makefile.am (Thx to Al3Hex) [nicolargo]
- CVS. [nicolargo]
- Add FS color in HTML output. [nicolargo]
- Add test to solve issue #45. [nicolargo]
- Minor change. [nicolargo]
- Correct for issue #37. [nicolargo]
- Add CLI option to manage HTML output. [nicolargo]
- Add the MANIFEST.in. [nicolargo]
- Merge pull request #43 from laurentb/experimental. [Nicolas Hennion]
Include package data files
- Include package data files. [Laurent Bachelier]
- Add additionnal file for HTML output. [nicolargo]
- Update documentation: use setup.py for installation. [nicolargo]
- Merge branch 'experimental' of github.com:nicolargo/glances into
experimental. [nicolargo]
- Merge pull request #42 from laurentb/experimental. [Nicolas Hennion]
Much simpler, pure-python packaging + i18n
- Simple building and packaging of i18n. [Laurent Bachelier]
- Much simpler, pure-python packaging. [Laurent Bachelier]
- Update doc for PPA. [nicolargo]
- HTML Output. [nicolargo]
- Ok when insert/remove external disk. [nicolargo]
- Excexclude rootfs and autofs. [nicolargo]
- Try before removing process. [nicolargo]
- Reduce process load. [nicolargo]
- Add control/msg to lib import. [nicolargo]
- Solve the _() error message. [nicolargo]
- Verbose the help message depending of the PsUtil version. [nicolargo]
- Change the process list algorithm. [nicolargo]
- Remove the unused get_io_counters calls. [nicolargo]
- Ready for beta test. [nicolargo]
- Change the help windows. [nicolargo]
- PsUtil - Add process stat. [nicolargo]
- Replace FsGrab by PsUtil. [nicolargo]
- DISK IO. [nicolargo]
- First version of the experimental BRANCH PSUtil replace StatGrab for
CPU, LOAD and MEM. [nicolargo]
- Version 1.3.7. [nicolargo]
- B&W console. [nicolargo]
- Try for all the init color sequence. [nicolargo]
- Flatt button in the README. [nicolargo]
- Add try before curses.curs_set(0) [nicolargo]
- Update screenshot. [nicolargo]
- Version 1.3.6. [nicolargo]
- Change Roadmap to add the issue 26. [nicolargo]
- WMerge branch 'master' of github.com:nicolargo/glances. [nicolargo]
Conflicts: src/glances.py
- Minor update. [nicolargo]
- Merge pull request #25 from jeanbob/master. [Nicolas Hennion]
Traduction française (vérifié) et espagnole (non vérifié)
- French and Spanish translation added. [Peter Fontaine (aka JeanBoB]
- I18n support added by JeanBoB. French translation added. [Peter
Fontaine (aka JeanBoB]
- Change the path to Python to env issue #20. [nicolargo]
- Upgrade ss. [nicolargo]
- Update README. [nicolargo]
- Update screenshot. [nicolargo]
- Version 1.3.5. [nicolargo]
- Add a buildout.cfg. [nicolargo]
- Update screenshot. [nicolargo]
- Version 1.3.4. [nicolargo]
- Update screenshot for v1.3.3. [nicolargo]
- Version 1.3.3. [nicolargo]
- Add Python PYPI informations. [nicolargo]
- Add a french version of the README. [nicolargo]
- Update the documentation. [nicolargo]
- Update screenshot. [nicolargo]
- Version 1.3.2. [nicolargo]
- Version 1.3.1. [nicolargo]
- Merge pull request #8 from rwmacleod/master. [Nicolas Hennion]
Thx !
- Fix consomption typo. [Randy MacLeod]
- No more FS limitation. [nicolargo]
- Update screenshot. [nicolargo]
- Version 1.3. [nicolargo]
- Docs. [nicolargo]
- Change the REAME for the 1.2 version. [nicolargo]
- Version 1.2. [nicolargo]
- Instructions to install on Ubuntu 10.04 and 10.10. [nicolargo]
- Ubuntu 10.04 note. [nicolargo]
- Ubuntu < 11.04 notes. [nicolargo]
- Change installation procedure. [nicolargo]
- Version 1.1.3. [nicolargo]
- V1.1.2. [nicolargo]
- Version 1.1.1. [nicolargo]
- 1.1 screenshot. [nicolargo]
- Add caption. [nicolargo]
- Add setup.py. [nicolargo]
- Catch CTRL-C before init screen. [nicolargo]
- Catch CTRL-C before init screen. [nicolargo]
- Add control before division. [nicolargo]
- Fix Readme.md. [nicolargo]
- Fix Readme.md. [nicolargo]
- Fix screenshot in Readme.md. [nicolargo]
- Add screenshot. [nicolargo]
n.n.n / 2012-11-07
==================
* Catch timedelta issue on Amazon EC2 server / related to issue #87
* Manage Fs name > 8 chars
* Invert get_nice and nice
* Re-add the main() function
* Add Python 3 compatibility
* Add refesh time for server side
* Add a connected to / disconnected from server message
* Update man page
* Add control when server is down
* Update documentation for the beta phase
* Add shortkey to delete warning (w) or warning+critical (x) logs messages
* Merge pull request #108 from nicolargo/clientserver
* Change the process IO columns and update informations files
* Add funcs to RPC instance
* Glances client/server is now fully RPC/XML compliant
* Correct a major issue on the get_io_counters on non user process (thx to the Alessio mail)
* Corect bug on CPU % on Windows
* CPU stats corrected for Windows
* Force server mode for Windows OS
* Add the -B argument for binding on a specific interface / optimize lib load
* Add INIT and QUIT. Clean the code. Do stuff...
* IO bug with client
* Add first step of the Glances client/master
* Merge pull request #104 from 2xyo/master
* Add support of Travis CI continuous integration service
* Correct PATH in the Web export module
* Minor doc update
* Merge pull request #103 from sebastianmoreno/patch-1
* Update i18n/es/LC_MESSAGES/glances.po
* Merge branch 'master' of github.com:nicolargo/glances
* Add -b (key 'b') to switch between bit/s or byte/s for network IO
* Merge pull request #101 from 2xyo/master
* Add Changelog
* Merge pull request #100 from mxjeff/locale-issue
* Fixed Portuguese locale name
* Merge pull request #98 from mxjeff/html_issue
* Fixed broken HTML output (issue #97)
* version 1.4.2.1
* Test as_dict()...
* version 1.4.2
* Clean the code...
* Clean the code, go back try / except
* New function: Get process stats
* New function: Get process stats
* Cache OS information
* Merge pull request #91 from rberaldo/master
* Files for the Brazilian Portuguese translation
* Add Top process in the log
* test code for IO ps
* Use the news virtual_memory() and virtual_swap() fct
* Merge pull request #88 from dmd/patch-1
* eliminate redundant 'per'
* Update installation doc
* pip install Glances / Better than pip install glances
* After the 2to3 / Python 3 compatibility
* Merge branch 'master' of github.com:nicolargo/glances
* After the 2to3 / Python 3 compatibility
* Update README.md
* Merge pull request #85 from luxflux/patch-1
* Fix typo
* Add logo to HitHub doc 2
* Add logo to HitHub doc
* Merge pull request #81 from dlion/master
* Compiled file for italian translation
* File for italian translation
* Compiled file for italian translation
* Italian translation file compiled
* File for Italian Translation
* version 1.4.1.1
* version 1.4.1
* Merge pull request #75 from dlion/master
* A simple uninstall script
* Add a switch -b to display network rate in byte per second
* Add Process IO Read/Write information, if space is available
* Add Process IO Read/Write information, if space is available
* Merge pull request #71 from xiongchiamiov/master
* Merge pull request #70 from pigmonkey/master
* Fix typos/misspellings in README
* Fix README typo
* Merge pull request #66 from xorpaul/patch-1
* fixed small spelling mistakes
* fixed small spelling mistakes
* Update installation documentation for OS X
* Add first code for process IO / no display
* Merge pull request #60 from qzio/patch-1
* Merge pull request #58 from crcastle/patch-1
* link to correct flattr "thing"
* Add OSX install instructions
* Add the '1' key to switch between per CPU / per core stats
* Minor indentation change
* Add unitest script
* Update doc
* Add per CPU information
* Change installation procedure
* Change installation procedure
* Add depdencies in the documentation
* Change installation procedure
* Solve the issue #52 with Python 2.x
* Solve the issue #52 with Python 2.x
* Fix Setup.py issue
* Merge pull request #51 from asergi/master
* Fix setup.py
* Add glances dir
* Rename src => glances
* Change the setup.py
* version 1.4
* Change process nice for PsUtil 0.5.0
* A bunch of new features (#48) by Alessio Sergi
* Add sort processes by MEM% (replace sort by VIRT) + other minor changes
* Fix bare except: statements
* Strip leading/trailing whitespaces from all files
* Delete old backup files
* Code style cleaning
* Update help screen
* Fix display of minutes in TIME+
* Add MEM%, NICE, STATUS and TIME+ to the processes infos
* Put process summary on one line
* Load: fix viewing on FreeBSD/Mac OS X
* Mem/Swap: new layout and add percentage of usage
* Fix formatting of log messages
* No decimal places for values < GB
* Improve system info. Add Arch Linux support. Fix FreeBSD system info.
* Allow user to disable module from the command line
* Add PID/UID to the processes informations
* Add mem to CSV output and manage flush
* Merge pull request #46 from asergi/experimental
* Fixed (another) broken multiline strings
* Minor aesthetic fixes
* Fixed broken multiline strings
* Fix naming conventions issue
* Fixed typos
* Improved .gitignore
* README
* PEP8
* Bug correct on screen
* Code checked with PEP8 checker
* Patch on the Makefile.am (Thx to Al3Hex)
* CVS
* Add FS color in HTML output
* Add test to solve issue #45
* Minor change
* Correct for issue #37
* Add CLI option to manage HTML output
* Add the MANIFEST.in
* Merge pull request #43 from laurentb/experimental
* Include package data files
* Add additionnal file for HTML output
* Update documentation: use setup.py for installation
* Merge branch 'experimental' of github.com:nicolargo/glances into experimental
* Merge pull request #42 from laurentb/experimental
* Simple building and packaging of i18n
* Much simpler, pure-python packaging
* Update doc for PPA
* HTML Output
* Ok when insert/remove external disk
* Excexclude rootfs and autofs
* Try before removing process
* Reduce process load
* Add control/msg to lib import
* Solve the _() error message
* Verbose the help message depending of the PsUtil version
* Change the process list algorithm
* Remove the unused get_io_counters calls
* Ready for beta test
* Change the help windows
* PsUtil - Add process stat
* Replace FsGrab by PsUtil
* DISK IO
* First version of the experimental BRANCH PSUtil replace StatGrab for CPU, LOAD and MEM
* version 1.3.7
* B&W console
* Try for all the init color sequence
* Flatt button in the README
* Add try before curses.curs_set(0)
* Update screenshot
* version 1.3.6
* Change Roadmap to add the issue 26
* wMerge branch 'master' of github.com:nicolargo/glances
* Minor update
* Merge pull request #25 from jeanbob/master
* French and Spanish translation added.
* i18n support added by JeanBoB. French translation added.
* Change the path to Python to env issue #20
* Upgrade ss
* Update README
* Update screenshot
* version 1.3.5
* Add a buildout.cfg
* Update screenshot
* version 1.3.4
* Update screenshot for v1.3.3
* version 1.3.3
* Add Python PYPI informations
* Add a french version of the README
* Update the documentation
* Update screenshot
* version 1.3.2
* version 1.3.1
* Merge pull request #8 from rwmacleod/master
* Fix consomption typo
* No more FS limitation
* Update screenshot
* version 1.3
* Docs
* Change the REAME for the 1.2 version
* version 1.2
* Instructions to install on Ubuntu 10.04 and 10.10
* Ubuntu 10.04 note
* Ubuntu < 11.04 notes
* Change installation procedure
* version 1.1.3
* v1.1.2
* version 1.1.1
* 1.1 screenshot
* Add caption
* Add setup.py
* Catch CTRL-C before init screen
* Catch CTRL-C before init screen
* Add control before division
* Fix Readme.md
* Fix Readme.md
* Fix screenshot in Readme.md
* Add screenshot
......@@ -5,7 +5,8 @@ Version 1.5
* Correct a bug on process IO with non root users
* Add 'w' shortkey to delete finished warning message
* Add 'x' shortkey to delete finished warning/critical message
* Code and memory print optimization
* Bugs correction
* Code optimization
Version 1.4.2.2
===============
......
......@@ -1867,24 +1867,27 @@ class glancesScreen:
dtime, 8)
# IO
if tag_io:
if processlist[processes]['io_counters'] == {}:
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 62,
_("A_DENY"), 6)
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 70,
_("A_DENY"), 6)
else:
# Processes are only refresh every 2 refresh_time
#~ elapsed_time = max(1, self.__refresh_time) * 2
io_read = processlist[processes]['io_counters'][2]
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 62,
self.__autoUnit(io_read), 6)
io_write = processlist[processes]['io_counters'][3]
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 70,
self.__autoUnit(io_write), 6)
try:
if processlist[processes]['io_counters'] == {}:
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 62,
_("A_DENY"), 6)
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 70,
_("A_DENY"), 6)
else:
# Processes are only refresh every 2 refresh_time
#~ elapsed_time = max(1, self.__refresh_time) * 2
io_read = processlist[processes]['io_counters'][2]
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 62,
self.__autoUnit(io_read), 6)
io_write = processlist[processes]['io_counters'][3]
self.term_window.addnstr(
self.process_y + 3 + processes, process_x + 70,
self.__autoUnit(io_write), 6)
except:
pass
# display process command line
max_process_name = screen_x - process_x - process_name_x
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册