Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move store-specific stats to node/stats/store/

  • Loading branch information...
commit a59255dd9fe93b1203066dfcf1965db5a324d123 1 parent 7fb724b
@toad toad authored
Showing with 37 additions and 37 deletions.
  1. +4 −4 src/freenet/clients/http/DiagnosticToadlet.java
  2. +4 −4 src/freenet/clients/http/StatisticsToadlet.java
  3. +11 −11 src/freenet/node/Node.java
  4. +2 −2 src/freenet/node/NodeStats.java
  5. +1 −1  src/freenet/node/stats/{ → store}/DataStoreInstanceType.java
  6. +1 −1  src/freenet/node/stats/{ → store}/DataStoreKeyType.java
  7. +1 −1  src/freenet/node/stats/{ → store}/DataStoreStats.java
  8. +1 −1  src/freenet/node/stats/{ → store}/DataStoreType.java
  9. +1 −1  src/freenet/node/stats/{ → store}/NotAvailNodeStoreStats.java
  10. +1 −1  src/freenet/node/stats/{ → store}/StatsNotAvailableException.java
  11. +1 −1  src/freenet/node/stats/{ → store}/StoreAccessStats.java
  12. +1 −1  src/freenet/node/stats/{ → store}/StoreCallbackStats.java
  13. +1 −1  src/freenet/node/stats/{ → store}/StoreLocationStats.java
  14. +1 −1  src/freenet/store/BerkeleyDBFreenetStore.java
  15. +1 −1  src/freenet/store/FreenetStore.java
  16. +1 −1  src/freenet/store/NullFreenetStore.java
  17. +1 −1  src/freenet/store/RAMFreenetStore.java
  18. +1 −1  src/freenet/store/SlashdotStore.java
  19. +1 −1  src/freenet/store/StoreCallback.java
  20. +1 −1  src/freenet/store/saltedhash/SaltedHashFreenetStore.java
View
8 src/freenet/clients/http/DiagnosticToadlet.java
@@ -32,10 +32,10 @@
import freenet.node.fcp.UploadDirRequestStatus;
import freenet.node.fcp.UploadFileRequestStatus;
import freenet.node.requests.RequestTracker;
-import freenet.node.stats.DataStoreInstanceType;
-import freenet.node.stats.DataStoreStats;
-import freenet.node.stats.StatsNotAvailableException;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.DataStoreInstanceType;
+import freenet.node.stats.store.DataStoreStats;
+import freenet.node.stats.store.StatsNotAvailableException;
+import freenet.node.stats.store.StoreAccessStats;
import freenet.pluginmanager.PluginInfoWrapper;
import freenet.pluginmanager.PluginManager;
import freenet.support.BandwidthStatsContainer;
View
8 src/freenet/clients/http/StatisticsToadlet.java
@@ -31,10 +31,10 @@
import freenet.node.RequestStarterGroup;
import freenet.node.Version;
import freenet.node.requests.RequestTracker;
-import freenet.node.stats.DataStoreInstanceType;
-import freenet.node.stats.DataStoreStats;
-import freenet.node.stats.StatsNotAvailableException;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.DataStoreInstanceType;
+import freenet.node.stats.store.DataStoreStats;
+import freenet.node.stats.store.StatsNotAvailableException;
+import freenet.node.stats.store.StoreAccessStats;
import freenet.support.BandwidthStatsContainer;
import freenet.support.HTMLNode;
import freenet.support.SizeUtil;
View
22 src/freenet/node/Node.java
@@ -4,13 +4,13 @@
/* Freenet 0.7 node. */
package freenet.node;
-import static freenet.node.stats.DataStoreKeyType.CHK;
-import static freenet.node.stats.DataStoreKeyType.PUB_KEY;
-import static freenet.node.stats.DataStoreKeyType.SSK;
-import static freenet.node.stats.DataStoreType.CACHE;
-import static freenet.node.stats.DataStoreType.CLIENT;
-import static freenet.node.stats.DataStoreType.SLASHDOT;
-import static freenet.node.stats.DataStoreType.STORE;
+import static freenet.node.stats.store.DataStoreKeyType.CHK;
+import static freenet.node.stats.store.DataStoreKeyType.PUB_KEY;
+import static freenet.node.stats.store.DataStoreKeyType.SSK;
+import static freenet.node.stats.store.DataStoreType.CACHE;
+import static freenet.node.stats.store.DataStoreType.CLIENT;
+import static freenet.node.stats.store.DataStoreType.SLASHDOT;
+import static freenet.node.stats.store.DataStoreType.STORE;
import java.io.BufferedReader;
import java.io.EOFException;
@@ -120,10 +120,10 @@
import freenet.node.requests.RequestTag;
import freenet.node.requests.RequestTracker;
import freenet.node.requests.SSKInsertSender;
-import freenet.node.stats.DataStoreInstanceType;
-import freenet.node.stats.DataStoreStats;
-import freenet.node.stats.NotAvailNodeStoreStats;
-import freenet.node.stats.StoreCallbackStats;
+import freenet.node.stats.store.DataStoreInstanceType;
+import freenet.node.stats.store.DataStoreStats;
+import freenet.node.stats.store.NotAvailNodeStoreStats;
+import freenet.node.stats.store.StoreCallbackStats;
import freenet.node.transport.DNSRequester;
import freenet.node.transport.NodeCrypto;
import freenet.node.transport.NodeCryptoConfig;
View
4 src/freenet/node/NodeStats.java
@@ -26,8 +26,8 @@
import freenet.node.requests.RequestTracker.CountedRequests;
import freenet.node.SecurityLevels.NETWORK_THREAT_LEVEL;
import freenet.node.requests.UIDTag;
-import freenet.node.stats.StatsNotAvailableException;
-import freenet.node.stats.StoreLocationStats;
+import freenet.node.stats.store.StatsNotAvailableException;
+import freenet.node.stats.store.StoreLocationStats;
import freenet.store.CHKStore;
import freenet.support.HTMLNode;
import freenet.support.Histogram2;
View
2  src/freenet/node/stats/DataStoreInstanceType.java → ...eenet/node/stats/store/DataStoreInstanceType.java
@@ -1,4 +1,4 @@
-package freenet.node.stats;
+package freenet.node.stats.store;
/**
* This class represents one instance of data store.
View
2  src/freenet/node/stats/DataStoreKeyType.java → src/freenet/node/stats/store/DataStoreKeyType.java
@@ -1,7 +1,7 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.stats;
+package freenet.node.stats.store;
/**
* enum for key types of existing data stores
View
2  src/freenet/node/stats/DataStoreStats.java → src/freenet/node/stats/store/DataStoreStats.java
@@ -1,7 +1,7 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.stats;
+package freenet.node.stats.store;
/**
* This interface represents the data we can publish on our stats page for a given instance of a data store.
View
2  src/freenet/node/stats/DataStoreType.java → src/freenet/node/stats/store/DataStoreType.java
@@ -1,7 +1,7 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.stats;
+package freenet.node.stats.store;
/**
* Enum for data store types
View
2  src/freenet/node/stats/NotAvailNodeStoreStats.java → ...enet/node/stats/store/NotAvailNodeStoreStats.java
@@ -1,7 +1,7 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.stats;
+package freenet.node.stats.store;
/**
* This implementation is used for data stores that have no aggregated stats
View
2  ...reenet/node/stats/StatsNotAvailableException.java → .../node/stats/store/StatsNotAvailableException.java
@@ -1,7 +1,7 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.stats;
+package freenet.node.stats.store;
/**
* @author nikotyan
View
2  src/freenet/node/stats/StoreAccessStats.java → src/freenet/node/stats/store/StoreAccessStats.java
@@ -1,4 +1,4 @@
-package freenet.node.stats;
+package freenet.node.stats.store;
public abstract class StoreAccessStats {
View
2  src/freenet/node/stats/StoreCallbackStats.java → src/freenet/node/stats/store/StoreCallbackStats.java
@@ -1,7 +1,7 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.stats;
+package freenet.node.stats.store;
import freenet.store.StoreCallback;
View
2  src/freenet/node/stats/StoreLocationStats.java → src/freenet/node/stats/store/StoreLocationStats.java
@@ -1,7 +1,7 @@
/* This code is part of Freenet. It is distributed under the GNU General
* Public License, version 2 (or at your option any later version). See
* http://www.gnu.org/ for further details of the GPL. */
-package freenet.node.stats;
+package freenet.node.stats.store;
/**
* This interface represents aggregated stats for data store
View
2  src/freenet/store/BerkeleyDBFreenetStore.java
@@ -40,7 +40,7 @@
import freenet.keys.KeyVerifyException;
import freenet.keys.SSKBlock;
import freenet.node.SemiOrderedShutdownHook;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.StoreAccessStats;
import freenet.support.Fields;
import freenet.support.HexUtil;
import freenet.support.Logger;
View
2  src/freenet/store/FreenetStore.java
@@ -4,7 +4,7 @@
import com.sleepycat.je.DatabaseException;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.StoreAccessStats;
/**
* Datastore interface
View
2  src/freenet/store/NullFreenetStore.java
@@ -4,7 +4,7 @@
import com.sleepycat.je.DatabaseException;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.StoreAccessStats;
public class NullFreenetStore<T extends StorableBlock> implements FreenetStore<T> {
View
2  src/freenet/store/RAMFreenetStore.java
@@ -7,7 +7,7 @@
import com.sleepycat.je.DatabaseException;
import freenet.keys.KeyVerifyException;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.StoreAccessStats;
import freenet.support.ByteArrayWrapper;
import freenet.support.LRUHashtable;
import freenet.support.Logger;
View
2  src/freenet/store/SlashdotStore.java
@@ -10,7 +10,7 @@
import com.sleepycat.je.DatabaseException;
import freenet.keys.KeyVerifyException;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.StoreAccessStats;
import freenet.support.ByteArrayWrapper;
import freenet.support.LRUHashtable;
import freenet.support.LogThresholdCallback;
View
2  src/freenet/store/StoreCallback.java
@@ -9,7 +9,7 @@
import freenet.crypt.DSAPublicKey;
import freenet.keys.KeyVerifyException;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.StoreAccessStats;
/**
* @author toad
View
2  src/freenet/store/saltedhash/SaltedHashFreenetStore.java
@@ -37,7 +37,7 @@
import freenet.l10n.NodeL10n;
import freenet.node.FastRunnable;
import freenet.node.SemiOrderedShutdownHook;
-import freenet.node.stats.StoreAccessStats;
+import freenet.node.stats.store.StoreAccessStats;
import freenet.node.useralerts.AbstractUserAlert;
import freenet.node.useralerts.UserAlert;
import freenet.node.useralerts.UserAlertManager;
Please sign in to comment.
Something went wrong with that request. Please try again.