diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-09-18 19:54:46 +1000 |
|---|---|---|
| committer | Jonathan Liu <net147@gmail.com> | 2014-09-23 00:47:34 +0200 |
| commit | 7b7ad02681f2c28fb18d053618f6804e989b2f56 (patch) | |
| tree | c79a8a04b4352f2ffac6b63a449d73c53787bd2e /src/corelib/kernel/qeventdispatcher_unix.cpp | |
| parent | a6316e6e744815c89b2d7bd7946e04549d183769 (diff) | |
Improve checking for event/socket notifiers and timers
Starting/stopping timers from another thread may result in errors that
may not appear until hours, days or weeks after if a release build of
Qt is used with the GLib/UNIX event dispatchers. Such errors may
manifest as warnings such as "QObject::killTimer(): Error: timer id 7
is not valid for object 0x2a51b488 (), timer has not been killed" and
application crashes (e.g. crashes in malloc, realloc and
malloc_consolidate).
Initial-patch-by: Eike Ziller <eike.ziller@digia.com>
Task-number: QTBUG-40636
Change-Id: I2de50d50eb1fc7467fcebb9c73b74d2f85137933
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_unix.cpp')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 69363bc3c9..9674fd5417 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -338,7 +338,7 @@ void QEventDispatcherUNIX::registerTimer(int timerId, int interval, Qt::TimerTyp qWarning("QEventDispatcherUNIX::registerTimer: invalid arguments"); return; } else if (obj->thread() != thread() || thread() != QThread::currentThread()) { - qWarning("QObject::startTimer: timers cannot be started from another thread"); + qWarning("QEventDispatcherUNIX::registerTimer: timers cannot be started from another thread"); return; } #endif @@ -357,7 +357,7 @@ bool QEventDispatcherUNIX::unregisterTimer(int timerId) qWarning("QEventDispatcherUNIX::unregisterTimer: invalid argument"); return false; } else if (thread() != QThread::currentThread()) { - qWarning("QObject::killTimer: timers cannot be stopped from another thread"); + qWarning("QEventDispatcherUNIX::unregisterTimer: timers cannot be stopped from another thread"); return false; } #endif @@ -376,7 +376,7 @@ bool QEventDispatcherUNIX::unregisterTimers(QObject *object) qWarning("QEventDispatcherUNIX::unregisterTimers: invalid argument"); return false; } else if (object->thread() != thread() || thread() != QThread::currentThread()) { - qWarning("QObject::killTimers: timers cannot be stopped from another thread"); + qWarning("QEventDispatcherUNIX::unregisterTimers: timers cannot be stopped from another thread"); return false; } #endif |