1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-15 12:09:09 +03:00

Cleaned up a kludge, and made the retry behavior requeue a job

rather than wait forever to it to work in the same thread.
This commit is contained in:
Patrick LeBlanc
2019-04-08 10:40:28 -05:00
parent 64bbf44227
commit 0be099769b
2 changed files with 39 additions and 36 deletions

View File

@@ -39,7 +39,7 @@ class Synchronizer : public boost::noncopyable
private:
Synchronizer();
void process(std::list<std::string>::iterator key, bool callerHoldsLock=false);
void process(std::list<std::string>::iterator key);
void synchronize(const std::string &sourceFile, std::list<std::string>::iterator &it);
void synchronizeDelete(const std::string &sourceFile, std::list<std::string>::iterator &it);
void synchronizeWithJournal(const std::string &sourceFile, std::list<std::string>::iterator &it);
@@ -53,8 +53,8 @@ class Synchronizer : public boost::noncopyable
int opFlags;
bool finished;
boost::condition condvar;
void wait(boost::mutex *);
void notify(boost::mutex *);
void wait(boost::recursive_mutex *);
void notify(boost::recursive_mutex *);
};
struct Job : public ThreadPool::Job
@@ -84,7 +84,7 @@ class Synchronizer : public boost::noncopyable
boost::filesystem::path cachePath;
boost::filesystem::path journalPath;
boost::mutex mutex;
boost::recursive_mutex mutex;
};
}