X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fpaths.h;h=67fe8a300ebb70d6e5081f94aafa7c57dc8b354a;hp=20a22495042b7780820ea3f12678108218d26a11;hb=fed2c4da36c2708f2a5a7a09eba61d014b9339d6;hpb=5be946cda7b8e2271ade6188ca3f5dc068826619

diff --git a/discover/paths.h b/discover/paths.h
index 20a2249..67fe8a3 100644
--- a/discover/paths.h
+++ b/discover/paths.h
@@ -2,6 +2,8 @@
 #define PATHS_H
 
 #include <url/url.h>
+#include <waiter/waiter.h>
+#include <process/process.h>
 
 /**
  * Utility function for joining two paths. Adds a / between a and b if
@@ -16,7 +18,43 @@ char *join_paths(void *alloc_ctx, const char *a, const char *b);
  */
 const char *mount_base(void);
 
+struct load_task;
+
+struct load_url_result {
+	enum {
+		LOAD_OK,    /* load complete. other members should only be
+			       accessed if status == LOAD_OK */
+
+		LOAD_ERROR, /* only signalled to async loaders
+			     * (sync will see a NULL result) */
+
+		LOAD_ASYNC, /* async load still in progress */
+
+		LOAD_CANCELLED,
+	} status;
+	struct pb_url		*url;
+	const char		*local;
+	bool			cleanup_local;
+	struct load_task	*task;
+};
+
+/* callback type for asynchronous loads. The callback implementation is
+ * responsible for freeing result.
+ */
+typedef void (*load_url_complete)(struct load_url_result *result, void *data);
+
+/* Start transfers that were waiting for network connectivity */
+void pending_network_jobs_start(void);
+void pending_network_jobs_cancel(void);
+
 /* Load a (potentially remote) file, and return a guaranteed-local name */
-char *load_url(void *ctx, struct pb_url *url, unsigned int *tempfile);
+struct load_url_result *load_url_async(void *ctx, struct pb_url *url,
+		load_url_complete complete, void *data,
+		waiter_cb stdout_cb, void *stdout_data);
+
+/* Cancel a pending load */
+void load_url_async_cancel(struct load_url_result *res);
+
+struct load_url_result *load_url(void *ctx, struct pb_url *url);
 
 #endif /* PATHS_H */