jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Revert "libutil: remove Pool::Handle::bad"

Browse source 
This reverts commit 792844fb861ea7367ac2316c78fec055363f2f9e.

Change-Id: I3ca208b62edfd5cd1199478f75cd2edf19a364f6
This commit is contained in:
eldritch horrors 2024-04-05 03:52:34 +02:00
parent 0b8a17cab6
commit 52f741c23a
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/remote-store.cc
View file

@ -155,6 +155,7 @@ void RemoteStore::setOptions(Connection & conn)
RemoteStore::ConnectionHandle::~ConnectionHandle() RemoteStore::ConnectionHandle::~ConnectionHandle()
{ {
if (!daemonException && std::uncaught_exceptions()) { if (!daemonException && std::uncaught_exceptions()) {
handle.markBad();
debug("closing daemon connection because of an exception"); debug("closing daemon connection because of an exception");
} }
} }

5
src/libutil/pool.hh
View file

@ -103,6 +103,7 @@ public:
private: private:
Pool & pool; Pool & pool;
std::shared_ptr<R> r; std::shared_ptr<R> r;
bool bad = false;
friend Pool; friend Pool;
@ -118,7 +119,7 @@ public:
if (!r) return; if (!r) return;
{ {
auto state_(pool.state.lock()); auto state_(pool.state.lock());
if (!std::uncaught_exceptions()) if (!bad && !std::uncaught_exceptions())
state_->idle.push_back(ref<R>(r)); state_->idle.push_back(ref<R>(r));
assert(state_->inUse); assert(state_->inUse);
state_->inUse--; state_->inUse--;
@ -128,6 +129,8 @@ public:
R * operator -> () { return &*r; } R * operator -> () { return &*r; }
R & operator * () { return *r; } R & operator * () { return *r; }
void markBad() { bad = true; }
}; };
Handle get() Handle get()