X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FBackgroundProcessor.java;h=af09b461545edb6d781f2a135b291871c377b308;hb=ff3dacec3be60f870d81f6df11bd9fff92aa6047;hp=3c2af93e3e56d7a6ae8e537c688a09cc25a79ca6;hpb=32692e00046b7ec16b6a2e20bd54800b2b48d4c0;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/BackgroundProcessor.java b/src/main/java/org/ldk/structs/BackgroundProcessor.java
index 3c2af93e..af09b461 100644
--- a/src/main/java/org/ldk/structs/BackgroundProcessor.java
+++ b/src/main/java/org/ldk/structs/BackgroundProcessor.java
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
 import javax.annotation.Nullable;
 
 
@@ -17,6 +18,8 @@ import javax.annotation.Nullable;
  * [`ChannelManager`] persistence should be done in the background.
  * Calling [`ChannelManager::timer_tick_occurred`] and [`PeerManager::timer_tick_occurred`]
  * at the appropriate intervals.
+ * Calling [`NetworkGraph::remove_stale_channels`] (if a [`NetGraphMsgHandler`] is provided to
+ * [`BackgroundProcessor::start`]).
  * 
  * It will also call [`PeerManager::process_events`] periodically though this shouldn't be relied
  * upon as doing so may result in high latency.
@@ -46,17 +49,21 @@ public class BackgroundProcessor extends CommonBase {
 	 * documentation].
 	 * 
 	 * The thread runs indefinitely unless the object is dropped, [`stop`] is called, or
-	 * `persist_manager` returns an error. In case of an error, the error is retrieved by calling
+	 * [`Persister::persist_manager`] returns an error. In case of an error, the error is retrieved by calling
 	 * either [`join`] or [`stop`].
 	 * 
 	 * # Data Persistence
 	 * 
-	 * `persist_manager` is responsible for writing out the [`ChannelManager`] to disk, and/or
+	 * [`Persister::persist_manager`] is responsible for writing out the [`ChannelManager`] to disk, and/or
 	 * uploading to one or more backup services. See [`ChannelManager::write`] for writing out a
 	 * [`ChannelManager`]. See [`FilesystemPersister::persist_manager`] for Rust-Lightning's
 	 * provided implementation.
 	 * 
-	 * Typically, users should either implement [`ChannelManagerPersister`] to never return an
+	 * [`Persister::persist_graph`] is responsible for writing out the [`NetworkGraph`] to disk. See
+	 * [`NetworkGraph::write`] for writing out a [`NetworkGraph`]. See [`FilesystemPersister::persist_network_graph`]
+	 * for Rust-Lightning's provided implementation.
+	 * 
+	 * Typically, users should either implement [`Persister::persist_manager`] to never return an
 	 * error or call [`join`] and handle any error that may arise. For the latter case,
 	 * `BackgroundProcessor` must be restarted by calling `start` again after handling the error.
 	 * 
@@ -67,20 +74,29 @@ public class BackgroundProcessor extends CommonBase {
 	 * functionality implemented by other handlers.
 	 * [`NetGraphMsgHandler`] if given will update the [`NetworkGraph`] based on payment failures.
 	 * 
-	 * [top-level documentation]: Self
+	 * [top-level documentation]: BackgroundProcessor
 	 * [`join`]: Self::join
 	 * [`stop`]: Self::stop
 	 * [`ChannelManager`]: lightning::ln::channelmanager::ChannelManager
 	 * [`ChannelManager::write`]: lightning::ln::channelmanager::ChannelManager#impl-Writeable
 	 * [`FilesystemPersister::persist_manager`]: lightning_persister::FilesystemPersister::persist_manager
+	 * [`FilesystemPersister::persist_network_graph`]: lightning_persister::FilesystemPersister::persist_network_graph
 	 * [`NetworkGraph`]: lightning::routing::network_graph::NetworkGraph
+	 * [`NetworkGraph::write`]: lightning::routing::network_graph::NetworkGraph#impl-Writeable
 	 * 
 	 * Note that net_graph_msg_handler (or a relevant inner pointer) may be NULL or all-0s to represent None
 	 */
-	public static BackgroundProcessor start(ChannelManagerPersister persister, EventHandler event_handler, ChainMonitor chain_monitor, ChannelManager channel_manager, NetGraphMsgHandler net_graph_msg_handler, PeerManager peer_manager, Logger logger) {
+	public static BackgroundProcessor start(Persister persister, EventHandler event_handler, ChainMonitor chain_monitor, ChannelManager channel_manager, @Nullable NetGraphMsgHandler net_graph_msg_handler, PeerManager peer_manager, Logger logger) {
 		long ret = bindings.BackgroundProcessor_start(persister == null ? 0 : persister.ptr, event_handler == null ? 0 : event_handler.ptr, chain_monitor == null ? 0 : chain_monitor.ptr & ~1, channel_manager == null ? 0 : channel_manager.ptr & ~1, net_graph_msg_handler == null ? 0 : net_graph_msg_handler.ptr & ~1, peer_manager == null ? 0 : peer_manager.ptr & ~1, logger == null ? 0 : logger.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
-		BackgroundProcessor ret_hu_conv = new BackgroundProcessor(null, ret);
+		Reference.reachabilityFence(persister);
+		Reference.reachabilityFence(event_handler);
+		Reference.reachabilityFence(chain_monitor);
+		Reference.reachabilityFence(channel_manager);
+		Reference.reachabilityFence(net_graph_msg_handler);
+		Reference.reachabilityFence(peer_manager);
+		Reference.reachabilityFence(logger);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		BackgroundProcessor ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new BackgroundProcessor(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
 		ret_hu_conv.ptrs_to.add(persister);
 		ret_hu_conv.ptrs_to.add(event_handler);
@@ -105,7 +121,8 @@ public class BackgroundProcessor extends CommonBase {
 	 */
 	public Result_NoneErrorZ join() {
 		long ret = bindings.BackgroundProcessor_join(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneErrorZ ret_hu_conv = Result_NoneErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(this);
 		// Due to rust's strict-ownership memory model, in some cases we need to "move"
@@ -115,7 +132,7 @@ public class BackgroundProcessor extends CommonBase {
 		// However, in some cases (eg here), there is no way to clone an object, and thus
 		// we actually have to pass full ownership to Rust.
 		// Thus, after this call, this is reset to null and is now a dummy object.
-		this.ptr = 0;
+		this.ptr = 0;;
 		return ret_hu_conv;
 	}
 
@@ -132,7 +149,8 @@ public class BackgroundProcessor extends CommonBase {
 	 */
 	public Result_NoneErrorZ stop() {
 		long ret = bindings.BackgroundProcessor_stop(this.ptr);
-		if (ret >= 0 && ret < 1024) { return null; }
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_NoneErrorZ ret_hu_conv = Result_NoneErrorZ.constr_from_ptr(ret);
 		this.ptrs_to.add(this);
 		// Due to rust's strict-ownership memory model, in some cases we need to "move"
@@ -142,7 +160,7 @@ public class BackgroundProcessor extends CommonBase {
 		// However, in some cases (eg here), there is no way to clone an object, and thus
 		// we actually have to pass full ownership to Rust.
 		// Thus, after this call, this is reset to null and is now a dummy object.
-		this.ptr = 0;
+		this.ptr = 0;;
 		return ret_hu_conv;
 	}