X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common%2Ffuture.h;h=65bea20b56b42e347a2fe89a841fa2b7d4adb5f1;hb=f529ebe9cc9c0a58a6ba4a1ebcd377b4dabf830a;hp=12c0bfc603dacd78d2810fad32721b4b6622a6ef;hpb=850c2bc019012444a7081e0347da9d7d24b213b4;p=casparcg

diff --git a/common/future.h b/common/future.h
index 12c0bfc60..65bea20b5 100644
--- a/common/future.h
+++ b/common/future.h
@@ -25,126 +25,6 @@ bool is_ready(const F& future)
 	return future.wait_for(std::chrono::seconds(0)) == std::future_status::ready;
 }
 
-/**
- * A utility that helps the producer side of a future when the task is not
- * able to complete immediately but there are known retry points in the code.
- */
-template<class R>
-class retry_task
-{
-public:
-	typedef boost::function<boost::optional<R> ()> func_type;
-	
-	retry_task() : done_(false) {}
-
-	/**
-	 * Reset the state with a new task. If the previous task has not completed
-	 * the old one will be discarded.
-	 *
-	 * @param func The function that tries to calculate future result. If the
-	 *             optional return value is set the future is marked as ready.
-	 */
-	void set_task(const func_type& func)
-	{
-		boost::unique_lock<boost::mutex> lock(mutex_);
-
-		func_ = func;
-		done_ = false;
-		promise_ = std::promise<R>();
-	}
-
-	/**
-	 * Take ownership of the future for the current task. Cannot only be called
-	 * once for each task.
-	 *
-	 * @return the future.
-	 */
-	std::future<R> get_future()
-	{
-		boost::unique_lock<boost::mutex> lock(mutex_);
-
-		return promise_.get_future();
-	}
-
-	/**
-	 * Call this when it is guaranteed or probable that the task will be able
-	 * to complete.
-	 *
-	 * @return true if the task completed (the future will have a result).
-	 */
-	bool try_completion()
-	{
-		boost::unique_lock<boost::mutex> lock(mutex_);
-
-		return try_completion_internal();
-	}
-
-	/**
-	 * Call this when it is certain that the result should be ready, and if not
-	 * it should be regarded as an unrecoverable error (retrying again would
-	 * be useless), so the future will be marked as failed.
-	 *
-	 * @param exception The exception to mark the future with *if* the task
-	 *                  completion fails.
-	 */
-	template <class E>
-	void try_or_fail(const E& exception)
-	{
-		boost::unique_lock<boost::mutex> lock(mutex_);
-
-		if (!try_completion_internal())
-		{
-			try
-			{
-				throw exception;
-			}
-			catch (...)
-			{
-				CASPAR_LOG_CURRENT_EXCEPTION();
-				promise_.set_exception(std::current_exception());
-				done_ = true;
-			}
-		}
-	}
-private:
-	bool try_completion_internal()
-	{
-		if (!func_)
-			return false;
-
-		if (done_)
-			return true;
-
-		boost::optional<R> result;
-
-		try
-		{
-			result = func_();
-		}
-		catch (...)
-		{
-			CASPAR_LOG_CURRENT_EXCEPTION();
-			promise_.set_exception(std::current_exception());
-			done_ = true;
-
-			return true;
-		}
-
-		if (result)
-		{
-			promise_.set_value(*result);
-			done_ = true;
-		}
-
-		return done_;
-	}
-private:
-	boost::mutex mutex_;
-	func_type func_;
-	std::promise<R> promise_;
-	bool done_;
-};
-
 /**
  * Wrap a value in a future with an already known result.
  * <p>