|
-<% int share = nethelper.getShareBandwidth();
+<% int share = Math.round(nethelper.getShareBandwidth() * 1.024f);
if (share < 12) {
out.print("");
out.print(intl._t("NOTE"));
diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index d2dadfd09..128368c6e 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -1525,8 +1525,15 @@ public class DataHelper {
}
/**
- * Caller should append 'B' or 'b' as appropriate
+ * This is binary, i.e. multiples of 1024.
+ * For decimal, see formatSize2Decimal().
+ *
+ * Caller should append 'B' or 'b' as appropriate.
+ *
+ * No space between the number and the letter.
* NOTE: formatSize2() recommended in most cases for readability
+ *
+ * @return e.g. "123.05Ki"
*/
public static String formatSize(long bytes) {
float val = bytes;
@@ -1540,23 +1547,29 @@ public class DataHelper {
String str = fmt.format(val);
switch (scale) {
- case 1: return str + "K";
- case 2: return str + "M";
- case 3: return str + "G";
- case 4: return str + "T";
- case 5: return str + "P";
- case 6: return str + "E";
- case 7: return str + "Z";
- case 8: return str + "Y";
+ case 1: return str + "Ki";
+ case 2: return str + "Mi";
+ case 3: return str + "Gi";
+ case 4: return str + "Ti";
+ case 5: return str + "Pi";
+ case 6: return str + "Ei";
+ case 7: return str + "Zi";
+ case 8: return str + "Yi";
default: return bytes + "";
}
}
/**
+ * This is binary, i.e. multiples of 1024.
+ * For decimal, see formatSize2Decimal().
+ *
+ * Caller should append 'B' or 'b' as appropriate.
* Like formatSize but with a non-breaking space after the number
* This seems consistent with most style guides out there.
* Use only in HTML, and not inside form values (use
* formatSize2(bytes, false) there instead).
+ *
+ * @return e.g. "123.05 Ki"
* @since 0.7.14, uses thin non-breaking space since 0.9.31
*/
public static String formatSize2(long bytes) {
@@ -1564,9 +1577,15 @@ public class DataHelper {
}
/**
+ * This is binary, i.e. multiples of 1024.
+ * For decimal, see formatSize2Decimal().
+ *
+ * Caller should append 'B' or 'b' as appropriate,
* Like formatSize but with a space after the number
* This seems consistent with most style guides out there.
+ *
* @param nonBreaking use an HTML thin non-breaking space ( )
+ * @return e.g. "123.05 Ki" or "123.05 Ki"
* @since 0.9.31
*/
public static String formatSize2(long bytes, boolean nonBreaking) {
@@ -1581,6 +1600,56 @@ public class DataHelper {
// Replace with thin non-breaking space (more consistent/predictable width between fonts & point sizes)
+ String space = nonBreaking ? " " : " ";
+ String str = fmt.format(val) + space;
+ switch (scale) {
+ case 1: return str + "Ki";
+ case 2: return str + "Mi";
+ case 3: return str + "Gi";
+ case 4: return str + "Ti";
+ case 5: return str + "Pi";
+ case 6: return str + "Ei";
+ case 7: return str + "Zi";
+ case 8: return str + "Yi";
+ default: return bytes + space;
+ }
+ }
+
+ /**
+ * This is decimal, i.e. multiples of 1000.
+ * For binary, see formatSize2().
+ *
+ * Caller should append 'B' or 'b' as appropriate.
+ * Like formatSize but with a space after the number
+ * This seems consistent with most style guides out there.
+ *
+ * @return e.g. "123.05 K"
+ * @since 0.9.34
+ */
+ public static String formatSize2Decimal(long bytes) {
+ return formatSize2Decimal(bytes, true);
+ }
+
+ /**
+ * This is decimal, i.e. multiples of 1000.
+ * For binary, see formatSize2().
+ *
+ * Caller should append 'B' or 'b' as appropriate.
+ * Like formatSize but with a space after the number
+ * This seems consistent with most style guides out there.
+ *
+ * @param nonBreaking use an HTML thin non-breaking space ( )
+ * @return e.g. "123.05 K" or "123.05 K"
+ * @since 0.9.34
+ */
+ public static String formatSize2Decimal(long bytes, boolean nonBreaking) {
+ double val = bytes;
+ int scale = 0;
+ while (val >= 1000) {
+ scale++;
+ val /= 1000;
+ }
+ DecimalFormat fmt = new DecimalFormat("##0.00");
String space = nonBreaking ? " " : " ";
String str = fmt.format(val) + space;
switch (scale) {
diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java
index 09ef6f351..b668580df 100644
--- a/core/java/src/net/i2p/util/LogManager.java
+++ b/core/java/src/net/i2p/util/LogManager.java
@@ -552,7 +552,9 @@ public class LogManager implements Flushable {
String v = size.trim().toUpperCase(Locale.US);
if (v.length() < 2)
return -1;
- if (v.endsWith("B"))
+ if (v.endsWith("IB"))
+ v = v.substring(0, v.length() - 2);
+ else if (v.endsWith("B"))
v = v.substring(0, v.length() - 1);
char mod = v.charAt(v.length() - 1);
if (!Character.isDigit(mod)) v = v.substring(0, v.length() - 1);
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index e0ea10cb8..9a8159da8 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -973,19 +973,26 @@ public class Router implements RouterClock.ClockShiftListener {
@Deprecated
public static final char CAPABILITY_NEW_TUNNEL = 'T';
- /** @since 0.9.33 */
+ /** In binary (1024) Kbytes
+ * @since 0.9.33 */
public static final int MIN_BW_K = 0;
- /** @since 0.9.33 */
+ /** In binary (1024) Kbytes
+ * @since 0.9.33 */
public static final int MIN_BW_L = 12;
- /** @since 0.9.33 */
+ /** In binary (1024) Kbytes
+ * @since 0.9.33 */
public static final int MIN_BW_M = 48;
- /** @since 0.9.33 */
+ /** In binary (1024) Kbytes
+ * @since 0.9.33 */
public static final int MIN_BW_N = 64;
- /** @since 0.9.33 */
+ /** In binary (1024) Kbytes
+ * @since 0.9.33 */
public static final int MIN_BW_O = 128;
- /** @since 0.9.33 */
+ /** In binary (1024) Kbytes
+ * @since 0.9.33 */
public static final int MIN_BW_P = 256;
- /** @since 0.9.33 */
+ /** In binary (1024) Kbytes
+ * @since 0.9.33 */
public static final int MIN_BW_X = 2000;
/**
diff --git a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
index 811625222..c7dfb4031 100644
--- a/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
+++ b/router/java/src/net/i2p/router/transport/FIFOBandwidthLimiter.java
@@ -133,16 +133,28 @@ public class FIFOBandwidthLimiter {
/** @return smoothed 15 second rate */
public float getReceiveBps15s() { return _recvBps15s; }
- /** The configured maximum, not the current rate */
+ /**
+ * The configured maximum, not the current rate.
+ * In binary K, i.e. rate / 1024.
+ */
public int getOutboundKBytesPerSecond() { return _refiller.getOutboundKBytesPerSecond(); }
- /** The configured maximum, not the current rate */
+ /**
+ * The configured maximum, not the current rate.
+ * In binary K, i.e. rate / 1024.
+ */
public int getInboundKBytesPerSecond() { return _refiller.getInboundKBytesPerSecond(); }
- /** The configured maximum, not the current rate */
+ /**
+ * The configured maximum, not the current rate.
+ * In binary K, i.e. rate / 1024.
+ */
public int getOutboundBurstKBytesPerSecond() { return _refiller.getOutboundBurstKBytesPerSecond(); }
- /** The configured maximum, not the current rate */
+ /**
+ * The configured maximum, not the current rate.
+ * In binary K, i.e. rate / 1024.
+ */
public int getInboundBurstKBytesPerSecond() { return _refiller.getInboundBurstKBytesPerSecond(); }
public synchronized void reinitialize() {
|