From 180361780d04fc5959f1ac47740146958c611dae Mon Sep 17 00:00:00 2001 From: kaldoran <kaldoran@live.fr> Date: Wed, 27 Jul 2016 16:26:00 -0400 Subject: [PATCH] Add timepoint into the API of SecureDht and DhtRunner --- include/opendht/dhtrunner.h | 14 +++++++------- src/dhtrunner.cpp | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h index dc342bf9..10144226 100644 --- a/include/opendht/dhtrunner.h +++ b/include/opendht/dhtrunner.h @@ -156,16 +156,16 @@ public: void cancelListen(InfoHash h, size_t token); void cancelListen(InfoHash h, std::shared_future<size_t> token); - void put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb={}, bool permanent = false); - void put(InfoHash hash, std::shared_ptr<Value> value, DoneCallbackSimple cb, bool permanent = false) { - put(hash, value, bindDoneCb(cb), permanent); + void put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb={}, time_point created=time_point::max(), bool permanent = false); + void put(InfoHash hash, std::shared_ptr<Value> value, DoneCallbackSimple cb, time_point created=time_point::max(), bool permanent = false) { + put(hash, value, bindDoneCb(cb), created, permanent); } - void put(InfoHash hash, Value&& value, DoneCallback cb={}, bool permanent = false); - void put(InfoHash hash, Value&& value, DoneCallbackSimple cb, bool permanent = false) { - put(hash, std::forward<Value>(value), bindDoneCb(cb), permanent); + void put(InfoHash hash, Value&& value, DoneCallback cb={}, time_point created=time_point::max(), bool permanent = false); + void put(InfoHash hash, Value&& value, DoneCallbackSimple cb, time_point created=time_point::max(), bool permanent = false) { + put(hash, std::forward<Value>(value), bindDoneCb(cb), created, permanent); } - void put(const std::string& key, Value&& value, DoneCallbackSimple cb={}, bool permanent = false); + void put(const std::string& key, Value&& value, DoneCallbackSimple cb={}, time_point created=time_point::max(), bool permanent = false); void cancelPut(const InfoHash& h, const Value::Id& id); diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp index ed24473d..1d535436 100644 --- a/src/dhtrunner.cpp +++ b/src/dhtrunner.cpp @@ -484,30 +484,30 @@ DhtRunner::cancelListen(InfoHash h, std::shared_future<size_t> token) } void -DhtRunner::put(InfoHash hash, Value&& value, DoneCallback cb, bool permanent) +DhtRunner::put(InfoHash hash, Value&& value, DoneCallback cb, time_point created, bool permanent) { std::lock_guard<std::mutex> lck(storage_mtx); auto sv = std::make_shared<Value>(std::move(value)); pending_ops.emplace([=](SecureDht& dht) { - dht.put(hash, sv, cb, {}, permanent); + dht.put(hash, sv, cb, created, permanent); }); cv.notify_all(); } void -DhtRunner::put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb, bool permanent) +DhtRunner::put(InfoHash hash, std::shared_ptr<Value> value, DoneCallback cb, time_point created, bool permanent) { std::lock_guard<std::mutex> lck(storage_mtx); pending_ops.emplace([=](SecureDht& dht) { - dht.put(hash, value, cb, {}, permanent); + dht.put(hash, value, cb, created, permanent); }); cv.notify_all(); } void -DhtRunner::put(const std::string& key, Value&& value, DoneCallbackSimple cb, bool permanent) +DhtRunner::put(const std::string& key, Value&& value, DoneCallbackSimple cb, time_point created, bool permanent) { - put(InfoHash::get(key), std::forward<Value>(value), cb, permanent); + put(InfoHash::get(key), std::forward<Value>(value), cb, created, permanent); } void -- GitLab