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

compositor: log thrown runtime exceptions

Browse source
This commit is contained in:
vaxerski 2023-08-20 11:47:06 +02:00
parent fff118fa76
commit 7713daa86a
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Compositor.cpp
View file

@ -108,20 +108,20 @@ void CCompositor::initServer() {
if (!m_sWLRBackend) { if (!m_sWLRBackend) {
Debug::log(CRIT, "m_sWLRBackend was NULL!"); Debug::log(CRIT, "m_sWLRBackend was NULL!");
throw std::runtime_error("wlr_backend_autocreate() failed!"); throwError("wlr_backend_autocreate() failed!");
} }
m_iDRMFD = wlr_backend_get_drm_fd(m_sWLRBackend); m_iDRMFD = wlr_backend_get_drm_fd(m_sWLRBackend);
if (m_iDRMFD < 0) { if (m_iDRMFD < 0) {
Debug::log(CRIT, "Couldn't query the DRM FD!"); Debug::log(CRIT, "Couldn't query the DRM FD!");
throw std::runtime_error("wlr_backend_get_drm_fd() failed!"); throwError("wlr_backend_get_drm_fd() failed!");
} }
m_sWLRRenderer = wlr_gles2_renderer_create_with_drm_fd(m_iDRMFD); m_sWLRRenderer = wlr_gles2_renderer_create_with_drm_fd(m_iDRMFD);
if (!m_sWLRRenderer) { if (!m_sWLRRenderer) {
Debug::log(CRIT, "m_sWLRRenderer was NULL!"); Debug::log(CRIT, "m_sWLRRenderer was NULL!");
throw std::runtime_error("wlr_gles2_renderer_create_with_drm_fd() failed!"); throwError("wlr_gles2_renderer_create_with_drm_fd() failed!");
} }
wlr_renderer_init_wl_shm(m_sWLRRenderer, m_sWLDisplay); wlr_renderer_init_wl_shm(m_sWLRRenderer, m_sWLDisplay);
@ -137,14 +137,14 @@ void CCompositor::initServer() {
if (!m_sWLRAllocator) { if (!m_sWLRAllocator) {
Debug::log(CRIT, "m_sWLRAllocator was NULL!"); Debug::log(CRIT, "m_sWLRAllocator was NULL!");
throw std::runtime_error("wlr_allocator_autocreate() failed!"); throwError("wlr_allocator_autocreate() failed!");
} }
m_sWLREGL = wlr_gles2_renderer_get_egl(m_sWLRRenderer); m_sWLREGL = wlr_gles2_renderer_get_egl(m_sWLRRenderer);
if (!m_sWLREGL) { if (!m_sWLREGL) {
Debug::log(CRIT, "m_sWLREGL was NULL!"); Debug::log(CRIT, "m_sWLREGL was NULL!");
throw std::runtime_error("wlr_gles2_renderer_get_egl() failed!"); throwError("wlr_gles2_renderer_get_egl() failed!");
} }
m_sWLRCompositor = wlr_compositor_create(m_sWLDisplay, 6, m_sWLRRenderer); m_sWLRCompositor = wlr_compositor_create(m_sWLDisplay, 6, m_sWLRRenderer);
@ -243,7 +243,7 @@ void CCompositor::initServer() {
if (!m_sWLRHeadlessBackend) { if (!m_sWLRHeadlessBackend) {
Debug::log(CRIT, "Couldn't create the headless backend"); Debug::log(CRIT, "Couldn't create the headless backend");
throw std::runtime_error("wlr_headless_backend_create() failed!"); throwError("wlr_headless_backend_create() failed!");
} }
wlr_single_pixel_buffer_manager_v1_create(m_sWLDisplay); wlr_single_pixel_buffer_manager_v1_create(m_sWLDisplay);

5
src/helpers/MiscFunctions.cpp
View file

@ -714,3 +714,8 @@ std::vector<SCallstackFrameInfo> getBacktrace() {
return callstack; return callstack;
} }
void throwError(const std::string& err) {
Debug::log(CRIT, "Critical error thrown: %s", err.c_str());
throw std::runtime_error(err);
}

3
src/helpers/MiscFunctions.hpp
View file

@ -29,4 +29,5 @@ float getPlusMinusKeywordResult(std::string in, float
void matrixProjection(float mat[9], int w, int h, wl_output_transform tr); void matrixProjection(float mat[9], int w, int h, wl_output_transform tr);
double normalizeAngleRad(double ang); double normalizeAngleRad(double ang);
std::string replaceInString(std::string subject, const std::string& search, const std::string& replace); std::string replaceInString(std::string subject, const std::string& search, const std::string& replace);
std::vector<SCallstackFrameInfo> getBacktrace(); std::vector<SCallstackFrameInfo> getBacktrace();
void throwError(const std::string& err);