Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename ClosureEventSender to CloseEventSender

Browse source
This commit is contained in:
Stephen Birarda 2017-06-01 17:52:01 -07:00 committed by Chris Collins
parent ecc697dbe1
commit e3d8229abe
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/Application.cpp
View file

@ -146,7 +146,7 @@
#include "InterfaceLogging.h"
#include "LODManager.h"
#include "ModelPackager.h"
#include "networking/ClosureEventSender.h"
#include "networking/CloseEventSender.h"
#include "networking/HFWebEngineProfile.h"
#include "networking/HFTabletWebEngineProfile.h"
#include "networking/FileTypeProfile.h"
@ -537,7 +537,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
DependencyManager::set<AvatarBookmarks>();
DependencyManager::set<LocationBookmarks>();
DependencyManager::set<Snapshot>();
DependencyManager::set<ClosureEventSender>();
DependencyManager::set<CloseEventSender>();
return previousSessionCrashed;
}
@ -1572,12 +1572,12 @@ void Application::aboutToQuit() {
getActiveDisplayPlugin()->deactivate();
// use the ClosureEventSender via a QThread to send an event that says the user asked for the app to close
auto closureEventSender = DependencyManager::get<ClosureEventSender>();
// use the CloseEventSender via a QThread to send an event that says the user asked for the app to close
auto closeEventSender = DependencyManager::get<CloseEventSender>();
QThread* closureEventThread = new QThread(this);
closureEventSender->moveToThread(closureEventThread);
closeEventSender->moveToThread(closureEventThread);
// sendQuitEventAsync will bail immediately if the UserActivityLogger is not enabled
connect(closureEventThread, &QThread::started, closureEventSender.data(), &ClosureEventSender::sendQuitEventAsync);
connect(closureEventThread, &QThread::started, closeEventSender.data(), &CloseEventSender::sendQuitEventAsync);
closureEventThread->start();
// Hide Running Scripts dialog so that it gets destroyed in an orderly manner; prevents warnings at shutdown.
@ -1745,13 +1745,13 @@ Application::~Application() {
_window->deleteLater();
// make sure that the quit event has finished sending before we take the application down
auto closureEventSender = DependencyManager::get<ClosureEventSender>();
while (!closureEventSender->hasFinishedQuitEvent() && !closureEventSender->hasTimedOutQuitEvent()) {
auto closeEventSender = DependencyManager::get<CloseEventSender>();
while (!closeEventSender->hasFinishedQuitEvent() && !closeEventSender->hasTimedOutQuitEvent()) {
// yield so we're not spinning
std::this_thread::yield();
}
// quit the thread used by the closure event sender
closureEventSender->thread()->quit();
closeEventSender->thread()->quit();
// Can't log to file passed this point, FileLogger about to be deleted
qInstallMessageHandler(LogHandler::verboseMessageHandler);

12
interface/src/networking/ClosureEventSender.cpp → interface/src/networking/CloseEventSender.cpp
View file

@ -1,5 +1,5 @@
//
// ClosureEventSender.cpp
// CloseEventSender.cpp
// interface/src/networking
//
// Created by Stephen Birarda on 5/31/17.
@ -21,7 +21,7 @@
#include <UserActivityLogger.h>
#include <UUID.h>
#include "ClosureEventSender.h"
#include "CloseEventSender.h"
QNetworkRequest createNetworkRequest() {
@ -58,17 +58,17 @@ QNetworkReply* replyForAction(QString action) {
return networkAccessManager.post(createNetworkRequest(), postDataForAction(action));
}
void ClosureEventSender::sendQuitEventAsync() {
void CloseEventSender::sendQuitEventAsync() {
if (UserActivityLogger::getInstance().isEnabled()) {
QNetworkReply* reply = replyForAction("quit");
connect(reply, &QNetworkReply::finished, this, &ClosureEventSender::handleQuitEventFinished);
connect(reply, &QNetworkReply::finished, this, &CloseEventSender::handleQuitEventFinished);
_quitEventStartTimestamp = QDateTime::currentMSecsSinceEpoch();
} else {
_hasFinishedQuitEvent = true;
}
}
void ClosureEventSender::handleQuitEventFinished() {
void CloseEventSender::handleQuitEventFinished() {
_hasFinishedQuitEvent = true;
auto reply = qobject_cast<QNetworkReply*>(sender());
@ -81,7 +81,7 @@ void ClosureEventSender::handleQuitEventFinished() {
reply->deleteLater();
}
bool ClosureEventSender::hasTimedOutQuitEvent() {
bool CloseEventSender::hasTimedOutQuitEvent() {
const int CLOSURE_EVENT_TIMEOUT_MS = 5000;
return _quitEventStartTimestamp != 0
&& QDateTime::currentMSecsSinceEpoch() - _quitEventStartTimestamp > CLOSURE_EVENT_TIMEOUT_MS;

10
interface/src/networking/ClosureEventSender.h → interface/src/networking/CloseEventSender.h
View file

@ -1,5 +1,5 @@
//
// ClosureEventSender.h
// CloseEventSender.h
// interface/src/networking
//
// Created by Stephen Birarda on 5/31/17.
@ -9,8 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#ifndef hifi_ClosureEventSender_h
#define hifi_ClosureEventSender_h
#ifndef hifi_CloseEventSender_h
#define hifi_CloseEventSender_h
#include <atomic>
@ -19,7 +19,7 @@
#include <DependencyManager.h>
class ClosureEventSender : public QObject, public Dependency {
class CloseEventSender : public QObject, public Dependency {
Q_OBJECT
SINGLETON_DEPENDENCY
@ -38,4 +38,4 @@ private:
std::atomic<int64_t> _quitEventStartTimestamp;
};
#endif // hifi_ClosureEventSender_h
#endif // hifi_CloseEventSender_h