comparison base/StorageAdviser.cpp @ 359:824ee993ca8d

* merge revision 842 from spectrogram-rejig -- attempt to improve disk/memory allocation in ffts
author Chris Cannam
date Tue, 22 Jan 2008 23:11:48 +0000
parents aa8dbac62024
children 7cc6b7b0d819
comparison
equal deleted inserted replaced
358:9203b82a8c53 359:824ee993ca8d
75 else if (minmb > (memoryFree * 3) / 4) memoryStatus = Insufficient; 75 else if (minmb > (memoryFree * 3) / 4) memoryStatus = Insufficient;
76 else if (maxmb > (memoryFree * 3) / 4) memoryStatus = Marginal; 76 else if (maxmb > (memoryFree * 3) / 4) memoryStatus = Marginal;
77 else if (minmb > (memoryFree / 3)) memoryStatus = Marginal; 77 else if (minmb > (memoryFree / 3)) memoryStatus = Marginal;
78 else if (memoryTotal == -1 || 78 else if (memoryTotal == -1 ||
79 minmb > (memoryTotal / 10)) memoryStatus = Marginal; 79 minmb > (memoryTotal / 10)) memoryStatus = Marginal;
80 else if (memoryFree < memoryTotal / 4) memoryStatus = Marginal;
80 else memoryStatus = Sufficient; 81 else memoryStatus = Sufficient;
81 82
82 if (discFree == -1) discStatus = Unknown; 83 if (discFree == -1) discStatus = Unknown;
83 else if (minmb > (discFree * 3) / 4) discStatus = Insufficient; 84 else if (minmb > (discFree * 3) / 4) discStatus = Insufficient;
84 else if (maxmb > (discFree / 4)) discStatus = Marginal; 85 else if (maxmb > (discFree / 4)) discStatus = Marginal;