Download as
Browse Code »

Commit fa14a5485bf46868f0295e514a06e96c63c1f672

Authored by ruppert
1 parent a19e3aad
Exists in master and in 67 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

ENH: uses psutil instead of sigar now

Showing 1 changed file with 15 additions and 9 deletions   Show diff stats
invesalius/utils.py
  Diff comments   View file @fa14a54
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 #-------------------------------------------------------------------------- 18 #--------------------------------------------------------------------------
19 import platform 19 import platform
20 import time 20 import time
21 -import sigar  
22 import sys 21 import sys
23 import re 22 import re
24 import locale 23 import locale
@@ -215,14 +214,21 @@ def calculate_resizing_tofitmemory(x_size,y_size,n_slices,byte): @@ -215,14 +214,21 @@ def calculate_resizing_tofitmemory(x_size,y_size,n_slices,byte):
215 """ 214 """
216 imagesize = x_size * y_size * n_slices * byte * 28 215 imagesize = x_size * y_size * n_slices * byte * 28
217 216
218 - sg = sigar.open()  
219 - ram_free = sg.mem().actual_free()  
220 - ram_total = sg.mem().actual_free()  
221 - swap_free = sg.swap().free()  
222 - sg.close()  
223 -  
224 - print "RAM FREE", ram_free  
225 - print "RAM_TOTAL", ram_total 217 + # USING LIBSIGAR
  218 + #import sigar
  219 + #sg = sigar.open()
  220 + #ram_free = sg.mem().actual_free()
  221 + #ram_total = sg.mem().actual_free()
  222 + #swap_free = sg.swap().free()
  223 + #sg.close()
  224 +
  225 + # USING PSUTIL
  226 + import psutil
  227 + ram_free = psutil.phymem_usage().free + psutil.cached_phymem() + psutil.phymem_buffers()
  228 + ram_total = psutil.phymem_usage().total
  229 + swap_free = psutil.virtmem_usage().free
  230 + print "RAM_FREE=", ram_free
  231 + print "RAM_TOTAL=", ram_total
226 232
227 if (sys.platform == 'win32'): 233 if (sys.platform == 'win32'):
228 if (platform.architecture()[0] == '32bit'): 234 if (platform.architecture()[0] == '32bit'):