AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasm: implement socket notifier support

Browse Source 
Implement socket notifier support using Emscripten’s
socket callbacks.

This is sufficient for supporting non-blocking (tunneled)
TCP and UDP sockets on the main thread.

Change-Id: Ib9ee2698d029fb94d954c6872f8e118b0aa15499
Reviewed-by: David Skoland <david.skoland@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
This commit is contained in:
Morten Johan Sørvig 2021-10-10 15:37:22 +02:00
parent 76d12eea22
commit 44d2f97bff
2 changed files with 145 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/corelib/kernel/qeventdispatcher_wasm.cpp
View File

@ -41,6 +41,7 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/qthread.h>
#include <QtCore/qsocketnotifier.h>
#include "emscripten.h"
#include <emscripten/html5.h>
@ -122,6 +123,7 @@ QEventDispatcherWasm *QEventDispatcherWasm::g_mainThreadEventDispatcher = nullpt
QVector<QEventDispatcherWasm *> QEventDispatcherWasm::g_secondaryThreadEventDispatchers;
std::mutex QEventDispatcherWasm::g_secondaryThreadEventDispatchersMutex;
#endif
std::multimap<int, QSocketNotifier *> QEventDispatcherWasm::g_socketNotifiers;
QEventDispatcherWasm::QEventDispatcherWasm()
: QAbstractEventDispatcher()
@ -169,6 +171,11 @@ QEventDispatcherWasm::~QEventDispatcherWasm()
{
if (m_timerId > 0)
emscripten_clear_timeout(m_timerId);
if (!g_socketNotifiers.empty()) {
qWarning("QEventDispatcherWasm: main thread event dispatcher deleted with active socket notifiers");
clearEmscriptenSocketCallbacks();
g_socketNotifiers.clear();
}
g_mainThreadEventDispatcher = nullptr;
}
}
@ -224,14 +231,34 @@ bool QEventDispatcherWasm::processEvents(QEventLoop::ProcessEventsFlags flags)
void QEventDispatcherWasm::registerSocketNotifier(QSocketNotifier *notifier)
{
Q_UNUSED(notifier);
qWarning("QEventDispatcherWasm::registerSocketNotifier: socket notifiers are not supported");
if (!emscripten_is_main_runtime_thread()) {
qWarning("QEventDispatcherWasm::registerSocketNotifier: socket notifiers on secondary threads are not supported");
return;
}
if (g_socketNotifiers.empty())
setEmscriptenSocketCallbacks();
g_socketNotifiers.insert({notifier->socket(), notifier});
}
void QEventDispatcherWasm::unregisterSocketNotifier(QSocketNotifier *notifier)
{
Q_UNUSED(notifier);
qWarning("QEventDispatcherWasm::unregisterSocketNotifier: socket notifiers are not supported");
if (!emscripten_is_main_runtime_thread()) {
qWarning("QEventDispatcherWasm::registerSocketNotifier: socket notifiers on secondary threads are not supported");
return;
}
auto notifiers = g_socketNotifiers.equal_range(notifier->socket());
for (auto it = notifiers.first; it != notifiers.second; ++it) {
if (it->second == notifier) {
g_socketNotifiers.erase(it);
break;
}
}
if (g_socketNotifiers.empty())
clearEmscriptenSocketCallbacks();
}
void QEventDispatcherWasm::registerTimer(int timerId, qint64 interval, Qt::TimerType timerType, QObject *object)
@ -557,6 +584,110 @@ void QEventDispatcherWasm::callProcessTimers(void *context)
#endif
}
void QEventDispatcherWasm::setEmscriptenSocketCallbacks()
{
qCDebug(lcEventDispatcher) << "setEmscriptenSocketCallbacks";
emscripten_set_socket_error_callback(nullptr, QEventDispatcherWasm::socketError);
emscripten_set_socket_open_callback(nullptr, QEventDispatcherWasm::socketOpen);
emscripten_set_socket_listen_callback(nullptr, QEventDispatcherWasm::socketListen);
emscripten_set_socket_connection_callback(nullptr, QEventDispatcherWasm::socketConnection);
emscripten_set_socket_message_callback(nullptr, QEventDispatcherWasm::socketMessage);
emscripten_set_socket_close_callback(nullptr, QEventDispatcherWasm::socketClose);
}
void QEventDispatcherWasm::clearEmscriptenSocketCallbacks()
{
qCDebug(lcEventDispatcher) << "clearEmscriptenSocketCallbacks";
emscripten_set_socket_error_callback(nullptr, nullptr);
emscripten_set_socket_open_callback(nullptr, nullptr);
emscripten_set_socket_listen_callback(nullptr, nullptr);
emscripten_set_socket_connection_callback(nullptr, nullptr);
emscripten_set_socket_message_callback(nullptr, nullptr);
emscripten_set_socket_close_callback(nullptr, nullptr);
}
void QEventDispatcherWasm::socketError(int socket, int err, const char* msg, void *context)
{
Q_UNUSED(err);
Q_UNUSED(msg);
Q_UNUSED(context);
qCDebug(lcEventDispatcher) << "QEventDispatcherWasm::socketError" << socket;
auto notifiersRange = g_socketNotifiers.equal_range(socket);
std::vector<std::pair<int, QSocketNotifier *>> notifiers(notifiersRange.first, notifiersRange.second);
for (auto [_, notifier]: notifiers) {
QEvent event(QEvent::SockAct);
QCoreApplication::sendEvent(notifier, &event);
}
}
void QEventDispatcherWasm::socketOpen(int socket, void *context)
{
Q_UNUSED(context);
qCDebug(lcEventDispatcher) << "QEventDispatcherWasm::socketOpen" << socket;
auto notifiersRange = g_socketNotifiers.equal_range(socket);
std::vector<std::pair<int, QSocketNotifier *>> notifiers(notifiersRange.first, notifiersRange.second);
for (auto [_, notifier]: notifiers) {
if (notifier->type() == QSocketNotifier::Write) {
QEvent event(QEvent::SockAct);
QCoreApplication::sendEvent(notifier, &event);
}
}
}
void QEventDispatcherWasm::socketListen(int socket, void *context)
{
Q_UNUSED(socket);
Q_UNUSED(context);
qCDebug(lcEventDispatcher) << "QEventDispatcherWasm::socketListen" << socket;
}
void QEventDispatcherWasm::socketConnection(int socket, void *context)
{
Q_UNUSED(context);
Q_UNUSED(socket);
qCDebug(lcEventDispatcher) << "QEventDispatcherWasm::socketConnection" << socket;
}
void QEventDispatcherWasm::socketMessage(int socket, void *context)
{
Q_UNUSED(context);
qCDebug(lcEventDispatcher) << "QEventDispatcherWasm::socketMessage" << socket;
auto notifiersRange = g_socketNotifiers.equal_range(socket);
std::vector<std::pair<int, QSocketNotifier *>> notifiers(notifiersRange.first, notifiersRange.second);
for (auto [_, notifier]: notifiers) {
if (notifier->type() == QSocketNotifier::Read) {
QEvent event(QEvent::SockAct);
QCoreApplication::sendEvent(notifier, &event);
}
}
}
void QEventDispatcherWasm::socketClose(int socket, void *context)
{
Q_UNUSED(context);
qCDebug(lcEventDispatcher) << "QEventDispatcherWasm::socketClose" << socket;
auto notifiersRange = g_socketNotifiers.equal_range(socket);
std::vector<std::pair<int, QSocketNotifier *>> notifiers(notifiersRange.first, notifiersRange.second);
for (auto [_, notifier]: notifiers) {
if (notifier->type() == QSocketNotifier::Write) {
QEvent event(QEvent::SockAct);
QCoreApplication::sendEvent(notifier, &event);
}
}
}
#if QT_CONFIG(thread)
namespace {

10
src/corelib/kernel/qeventdispatcher_wasm_p.h
View File

@ -100,6 +100,15 @@ private:
void updateNativeTimer();
static void callProcessTimers(void *eventDispatcher);
void setEmscriptenSocketCallbacks();
void clearEmscriptenSocketCallbacks();
static void socketError(int fd, int err, const char* msg, void *context);
static void socketOpen(int fd, void *context);
static void socketListen(int fd, void *context);
static void socketConnection(int fd, void *context);
static void socketMessage(int fd, void *context);
static void socketClose(int fd, void *context);
#if QT_CONFIG(thread)
void runOnMainThread(std::function<void(void)> fn);
#endif
@ -122,6 +131,7 @@ private:
static QVector<QEventDispatcherWasm *> g_secondaryThreadEventDispatchers;
static std::mutex g_secondaryThreadEventDispatchersMutex;
#endif
static std::multimap<int, QSocketNotifier *> g_socketNotifiers;
};
#endif // QEVENTDISPATCHER_WASM_P_H