sources are rolled to a newer tasker library (with 'then' instead of …

…'continue_with')
tyoma · Nov 28, 2024 · 92d633b · 92d633b
1 parent b9dee97
commit 92d633b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/frontend/src/frontend_metadata.cpp b/frontend/src/frontend_metadata.cpp
@@ -77,7 +77,7 @@ namespace micro_profiler
 		auto request_with_caching = task<module_ptr>::run([cache, hash] {
 				return cache->load_metadata(hash);
 			}, _worker_queue)
-			.continue_with([this, module_id, wreq] (const async_result<module_ptr> &m) -> task< pair<module_ptr, bool> > {
+			.then([this, module_id, wreq] (const async_result<module_ptr> &m) -> task< pair<module_ptr, bool> > {
 				auto c = make_shared< task_node< pair<module_ptr, bool> > >();
 
 				if (*m)
@@ -89,12 +89,12 @@ namespace micro_profiler
 
 		request_ = req;
 		request_with_caching
-			.continue_with([ready, wreq] (const async_result< pair<module_ptr, bool> > &m) {
+			.then([ready, wreq] (const async_result< pair<module_ptr, bool> > &m) {
 				if (!wreq.expired())
 					ready((*m).first);
 			}, _apartment_queue);
 		request_with_caching
-			.continue_with([cache] (const async_result< pair<module_ptr, bool /*cached*/> > &m) {
+			.then([cache] (const async_result< pair<module_ptr, bool /*cached*/> > &m) {
 				if (!(*m).second)
 					cache->store_metadata(*(*m).first);
 			}, _worker_queue);

diff --git a/frontend/src/patch_moderator.cpp b/frontend/src/patch_moderator.cpp
@@ -90,10 +90,10 @@ namespace micro_profiler
 		shared_ptr<changes_log> changes, const tables::module_mapping &mapping, profiling_cache_tasks &tasks)
 	{
 		tasks.persisted_module_id(mapping.hash)
-			.continue_with([cache] (const async_result<id_t> &cached_module_id) {
+			.then([cache] (const async_result<id_t> &cached_module_id) {
 				return cache->load_default_patches(*cached_module_id);
 			}, _worker)
-			.continue_with([patches, changes, mapping] (const async_result< vector<cached_patch> > &loaded) {
+			.then([patches, changes, mapping] (const async_result< vector<cached_patch> > &loaded) {
 				vector<tables::patches::patch_def> rva;
 				auto &changes_symbol_idx = sdb::unique_index(*changes, keyer::symbol_id());
 
@@ -127,7 +127,7 @@ namespace micro_profiler
 			if (added->empty() && removed->empty())
 				continue;
 			tasks.persisted_module_id(m->hash)
-				.continue_with([cache, added, removed] (const async_result<id_t> &cached_module_id) {
+				.then([cache, added, removed] (const async_result<id_t> &cached_module_id) {
 					cache->update_default_patches(*cached_module_id, *added, *removed);
 				}, _worker);
 		}

diff --git a/libraries/tasker b/libraries/tasker
+19 −2		CMakeLists.txt
+3 −0		benchmarks/CMakeLists.txt
+57 −0		benchmarks/busy-exchange.cpp
+47 −0		mt/hybrid_event.h
+5 −3		src/mt/CMakeLists.txt
+37 −0		src/mt/hybrid_event.cpp
+8 −0		src/mt/intrinsic.h
+25 −0		src/mt/intrinsic_unix.cpp
+15 −0		src/mt/intrinsic_win32.cpp
+1 −1		src/tasker/task_queue.cpp
+1 −1		src/tasker/ui_queue_android.cpp
+5 −5		tasker/task.h
+2 −2		tasker/task_node.h
+2 −2		tasker/task_queue.h
+19 −19		tests/tasker/TaskNodeTests.cpp
+36 −36		tests/tasker/TaskTests.cpp
+2 −16		tests/tasker/helpers_android.cpp