GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-06-17 01:56:16 +02:00
Code Packages Activity

Task: convert print_fn to a string

Browse Source 
Since we are now unconditionally rendering the print_fn as a static
string, there is no need for it to be a function.  We also need it to
be brief and mostly constant.

Use a string instead.  Put the string before the function in the Task
constructor arguments so that the title string appears as a heading in
code, since we are making a breaking API change already.

Drop TASK_MACRO as it is broken by this change, but there is no similar
usage of Task anywhere to make it worth fixing.

Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell
2018-01-25 21:12:31 -05:00
parent 0710208354
commit f64fc78e36
5 changed files with 75 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/bees-roots.cc
View File

@ -251,12 +251,12 @@ BeesRoots::crawl_roots()
size_t batch_count = 0;
while (first_range && batch_count < BEES_MAX_CRAWL_BATCH) {
auto subvol = first_crawl->get_state().m_root;
Task([ctx_copy, first_range]() {
ostringstream oss;
oss << "crawl_" << subvol;
auto task_title = oss.str();
Task(task_title, [ctx_copy, first_range]() {
BEESNOTE("scan_forward " << first_range);
ctx_copy->scan_forward(first_range);
},
[first_range, subvol](ostream &os) -> ostream & {
return os << "crawl_" << subvol;
}).run();
BEESCOUNT(crawl_scan);
m_crawl_current = first_crawl->get_state();
@ -281,12 +281,12 @@ BeesRoots::crawl_roots()
size_t batch_count = 0;
while (this_range && batch_count < BEES_MAX_CRAWL_BATCH) {
auto subvol = this_crawl->get_state().m_root;
Task([ctx_copy, this_range]() {
ostringstream oss;
oss << "crawl_" << subvol;
auto task_title = oss.str();
Task(task_title, [ctx_copy, this_range]() {
BEESNOTE("scan_forward " << this_range);
ctx_copy->scan_forward(this_range);
},
[this_range, subvol](ostream &os) -> ostream & {
return os << "crawl_" << subvol;
}).run();
crawled = true;
BEESCOUNT(crawl_scan);
@ -322,7 +322,7 @@ BeesRoots::crawl_thread()
// shared_from_this() in a constructor.
BEESNOTE("crawling");
auto shared_this = shared_from_this();
Task([shared_this]() {
Task("crawl", [shared_this]() {
auto tqs = TaskMaster::get_queue_count();
BEESNOTE("queueing extents to scan, " << tqs << " of " << BEES_MAX_QUEUE_SIZE);
while (tqs < BEES_MAX_QUEUE_SIZE) {
@ -332,7 +332,7 @@ BeesRoots::crawl_thread()
tqs = TaskMaster::get_queue_count();
}
Task::current_task().run();
}, [](ostream &os) -> ostream& { return os << "crawl"; }).run();
}).run();
}
void

4
src/bees.cc
View File

@ -151,9 +151,7 @@ BeesNote::get_name()
// about it being destroyed under us.
auto current_task = Task::current_task();
if (current_task) {
ostringstream oss;
oss << current_task;
return oss.str();
return current_task.title();
}
// OK try the pthread name next.