From 50e1bec85f8febdd78f50d94f140d07f9b34148d Mon Sep 17 00:00:00 2001 From: davc0n Date: Wed, 30 Apr 2025 23:45:20 +0200 Subject: helpers: refactor class member vars (#10218) --- src/helpers/sync/SyncTimeline.cpp | 58 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'src/helpers/sync/SyncTimeline.cpp') diff --git a/src/helpers/sync/SyncTimeline.cpp b/src/helpers/sync/SyncTimeline.cpp index edb2b190..1b089caa 100644 --- a/src/helpers/sync/SyncTimeline.cpp +++ b/src/helpers/sync/SyncTimeline.cpp @@ -7,11 +7,11 @@ using namespace Hyprutils::OS; SP CSyncTimeline::create(int drmFD_) { - auto timeline = SP(new CSyncTimeline); - timeline->drmFD = drmFD_; - timeline->self = timeline; + auto timeline = SP(new CSyncTimeline); + timeline->m_drmFD = drmFD_; + timeline->m_self = timeline; - if (drmSyncobjCreate(drmFD_, 0, &timeline->handle)) { + if (drmSyncobjCreate(drmFD_, 0, &timeline->m_handle)) { Debug::log(ERR, "CSyncTimeline: failed to create a drm syncobj??"); return nullptr; } @@ -20,12 +20,12 @@ SP CSyncTimeline::create(int drmFD_) { } SP CSyncTimeline::create(int drmFD_, CFileDescriptor&& drmSyncobjFD) { - auto timeline = SP(new CSyncTimeline); - timeline->drmFD = drmFD_; - timeline->syncobjFd = std::move(drmSyncobjFD); - timeline->self = timeline; + auto timeline = SP(new CSyncTimeline); + timeline->m_drmFD = drmFD_; + timeline->m_syncobjFD = std::move(drmSyncobjFD); + timeline->m_self = timeline; - if (drmSyncobjFDToHandle(drmFD_, timeline->syncobjFd.get(), &timeline->handle)) { + if (drmSyncobjFDToHandle(drmFD_, timeline->m_syncobjFD.get(), &timeline->m_handle)) { Debug::log(ERR, "CSyncTimeline: failed to create a drm syncobj from fd??"); return nullptr; } @@ -34,10 +34,10 @@ SP CSyncTimeline::create(int drmFD_, CFileDescriptor&& drmSyncobj } CSyncTimeline::~CSyncTimeline() { - if (handle == 0) + if (m_handle == 0) return; - drmSyncobjDestroy(drmFD, handle); + drmSyncobjDestroy(m_drmFD, m_handle); } std::optional CSyncTimeline::check(uint64_t point, uint32_t flags) { @@ -48,7 +48,7 @@ std::optional CSyncTimeline::check(uint64_t point, uint32_t flags) { #endif uint32_t signaled = 0; - int ret = drmSyncobjTimelineWait(drmFD, &handle, &point, 1, 0, flags, &signaled); + int ret = drmSyncobjTimelineWait(m_drmFD, &m_handle, &point, 1, 0, flags, &signaled); if (ret != 0 && ret != -ETIME_ERR) { Debug::log(ERR, "CSyncTimeline::check: drmSyncobjTimelineWait failed"); return std::nullopt; @@ -65,7 +65,7 @@ bool CSyncTimeline::addWaiter(const std::function& waiter, uint64_t poin return false; } - if (drmSyncobjEventfd(drmFD, handle, point, eventFd.get(), flags)) { + if (drmSyncobjEventfd(m_drmFD, m_handle, point, eventFd.get(), flags)) { Debug::log(ERR, "CSyncTimeline::addWaiter: drmSyncobjEventfd failed"); return false; } @@ -79,58 +79,58 @@ CFileDescriptor CSyncTimeline::exportAsSyncFileFD(uint64_t src) { int sync = -1; uint32_t syncHandle = 0; - if (drmSyncobjCreate(drmFD, 0, &syncHandle)) { + if (drmSyncobjCreate(m_drmFD, 0, &syncHandle)) { Debug::log(ERR, "exportAsSyncFileFD: drmSyncobjCreate failed"); return {}; } - if (drmSyncobjTransfer(drmFD, syncHandle, 0, handle, src, 0)) { + if (drmSyncobjTransfer(m_drmFD, syncHandle, 0, m_handle, src, 0)) { Debug::log(ERR, "exportAsSyncFileFD: drmSyncobjTransfer failed"); - drmSyncobjDestroy(drmFD, syncHandle); + drmSyncobjDestroy(m_drmFD, syncHandle); return {}; } - if (drmSyncobjExportSyncFile(drmFD, syncHandle, &sync)) { + if (drmSyncobjExportSyncFile(m_drmFD, syncHandle, &sync)) { Debug::log(ERR, "exportAsSyncFileFD: drmSyncobjExportSyncFile failed"); - drmSyncobjDestroy(drmFD, syncHandle); + drmSyncobjDestroy(m_drmFD, syncHandle); return {}; } - drmSyncobjDestroy(drmFD, syncHandle); + drmSyncobjDestroy(m_drmFD, syncHandle); return CFileDescriptor{sync}; } bool CSyncTimeline::importFromSyncFileFD(uint64_t dst, CFileDescriptor& fd) { uint32_t syncHandle = 0; - if (drmSyncobjCreate(drmFD, 0, &syncHandle)) { + if (drmSyncobjCreate(m_drmFD, 0, &syncHandle)) { Debug::log(ERR, "importFromSyncFileFD: drmSyncobjCreate failed"); return false; } - if (drmSyncobjImportSyncFile(drmFD, syncHandle, fd.get())) { + if (drmSyncobjImportSyncFile(m_drmFD, syncHandle, fd.get())) { Debug::log(ERR, "importFromSyncFileFD: drmSyncobjImportSyncFile failed"); - drmSyncobjDestroy(drmFD, syncHandle); + drmSyncobjDestroy(m_drmFD, syncHandle); return false; } - if (drmSyncobjTransfer(drmFD, handle, dst, syncHandle, 0, 0)) { + if (drmSyncobjTransfer(m_drmFD, m_handle, dst, syncHandle, 0, 0)) { Debug::log(ERR, "importFromSyncFileFD: drmSyncobjTransfer failed"); - drmSyncobjDestroy(drmFD, syncHandle); + drmSyncobjDestroy(m_drmFD, syncHandle); return false; } - drmSyncobjDestroy(drmFD, syncHandle); + drmSyncobjDestroy(m_drmFD, syncHandle); return true; } bool CSyncTimeline::transfer(SP from, uint64_t fromPoint, uint64_t toPoint) { - if (drmFD != from->drmFD) { - Debug::log(ERR, "CSyncTimeline::transfer: cannot transfer timelines between gpus, {} -> {}", from->drmFD, drmFD); + if (m_drmFD != from->m_drmFD) { + Debug::log(ERR, "CSyncTimeline::transfer: cannot transfer timelines between gpus, {} -> {}", from->m_drmFD, m_drmFD); return false; } - if (drmSyncobjTransfer(drmFD, handle, toPoint, from->handle, fromPoint, 0)) { + if (drmSyncobjTransfer(m_drmFD, m_handle, toPoint, from->m_handle, fromPoint, 0)) { Debug::log(ERR, "CSyncTimeline::transfer: drmSyncobjTransfer failed"); return false; } @@ -139,6 +139,6 @@ bool CSyncTimeline::transfer(SP from, uint64_t fromPoint, uint64_ } void CSyncTimeline::signal(uint64_t point) { - if (drmSyncobjTimelineSignal(drmFD, &handle, &point, 1)) + if (drmSyncobjTimelineSignal(m_drmFD, &m_handle, &point, 1)) Debug::log(ERR, "CSyncTimeline::signal: drmSyncobjTimelineSignal failed"); } -- cgit v1.2.3