mirror of
https://github.com/Zygo/bees.git
synced 2025-05-17 21:35:45 +02:00
bees: drop unused BeesWorkQueue classes
Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
parent
f6a6992ac9
commit
5cc5a44661
@ -72,97 +72,6 @@ BeesFdCache::insert_root_ino(shared_ptr<BeesContext> ctx, Fd fd)
|
|||||||
return m_file_cache.insert(fd, ctx, fid.root(), fid.ino());
|
return m_file_cache.insert(fd, ctx, fid.root(), fid.ino());
|
||||||
}
|
}
|
||||||
|
|
||||||
mutex BeesWorkQueueBase::s_mutex;
|
|
||||||
set<BeesWorkQueueBase*> BeesWorkQueueBase::s_all_workers;
|
|
||||||
|
|
||||||
BeesWorkQueueBase::BeesWorkQueueBase(const string &name) :
|
|
||||||
m_name(name)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
BeesWorkQueueBase::~BeesWorkQueueBase()
|
|
||||||
{
|
|
||||||
unique_lock<mutex> lock(s_mutex);
|
|
||||||
s_all_workers.erase(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
BeesWorkQueueBase::for_each_work_queue(std::function<void (BeesWorkQueueBase*)> f)
|
|
||||||
{
|
|
||||||
unique_lock<mutex> lock(s_mutex);
|
|
||||||
for (auto i : s_all_workers) {
|
|
||||||
f(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
string
|
|
||||||
BeesWorkQueueBase::name() const
|
|
||||||
{
|
|
||||||
return m_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
BeesWorkQueueBase::name(const string &new_name)
|
|
||||||
{
|
|
||||||
m_name = new_name;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
BeesWorkQueue<Task>::~BeesWorkQueue()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
BeesWorkQueue<Task>::BeesWorkQueue(const string &name) :
|
|
||||||
BeesWorkQueueBase(name)
|
|
||||||
{
|
|
||||||
unique_lock<mutex> lock(s_mutex);
|
|
||||||
s_all_workers.insert(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
void
|
|
||||||
BeesWorkQueue<Task>::push_active(const Task &t)
|
|
||||||
{
|
|
||||||
BEESNOTE("pushing task " << t);
|
|
||||||
m_active_queue.push(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
void
|
|
||||||
BeesWorkQueue<Task>::push_active(const Task &t, size_t limit)
|
|
||||||
{
|
|
||||||
// BEESNOTE("pushing limit " << limit << " task " << t);
|
|
||||||
m_active_queue.push_wait(t, limit);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
size_t
|
|
||||||
BeesWorkQueue<Task>::active_size() const
|
|
||||||
{
|
|
||||||
return m_active_queue.size();
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
list<string>
|
|
||||||
BeesWorkQueue<Task>::peek_active(size_t count) const
|
|
||||||
{
|
|
||||||
list<string> rv;
|
|
||||||
for (auto i : m_active_queue.peek(count)) {
|
|
||||||
ostringstream oss;
|
|
||||||
oss << i;
|
|
||||||
rv.push_back(oss.str());
|
|
||||||
}
|
|
||||||
return rv;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
Task
|
|
||||||
BeesWorkQueue<Task>::pop()
|
|
||||||
{
|
|
||||||
return m_active_queue.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
BeesContext::dump_status()
|
BeesContext::dump_status()
|
||||||
{
|
{
|
||||||
@ -189,12 +98,6 @@ BeesContext::dump_status()
|
|||||||
ofs << "\ttid " << t.first << ": " << t.second << "\n";
|
ofs << "\ttid " << t.first << ": " << t.second << "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
BeesWorkQueueBase::for_each_work_queue([&](BeesWorkQueueBase *worker) {
|
|
||||||
ofs << "QUEUE: " << worker->name() << " active: " << worker->active_size() << "\n";
|
|
||||||
for (auto t : worker->peek_active(10)) {
|
|
||||||
ofs << "\t" << t << "\n";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
ofs.close();
|
ofs.close();
|
||||||
|
|
||||||
BEESNOTE("renaming status file '" << status_file << "'");
|
BEESNOTE("renaming status file '" << status_file << "'");
|
||||||
@ -230,10 +133,6 @@ BeesContext::show_progress()
|
|||||||
};
|
};
|
||||||
lastProgressStats = thisStats;
|
lastProgressStats = thisStats;
|
||||||
|
|
||||||
BeesWorkQueueBase::for_each_work_queue([&](BeesWorkQueueBase *worker) {
|
|
||||||
BEESLOG("QUEUE: " << worker->name() << " active: " << worker->active_size());
|
|
||||||
});
|
|
||||||
|
|
||||||
BEESLOG("THREADS:");
|
BEESLOG("THREADS:");
|
||||||
|
|
||||||
for (auto t : BeesNote::get_status()) {
|
for (auto t : BeesNote::get_status()) {
|
||||||
@ -1031,8 +930,3 @@ BeesContext::insert_root_ino(Fd fd)
|
|||||||
{
|
{
|
||||||
fd_cache()->insert_root_ino(shared_from_this(), fd);
|
fd_cache()->insert_root_ino(shared_from_this(), fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
// instantiate templates for linkage ----------------------------------------
|
|
||||||
|
|
||||||
template class BeesWorkQueue<BeesFileRange>;
|
|
||||||
template class BeesWorkQueue<BeesRangePair>;
|
|
||||||
|
36
src/bees.h
36
src/bees.h
@ -597,42 +597,6 @@ public:
|
|||||||
friend ostream & operator<<(ostream &os, const BeesRangePair &brp);
|
friend ostream & operator<<(ostream &os, const BeesRangePair &brp);
|
||||||
};
|
};
|
||||||
|
|
||||||
class BeesWorkQueueBase {
|
|
||||||
string m_name;
|
|
||||||
|
|
||||||
protected:
|
|
||||||
static mutex s_mutex;
|
|
||||||
static set<BeesWorkQueueBase *> s_all_workers;
|
|
||||||
|
|
||||||
public:
|
|
||||||
virtual ~BeesWorkQueueBase();
|
|
||||||
BeesWorkQueueBase(const string &name);
|
|
||||||
|
|
||||||
string name() const;
|
|
||||||
void name(const string &new_name);
|
|
||||||
|
|
||||||
virtual size_t active_size() const = 0;
|
|
||||||
virtual list<string> peek_active(size_t count) const = 0;
|
|
||||||
|
|
||||||
static void for_each_work_queue(function<void(BeesWorkQueueBase *)> f);
|
|
||||||
};
|
|
||||||
|
|
||||||
template <class Task>
|
|
||||||
class BeesWorkQueue : public BeesWorkQueueBase {
|
|
||||||
WorkQueue<Task> m_active_queue;
|
|
||||||
|
|
||||||
public:
|
|
||||||
BeesWorkQueue(const string &name);
|
|
||||||
~BeesWorkQueue();
|
|
||||||
void push_active(const Task &task, size_t limit);
|
|
||||||
void push_active(const Task &task);
|
|
||||||
|
|
||||||
size_t active_size() const override;
|
|
||||||
list<string> peek_active(size_t count) const override;
|
|
||||||
|
|
||||||
Task pop();
|
|
||||||
};
|
|
||||||
|
|
||||||
class BeesTempFile {
|
class BeesTempFile {
|
||||||
shared_ptr<BeesContext> m_ctx;
|
shared_ptr<BeesContext> m_ctx;
|
||||||
Fd m_fd;
|
Fd m_fd;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user