aboutsummaryrefslogtreecommitdiffstats
path: root/common/os
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2024-10-20 11:06:13 +0200
committerPierre Ossman <ossman@cendio.se>2024-11-06 21:24:36 +0100
commit2b7857283b834391266e414adcff8c20f8fe3067 (patch)
tree146051a67b20b217593298eec695aafda89134f6 /common/os
parented07250fef4e258d0d37d1c4e520db6d6c1e6fdb (diff)
downloadtigervnc-2b7857283b834391266e414adcff8c20f8fe3067.tar.gz
tigervnc-2b7857283b834391266e414adcff8c20f8fe3067.zip
Use standard library naming for exceptions
This makes things more consistent since we mix with the standard library exceptions so often.
Diffstat (limited to 'common/os')
-rw-r--r--common/os/Mutex.cxx16
-rw-r--r--common/os/Thread.cxx10
2 files changed, 13 insertions, 13 deletions
diff --git a/common/os/Mutex.cxx b/common/os/Mutex.cxx
index b82de415..1889e66b 100644
--- a/common/os/Mutex.cxx
+++ b/common/os/Mutex.cxx
@@ -43,7 +43,7 @@ Mutex::Mutex()
systemMutex = new pthread_mutex_t;
ret = pthread_mutex_init((pthread_mutex_t*)systemMutex, nullptr);
if (ret != 0)
- throw rdr::PosixException("Failed to create mutex", ret);
+ throw rdr::posix_error("Failed to create mutex", ret);
#endif
}
@@ -67,7 +67,7 @@ void Mutex::lock()
ret = pthread_mutex_lock((pthread_mutex_t*)systemMutex);
if (ret != 0)
- throw rdr::PosixException("Failed to lock mutex", ret);
+ throw rdr::posix_error("Failed to lock mutex", ret);
#endif
}
@@ -80,7 +80,7 @@ void Mutex::unlock()
ret = pthread_mutex_unlock((pthread_mutex_t*)systemMutex);
if (ret != 0)
- throw rdr::PosixException("Failed to unlock mutex", ret);
+ throw rdr::posix_error("Failed to unlock mutex", ret);
#endif
}
@@ -97,7 +97,7 @@ Condition::Condition(Mutex* mutex_)
systemCondition = new pthread_cond_t;
ret = pthread_cond_init((pthread_cond_t*)systemCondition, nullptr);
if (ret != 0)
- throw rdr::PosixException("Failed to create condition variable", ret);
+ throw rdr::posix_error("Failed to create condition variable", ret);
#endif
}
@@ -120,14 +120,14 @@ void Condition::wait()
(CRITICAL_SECTION*)mutex->systemMutex,
INFINITE);
if (!ret)
- throw rdr::Win32Exception("Failed to wait on condition variable", GetLastError());
+ throw rdr::win32_error("Failed to wait on condition variable", GetLastError());
#else
int ret;
ret = pthread_cond_wait((pthread_cond_t*)systemCondition,
(pthread_mutex_t*)mutex->systemMutex);
if (ret != 0)
- throw rdr::PosixException("Failed to wait on condition variable", ret);
+ throw rdr::posix_error("Failed to wait on condition variable", ret);
#endif
}
@@ -140,7 +140,7 @@ void Condition::signal()
ret = pthread_cond_signal((pthread_cond_t*)systemCondition);
if (ret != 0)
- throw rdr::PosixException("Failed to signal condition variable", ret);
+ throw rdr::posix_error("Failed to signal condition variable", ret);
#endif
}
@@ -153,6 +153,6 @@ void Condition::broadcast()
ret = pthread_cond_broadcast((pthread_cond_t*)systemCondition);
if (ret != 0)
- throw rdr::PosixException("Failed to broadcast condition variable", ret);
+ throw rdr::posix_error("Failed to broadcast condition variable", ret);
#endif
}
diff --git a/common/os/Thread.cxx b/common/os/Thread.cxx
index e99be63e..6dca75a1 100644
--- a/common/os/Thread.cxx
+++ b/common/os/Thread.cxx
@@ -66,7 +66,7 @@ void Thread::start()
#ifdef WIN32
*(HANDLE*)threadId = CreateThread(nullptr, 0, startRoutine, this, 0, nullptr);
if (*(HANDLE*)threadId == nullptr)
- throw rdr::Win32Exception("Failed to create thread", GetLastError());
+ throw rdr::win32_error("Failed to create thread", GetLastError());
#else
int ret;
sigset_t all, old;
@@ -76,14 +76,14 @@ void Thread::start()
sigfillset(&all);
ret = pthread_sigmask(SIG_SETMASK, &all, &old);
if (ret != 0)
- throw rdr::PosixException("Failed to mask signals", ret);
+ throw rdr::posix_error("Failed to mask signals", ret);
ret = pthread_create((pthread_t*)threadId, nullptr, startRoutine, this);
pthread_sigmask(SIG_SETMASK, &old, nullptr);
if (ret != 0)
- throw rdr::PosixException("Failed to create thread", ret);
+ throw rdr::posix_error("Failed to create thread", ret);
#endif
running = true;
@@ -99,13 +99,13 @@ void Thread::wait()
ret = WaitForSingleObject(*(HANDLE*)threadId, INFINITE);
if (ret != WAIT_OBJECT_0)
- throw rdr::Win32Exception("Failed to join thread", GetLastError());
+ throw rdr::win32_error("Failed to join thread", GetLastError());
#else
int ret;
ret = pthread_join(*(pthread_t*)threadId, nullptr);
if (ret != 0)
- throw rdr::PosixException("Failed to join thread", ret);
+ throw rdr::posix_error("Failed to join thread", ret);
#endif
}