Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-19 00:01:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct 'avaiable()' to use max of young / eden

Browse Source
This commit is contained in:
sixcooler 2012-01-16 16:59:58 +01:00
parent 3db2b5f8e8
commit 985b78cf89
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/net/yacy/kelondro/util/GenerationMemoryStrategy.java
View File

@ -58,7 +58,7 @@ public class GenerationMemoryStrategy extends MemoryStrategy {
* @return bytes
*/
protected final long available() {
return available(false);
return available(true);
}
/**
@ -67,7 +67,7 @@ public class GenerationMemoryStrategy extends MemoryStrategy {
* @return bytes
*/
private final long available(final boolean force) {
return force & properState() ? Math.max(youngAvailable(), oldAvailable()) : Math.min(youngAvailable(), Math.max(M, oldAvailable()));
return force & properState(force) ? Math.max(youngAvailable(), oldAvailable()) : Math.min(youngAvailable(), Math.max(M, oldAvailable()));
}
/**
@ -93,14 +93,6 @@ public class GenerationMemoryStrategy extends MemoryStrategy {
protected final long maxMemory() {
return heap.getHeapMemoryUsage().getMax();
}
/**
* currently not reserved memory
* @return bytes
*/
private final long unreserved() {
return Math.max(0, maxMemory() - total());
}
/**
* checks if a specified amount of bytes are available
@ -113,7 +105,7 @@ public class GenerationMemoryStrategy extends MemoryStrategy {
protected final boolean request(final long size, final boolean force, boolean shortStatus) {
if (size == 0l) return true; // does not make sense to check - returning true without setting shortStatus (which also doesn't make sense to me)
final boolean unknown = size < 0l; // size < 0 indicate an unknown size - maybe from gziped streams
final boolean r = unknown? properState(true) : size < available(force);
final boolean r = unknown? properState(force) : size < available(force);
shortStatus = !r;
return r;
}
@ -132,7 +124,7 @@ public class GenerationMemoryStrategy extends MemoryStrategy {
*/
private final long oldAvailable() {
final MemoryUsage usage = getUsage(old, true);
return unreserved() + usage.getCommitted() - usage.getUsed();
return Math.max(usage.getMax(), usage.getCommitted()) - usage.getUsed();
}
/**