apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 11860: combining 32 bit signed values into a 64 bit value had errors. This should correct that

Browse Source
This commit is contained in:
Sam Robertson 2012-01-23 01:30:15 -08:00
parent 68b6f2b1c5
commit 7fb6a695c1
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/com/cloud/network/resource/F5BigIpResource.java
View File

@ -949,20 +949,8 @@ public class F5BigIpResource implements ServerResource {
long high = stat.getValue().getHigh();
long low = stat.getValue().getLow();
long full;
long rollOver = 0x7fffffff + 1;
long full = getFullUsage(high, low);
if (high >= 0) {
full = (high << 32) & 0xffff0000;
} else {
full = ((high & 0x7fffffff) << 32) + (0x80000000 << 32);
}
if (low >= 0) {
full += low;
} else {
full += (low & 0x7fffffff) + rollOver;
}
bytesSentAndReceived[index] += full;
}
@ -979,6 +967,32 @@ public class F5BigIpResource implements ServerResource {
return answer;
}
private long getFullUsage(long high, long low) {
Double full;
Double rollOver = new Double((double) 0x7fffffff);
rollOver = new Double(rollOver.doubleValue() + 1.0);
if (high >= 0) {
// shift left 32 bits and mask off new bits to 0's
full = new Double((high << 32 & 0xffff0000));
} else {
// mask off sign bits + shift left by 32 bits then add the sign bit back
full = new Double(((high & 0x7fffffff) << 32) + (0x80000000 << 32));
}
if (low >= 0) {
// add low to full and we're good
full = new Double(full.doubleValue() + (double) low);
} else {
// add full to low after masking off sign bits and adding 1 to the masked off low order value
full = new Double(full.doubleValue() + (double) ((low & 0x7fffffff)) + rollOver.doubleValue());
}
return full.longValue();
}
// Misc methods
private String tagAddressWithRouteDomain(String address, long vlanTag) {