From d31f0e337f40d16780e055a35ac401da2209abd2 Mon Sep 17 00:00:00 2001 From: Joshua Kissoon Date: Sun, 9 Mar 2014 21:04:18 +0530 Subject: [PATCH] Still working on saving node state, the code is a huge mess right now --- src/kademlia/core/Kademlia.java | 92 ++++++++++++++++++---- src/kademlia/dht/DHT.java | 2 +- src/kademlia/node/Node.java | 2 +- src/kademlia/tests/NodeConnectionTest.java | 11 +-- src/kademlia/tests/SaveStateTest.java | 43 ++++++++++ 5 files changed, 129 insertions(+), 21 deletions(-) create mode 100644 src/kademlia/tests/SaveStateTest.java diff --git a/src/kademlia/core/Kademlia.java b/src/kademlia/core/Kademlia.java index 098548e..d2d0931 100644 --- a/src/kademlia/core/Kademlia.java +++ b/src/kademlia/core/Kademlia.java @@ -1,7 +1,9 @@ package kademlia.core; +import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; @@ -70,12 +72,12 @@ public class Kademlia * from disk or a network error occurred while * attempting to connect to the network * */ - public Kademlia(String ownerId, Node localNode, int udpPort) throws IOException + public Kademlia(String ownerId, Node localNode, int udpPort, DHT dht) throws IOException { this.ownerId = ownerId; this.udpPort = udpPort; this.localNode = localNode; - this.dht = new DHT(); + this.dht = dht; this.messageFactory = new MessageFactory(localNode, this.dht); this.server = new KadServer(udpPort, this.messageFactory, this.localNode); this.timer = new Timer(true); @@ -105,18 +107,36 @@ public class Kademlia public Kademlia(String ownerId, NodeId defaultId, int udpPort) throws IOException { - this(ownerId, new Node(defaultId, InetAddress.getLocalHost(), udpPort), udpPort); + this(ownerId, new Node(defaultId, InetAddress.getLocalHost(), udpPort), udpPort, new DHT()); } /** + * Load Stored state + * + * @param ownerId The ID of the owner for the stored state + * * @return A Kademlia instance loaded from a stored state in a file * + * @throws java.io.FileNotFoundException + * * @todo Boot up this Kademlia instance from a saved file state */ -// public Kademlia loadFromFile(String ownerId) -// { -// -// } + public static void loadFromFile(String ownerId) throws FileNotFoundException, IOException, ClassNotFoundException + { + /* Setup the file in which we store the state */ + DataInputStream din = new DataInputStream(new FileInputStream(getStateStorageFolderName() + File.separator + ownerId + ".kns")); + + /* Read the UDP Port that this app is running on */ + Integer rPort = new JsonSerializer().read(din); + + /* Read the node state */ + // Node rN = new JsonSerializer().read(din); + + /* Read the DHT */ + DHT rDht = new JsonSerializer().read(din); + + //return new Kademlia(ownerId, rN, rPort, rDht); + } /** * @return Node The local node for this system @@ -225,8 +245,11 @@ public class Kademlia * * @throws java.io.FileNotFoundException */ - public void shutdown() throws FileNotFoundException, IOException + public void shutdown() throws FileNotFoundException, IOException, ClassNotFoundException { + /* Shut down the server */ + this.server.shutdown(); + /* Save this Kademlia instance's state if required */ if (Configuration.SAVE_STATE_ON_SHUTDOWN) { @@ -235,8 +258,6 @@ public class Kademlia } - /* Shut down the server */ - this.server.shutdown(); /* Now we store the content locally in a file */ } @@ -246,19 +267,35 @@ public class Kademlia * * @throws java.io.FileNotFoundException */ - private void saveKadState() throws FileNotFoundException, IOException + private void saveKadState() throws FileNotFoundException, IOException, ClassNotFoundException { /* Setup the file in which we store the state */ - DataOutputStream dout = new DataOutputStream(new FileOutputStream(this.getStateStorageFolderName() + File.separator + this.ownerId + ".kns")); + DataOutputStream dout; + dout = new DataOutputStream(new FileOutputStream(getStateStorageFolderName() + File.separator + this.ownerId + ".kns")); + System.out.println("Saving state"); /* Save the UDP Port that this app is running on */ new JsonSerializer().write(this.udpPort, dout); /* Save the node state */ + dout = new DataOutputStream(new FileOutputStream(getStateStorageFolderName() + File.separator + this.ownerId + ".kns")); new JsonSerializer().write(this.localNode, dout); /* Save the DHT */ - new JsonSerializer().write(this.dht, dout); + // dout = new DataOutputStream(new FileOutputStream(getStateStorageFolderName() + File.separator + this.ownerId + ".kns")); + //new JsonSerializer().write(this.dht, dout); + +// System.out.println(dht.getStorageEntries()); +// +// DataInputStream din = new DataInputStream(new FileInputStream(getStateStorageFolderName() + File.separator + ownerId + ".kns")); +// DHT dddht = new JsonSerializer().read(din); +// System.out.println(); +// System.out.println(); +// System.out.println(); +// System.out.println(); +// System.out.println(dddht); + System.out.println("FInished saving state"); + } /** @@ -266,7 +303,7 @@ public class Kademlia * * @return String The name of the folder to store node states */ - private String getStateStorageFolderName() + private static String getStateStorageFolderName() { String storagePath = System.getProperty("user.home") + File.separator + Configuration.LOCAL_FOLDER; File mainStorageFolder = new File(storagePath); @@ -287,4 +324,31 @@ public class Kademlia return mainStorageFolder + File.separator + "nodes"; } + + /** + * Creates a string containing all data about this Kademlia instance + * + * @return The string representation of this Kad instance + */ + @Override + public String toString() + { + StringBuilder sb = new StringBuilder("\n\nPrinting Kad State for instance with owner: "); + sb.append(this.ownerId); + sb.append("\n\n"); + + sb.append("\n"); + sb.append("Local Node"); + sb.append(this.localNode); + sb.append("\n"); + + sb.append("\n"); + sb.append("Routing Table: "); + sb.append(this.localNode.getRoutingTable()); + sb.append("\n"); + + sb.append("\n\n\n"); + + return sb.toString(); + } } diff --git a/src/kademlia/dht/DHT.java b/src/kademlia/dht/DHT.java index a1ed7b0..b5139b7 100644 --- a/src/kademlia/dht/DHT.java +++ b/src/kademlia/dht/DHT.java @@ -24,7 +24,7 @@ public class DHT { private final StorageEntryManager entriesManager; - private final JsonSerializer contentSerializer; + private transient final JsonSerializer contentSerializer; { diff --git a/src/kademlia/node/Node.java b/src/kademlia/node/Node.java index 67b6d8b..d68303e 100644 --- a/src/kademlia/node/Node.java +++ b/src/kademlia/node/Node.java @@ -24,7 +24,7 @@ public class Node implements Streamable private InetAddress inetAddress; private int port; - private final RoutingTable routingTable; + private transient final RoutingTable routingTable; { diff --git a/src/kademlia/tests/NodeConnectionTest.java b/src/kademlia/tests/NodeConnectionTest.java index 312fa03..67f86de 100644 --- a/src/kademlia/tests/NodeConnectionTest.java +++ b/src/kademlia/tests/NodeConnectionTest.java @@ -1,14 +1,15 @@ -/** - * @author Joshua Kissoon - * @created 20140219 - * @desc Testing connecting 2 nodes - */ package kademlia.tests; import java.io.IOException; import kademlia.core.Kademlia; import kademlia.node.NodeId; +/** + * Testing connecting 2 nodes + * + * @author Joshua Kissoon + * @created 20140219 + */ public class NodeConnectionTest { diff --git a/src/kademlia/tests/SaveStateTest.java b/src/kademlia/tests/SaveStateTest.java new file mode 100644 index 0000000..eb16b1a --- /dev/null +++ b/src/kademlia/tests/SaveStateTest.java @@ -0,0 +1,43 @@ +package kademlia.tests; + +import kademlia.core.Kademlia; +import kademlia.node.NodeId; + +/** + * Testing the save and retrieve state operations + * + * @author Joshua Kissoon + * @since 20140309 + */ +public class SaveStateTest +{ + + public static void main(String[] args) + { + try + { + /* Setting up 2 Kad networks */ + Kademlia kad1 = new Kademlia("JoshuaK", new NodeId("ASF45678947584567467"), 7574); + Kademlia kad2 = new Kademlia("Crystal", new NodeId("ASERTKJDHGVHERJHGFLK"), 7572); + + /* Connecting 2 to 1 */ + System.out.println("Connecting Kad 1 and Kad 2"); + kad1.connect(kad2.getNode()); + + System.out.println(kad1); + System.out.println(kad2); + + /* Shutting down kad1 and restarting it */ + System.out.println("\n\n\nShutting down Kad instance"); + kad1.shutdown(); + + //System.out.println("\n\n\nReloading down Kad instance from file"); + //Kademlia.loadFromFile("JoshuaK"); + //System.out.println(kad3); + } + catch (Exception e) + { + e.printStackTrace();; + } + } +}