ZYM/BH-Bookstore-2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upd: made some attempts

Browse Source
This commit is contained in:
ZhuangYumin
2023-12-12 10:06:41 +00:00
parent 5aade64d44
commit 372cc475ab
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/include/bs-utility.h
View File

@ -65,10 +65,9 @@ BlockingStringStream &BlockingStringStream::operator>>(T &val) {
std::unique_lock<std::mutex> lock(mutex); std::unique_lock<std::mutex> lock(mutex);
// Wait until data is available // Wait until data is available
if (!(internalStream.peek() != EOF && !is_writing)) condition.wait(lock, [this] {
condition.wait(lock, [this] { return internalStream.peek() != EOF && !is_writing;
return internalStream.peek() != EOF && !is_writing; });
});
internalStream >> val; internalStream >> val;

15
backend/src/bs-utility.cpp
View File

@ -5,10 +5,9 @@ BlockingStringStream &BlockingStringStream::getline(std::string &str,
std::unique_lock<std::mutex> lock(mutex); std::unique_lock<std::mutex> lock(mutex);
// Wait until data is available // Wait until data is available
if (!(internalStream.peek() != EOF && !is_writing)) condition.wait(lock, [this] {
condition.wait(lock, [this] { return internalStream.peek() != EOF && !is_writing;
return internalStream.peek() != EOF && !is_writing; });
});
str = "$FAILED$"; str = "$FAILED$";
std::getline(internalStream, str, delim); std::getline(internalStream, str, delim);
@ -53,8 +52,14 @@ void debugPrint() {
BookStore_ZYM::debug_Print_Mutex.unlock(); BookStore_ZYM::debug_Print_Mutex.unlock();
} }
void BlockingStringStream::readlock() { is_writing = true; } void BlockingStringStream::readlock() {
mutex.lock();
is_writing = true;
mutex.unlock();
}
void BlockingStringStream::unreadlock() { void BlockingStringStream::unreadlock() {
mutex.lock();
is_writing = false; is_writing = false;
mutex.unlock();
condition.notify_all(); condition.notify_all();
} }