hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 08:45:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm-lease: fix crashes and implementation (#8116)

Browse source
This commit is contained in:
Ikalco 2024-10-14 05:37:42 -05:00 committed by GitHub
parent e7fd0f5aec
commit ce62521883
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/protocols/DRMLease.cpp
View file

@ -44,10 +44,6 @@ CDRMLeaseResource::CDRMLeaseResource(SP<CWpDrmLeaseV1> resource_, SP<CDRMLeaseRe
return; return;
} }
LOGM(LOG, "Granting lease, sending fd {}", aqlease->leaseFD);
resource->sendLeaseFd(aqlease->leaseFD);
lease = aqlease; lease = aqlease;
for (auto const& m : requested) { for (auto const& m : requested) {
@ -61,8 +57,13 @@ CDRMLeaseResource::CDRMLeaseResource(SP<CWpDrmLeaseV1> resource_, SP<CDRMLeaseRe
} }
resource->sendFinished(); resource->sendFinished();
LOGM(LOG, "Revoking lease for fd {}", lease->leaseFD);
}); });
LOGM(LOG, "Granting lease, sending fd {}", lease->leaseFD);
resource->sendLeaseFd(lease->leaseFD);
close(lease->leaseFD); close(lease->leaseFD);
} }
@ -70,6 +71,12 @@ bool CDRMLeaseResource::good() {
return resource->resource(); return resource->resource();
} }
CDRMLeaseResource::~CDRMLeaseResource() {
// destroy in this order to ensure listener gets called
lease.reset();
listeners.destroyLease.reset();
}
CDRMLeaseRequestResource::CDRMLeaseRequestResource(SP<CWpDrmLeaseRequestV1> resource_) : resource(resource_) { CDRMLeaseRequestResource::CDRMLeaseRequestResource(SP<CWpDrmLeaseRequestV1> resource_) : resource(resource_) {
if (!good()) if (!good())
return; return;
@ -100,7 +107,7 @@ CDRMLeaseRequestResource::CDRMLeaseRequestResource(SP<CWpDrmLeaseRequestV1> reso
return; return;
} }
auto RESOURCE = makeShared<CDRMLeaseResource>(makeShared<CWpDrmLeaseV1>(resource->client(), resource->version(), -1), self.lock()); auto RESOURCE = makeShared<CDRMLeaseResource>(makeShared<CWpDrmLeaseV1>(resource->client(), resource->version(), id), self.lock());
if (!RESOURCE) { if (!RESOURCE) {
resource->noMemory(); resource->noMemory();
return; return;
@ -185,7 +192,8 @@ CDRMLeaseDeviceResource::CDRMLeaseDeviceResource(SP<CWpDrmLeaseDeviceV1> resourc
close(fd); close(fd);
for (auto const& m : PROTO::lease->primaryDevice->offeredOutputs) { for (auto const& m : PROTO::lease->primaryDevice->offeredOutputs) {
sendConnector(m.lock()); if (m)
sendConnector(m.lock());
} }
resource->sendDone(); resource->sendDone();
@ -196,10 +204,10 @@ bool CDRMLeaseDeviceResource::good() {
} }
void CDRMLeaseDeviceResource::sendConnector(SP<CMonitor> monitor) { void CDRMLeaseDeviceResource::sendConnector(SP<CMonitor> monitor) {
if (std::find_if(connectorsSent.begin(), connectorsSent.end(), [monitor](const auto& e) { return e->monitor == monitor; }) != connectorsSent.end()) if (std::find_if(connectorsSent.begin(), connectorsSent.end(), [monitor](const auto& e) { return e && !e->dead && e->monitor == monitor; }) != connectorsSent.end())
return; return;
auto RESOURCE = makeShared<CDRMLeaseConnectorResource>(makeShared<CWpDrmLeaseConnectorV1>(resource->client(), resource->version(), -1), monitor); auto RESOURCE = makeShared<CDRMLeaseConnectorResource>(makeShared<CWpDrmLeaseConnectorV1>(resource->client(), resource->version(), 0), monitor);
if (!RESOURCE) { if (!RESOURCE) {
resource->noMemory(); resource->noMemory();
return; return;
@ -267,6 +275,9 @@ void CDRMLeaseProtocol::destroyResource(CDRMLeaseDeviceResource* resource) {
} }
void CDRMLeaseProtocol::destroyResource(CDRMLeaseConnectorResource* resource) { void CDRMLeaseProtocol::destroyResource(CDRMLeaseConnectorResource* resource) {
for (const auto& m : m_vManagers) {
std::erase_if(m->connectorsSent, [resource](const auto& e) { return e.expired() || e->dead || e.get() == resource; });
}
std::erase_if(m_vConnectors, [resource](const auto& e) { return e.get() == resource; }); std::erase_if(m_vConnectors, [resource](const auto& e) { return e.get() == resource; });
} }
@ -279,6 +290,7 @@ void CDRMLeaseProtocol::destroyResource(CDRMLeaseResource* resource) {
} }
void CDRMLeaseProtocol::offer(SP<CMonitor> monitor) { void CDRMLeaseProtocol::offer(SP<CMonitor> monitor) {
std::erase_if(primaryDevice->offeredOutputs, [](const auto& e) { return e.expired(); });
if (std::find(primaryDevice->offeredOutputs.begin(), primaryDevice->offeredOutputs.end(), monitor) != primaryDevice->offeredOutputs.end()) if (std::find(primaryDevice->offeredOutputs.begin(), primaryDevice->offeredOutputs.end(), monitor) != primaryDevice->offeredOutputs.end())
return; return;

3
src/protocols/DRMLease.hpp
View file

@ -22,12 +22,13 @@ class CDRMLeaseRequestResource;
class CDRMLeaseResource { class CDRMLeaseResource {
public: public:
CDRMLeaseResource(SP<CWpDrmLeaseV1> resource_, SP<CDRMLeaseRequestResource> request); CDRMLeaseResource(SP<CWpDrmLeaseV1> resource_, SP<CDRMLeaseRequestResource> request);
~CDRMLeaseResource();
bool good(); bool good();
WP<CDRMLeaseDeviceResource> parent; WP<CDRMLeaseDeviceResource> parent;
std::vector<WP<CDRMLeaseConnectorResource>> requested; std::vector<WP<CDRMLeaseConnectorResource>> requested;
WP<Aquamarine::CDRMLease> lease; SP<Aquamarine::CDRMLease> lease;
int leaseFD = -1; int leaseFD = -1;