Page MenuHomePhabricator (Chris)

No OneTemporary

Size
15 KB
Referenced Files
None
Subscribers
None
diff --git a/README.md b/README.md
index 7cf1f9e..cbc86d8 100644
--- a/README.md
+++ b/README.md
@@ -1,69 +1,76 @@
SingleApplication
=================
This is a replacement of the QSingleApplication for `Qt5`.
-Keeps the Primary Instance of your Application and kills each subsequent instance.
+Keeps the Primary Instance of your Application and kills each subsequent instances.
+
+**NOTABLE DIFFERENCES OF THIS FORK WITH THE [ORIGINAL VERSION](https://github.com/itay-grudev/SingleApplication)**: Code style, Windows mutex creation and the instanceArguments() signal.
Usage
-----
-The `SingleApplication` class inherits from `QApplication`. Use it as if you are using the `QApplication` class.
+The `SingleApplication` class inherits from whatever `Q[Core|Gui]Application` class you specify in the `*.pro` file. Further usage is similar to use one of the `Q[Core|Gui]Application` classes.
The library uses your `Organization Name` and `Application Name` to set up a `QLocalServer` and a `QSharedMemory` block. The first instance of your Application would check if the shared memory block exists and if not it will start a `QLocalServer` and then listen for connections on it. Each subsequent instance of your application would check if the shared memory block exists and if it does, it will connect to the QLocalServer to notify it that a new instance had been started, after which would terminate the new instance with status code `0`. The Primary Instance, `SingleApplication` would emmit the `showUp()` signal upon detecting that a new instance had been started.
The library uses `stdlib` to terminate the program with the `exit()` function.
Here is an example usage of the library:
```cpp
+// project.pro
+DEFINES += QAPPLICATION_CLASS=QApplication # or whatever app class you want
+
+// main.cpp
#include "singleapplication.h"
int main(int argc, char *argv[])
{
QApplication::setApplicationName("{Your App Name}");
QApplication::setOrganizationName("{Your Organization Name}");
SingleApplication app(argc, argv);
return app.exec();
}
```
The `Show Up` signal
------------------------
The SingleApplication class implements a `showUp()` signal. You can bind to that signal to raise your application's window when a new instance had been started.
Note that since `SingleApplication` extends the `QApplication` class you can do the following:
```cpp
-QObject::connect(QApplication::instance(), SIGNAL(showUp()), window, SLOT(raise())); // window is your QWindow instance
+// Truly raise your window.
+QObject::connect(&app, &SingleApplication::showUp, [&]
+{
+ window.show();
+ window.raise();
+ window.activateWindow();
+}); // 'window' is your QWindow instance
```
Using `QApplication::instance()` is a neat way to get the `SingleApplication` instance at any place in your program.
-Extending from other application classes
------------------------
-
-`SingleApplication` extends from the `QApplication` class by default , but you can easily change that to `QGuiApplication` or `QCoreApplication` with the `QAPPLICATION_CLASS` macro. Define it before the include statement of `singleapplication.h` or change the default value in the file.
-__Example:__
+The `Instance Arguments` signal
+------------------------
+This fork of SingleApplication also implements a `instanceArguments(QStringList)` signal. You can connect this signal to receive any arguments that might've been passed to the now-dead instance of the application.
-```cpp
-#define QAPPLICATION_CLASS QCoreApplication
-```
Implementation
--------------
The library is implemented with a QSharedMemory block which is thread safe and guarantees a race condition will not occur. It also uses a QLocalSocket to notify the main process that a new instance had been spawned and thus invoke the `showUp()` signal.
To handle an issue on `*nix` systems, where the operating system owns the shared memory block and if the program crashes the memory remains untouched, the library binds to the following signals and closes the program with error code = `128 + signum` where signum is the number representation of the signal listed below. Handling the signal is required in order to safely delete the `QSharedMemory` block.
* `SIGINT ` - `2`
* `SIGILL ` - `4`
* `SIGABRT` - `6`
* `SIGFPE ` - `8`
* `SIGSEGV` - `11`
* `SIGTERM` - `15`
License
-------
This library and it's supporting documentation are released under `The MIT License (MIT)`.
diff --git a/singleapplication.cpp b/singleapplication.cpp
index 9bfad34..9229193 100644
--- a/singleapplication.cpp
+++ b/singleapplication.cpp
@@ -1,188 +1,217 @@
-#include "singleapplication.h"
-#include <QSharedMemory>
-#include <QLocalSocket>
-#include <QLocalServer>
-#include <QDataStream>
+#include <QtCore/QDataStream>
+#include <QtCore/QSharedMemory>
+#include <QtNetwork/QLocalSocket>
+#include <QtNetwork/QLocalServer>
#ifdef Q_OS_UNIX
- #include <QMutex>
- #include <cstdlib>
+ #include <QtCore/QMutex>
+ #include <cstdlib>
#include <signal.h>
#include <unistd.h>
#endif
#ifdef Q_OS_WIN
#include <windows.h>
#endif
+#include "singleapplication.h"
+
class SingleApplicationPrivate
{
+ Q_DECLARE_PUBLIC(SingleApplication)
+
public:
- SingleApplicationPrivate(SingleApplication *q_ptr) : q_ptr(q_ptr) { }
+ explicit SingleApplicationPrivate(SingleApplication *q_ptr) : q_ptr(q_ptr), memory(Q_NULLPTR), server(Q_NULLPTR), socket(Q_NULLPTR) {}
void startServer(QString &serverName)
{
+ Q_Q(SingleApplication);
+
// Start a QLocalServer to listen for connections
server = new QLocalServer();
- server->removeServer(serverName);
+ QLocalServer::removeServer(serverName);
server->listen(serverName);
- QObject::connect(server, SIGNAL(newConnection()), q_ptr, SLOT(slotConnectionEstablished()));
+ QObject::connect(server, SIGNAL(newConnection()), q, SLOT(slotConnectionEstablished()));
}
-#ifdef Q_OS_UNIX
void crashHandler()
{
+#ifdef Q_OS_UNIX
// This guarantees the program will work even with multiple
- // instances of SingleApplication in different threads
- // Which in my opinion is idiotic, but lets handle that too
+ // instances of SingleApplication in different threads.
+ // Which in my opinion is idiotic, but lets handle that too.
{
sharedMemMutex.lock();
sharedMem.append(memory);
sharedMemMutex.unlock();
}
// Handle any further termination signals to ensure the
// QSharedMemory block is deleted even if the process crashes
signal(SIGSEGV, SingleApplicationPrivate::terminate);
signal(SIGABRT, SingleApplicationPrivate::terminate);
- signal(SIGFPE, SingleApplicationPrivate::terminate);
- signal(SIGILL, SingleApplicationPrivate::terminate);
- signal(SIGINT, SingleApplicationPrivate::terminate);
+ signal(SIGFPE, SingleApplicationPrivate::terminate);
+ signal(SIGILL, SingleApplicationPrivate::terminate);
+ signal(SIGINT, SingleApplicationPrivate::terminate);
signal(SIGTERM, SingleApplicationPrivate::terminate);
+#endif
}
+#ifdef Q_OS_UNIX
static void terminate(int signum)
{
while (!sharedMem.empty()) {
delete sharedMem.back();
sharedMem.pop_back();
}
::exit(128 + signum);
}
static QList<QSharedMemory *> sharedMem;
static QMutex sharedMemMutex;
#endif
+ bool createMutex(const QString& mutexName)
+ {
+#ifdef Q_OS_WIN
+ HANDLE mutexResult = CreateMutexA(NULL, FALSE, mutexName.toStdString().c_str());
+
+ if (mutexResult == NULL) {
+ qCritical() << "Couldn't create the application mutex - ERROR:" << GetLastError();
+ return false;
+ } else {
+ return true;
+ }
+#else
+ return true;
+#endif
+ }
+
QSharedMemory *memory;
SingleApplication *q_ptr;
QLocalServer *server;
QLocalSocket *socket;
};
#ifdef Q_OS_UNIX
QList<QSharedMemory *> SingleApplicationPrivate::sharedMem;
QMutex SingleApplicationPrivate::sharedMemMutex;
#endif
/**
* @brief Constructor. Checks and fires up LocalServer or closes the program
* if another instance already exists
* @param argc
* @param argv
*/
SingleApplication::SingleApplication(int &argc, char *argv[])
- : QAPPLICATION_CLASS(argc, argv), d_ptr(new SingleApplicationPrivate(this))
+ : app_t(argc, argv), d_ptr(new SingleApplicationPrivate(this))
{
- QString serverName = QAPPLICATION_CLASS::organizationName() + QAPPLICATION_CLASS::applicationName();
+ Q_D(SingleApplication);
+
+ QString serverName = app_t::organizationName() + app_t::applicationName();
serverName.replace(QRegExp("[^\\w\\-. ]"), "");
- // Garantee thread safe behaviour with a shared memory block
- d_ptr->memory = new QSharedMemory(serverName);
+ // Guarantee thread safe behaviour with a shared memory block
+ d->memory = new QSharedMemory(serverName);
// Create a shared memory block with a minimum size of 1 byte
- if (d_ptr->memory->create(1, QSharedMemory::ReadOnly)) {
+ if (d->memory->create(1, QSharedMemory::ReadOnly)) {
qDebug() << "Created the shared memory:" << serverName;
-#ifdef Q_OS_UNIX
// Handle any further termination signals to ensure the
// QSharedMemory block is deleted even if the process crashes
- d_ptr->crashHandler();
-#endif
+ d->crashHandler();
+
// Successful creation means that no main process exists
// So we start a Local Server to listen for connections
- d_ptr->startServer(serverName);
+ d->startServer(serverName);
-#ifdef Q_OS_WIN
// Creating a Windows Mutex, mostly so that other apps (like Inno Installer) can also know about the application's single instance
- QString mutexName = "Global\\" + serverName.replace(" ", "");
- HANDLE mutexResult = CreateMutexA(NULL, FALSE, mutexName.toStdString().c_str());
+ bool mutexResult = d->createMutex("Global\\" + serverName.replace(" ", ""));
- if (mutexResult == NULL) {
+ if (mutexResult == false) {
// Quit if we couldn't create the mutex.
- qCritical() << "Couldn't create the application mutex - ERROR:" << GetLastError();
- delete d_ptr->memory;
+ delete d->memory;
::exit(EXIT_SUCCESS);
}
-#endif
} else {
qDebug() << "Couldn't create the shared memory:" << serverName;
// Connect to the Local Server of the main process
// and send the current arguments
- d_ptr->socket = new QLocalSocket();
- d_ptr->socket->connectToServer(serverName);
-
- // Even though a shared memory block exists, the original application might have crashed
- // So only after a successful connection is the second instance terminated
- if (d_ptr->socket->waitForConnected(200)) {
- qDebug() << "About to send over argument data";
- // Before closing, we send the arguments that this application was called with
- // to the old instance
+ d->socket = new QLocalSocket();
+ d->socket->connectToServer(serverName);
+
+ // Even though a shared memory block exists, the original application
+ // might have crashed.
+ // So only after a successful connection is the second instance
+ // terminated.
+ if (d->socket->waitForConnected(100)) {
QByteArray argumentData;
// Serialize the application arguments
QDataStream ds(&argumentData, QIODevice::WriteOnly);
ds << arguments();
- d_ptr->socket->write(argumentData);
- d_ptr->socket->waitForBytesWritten(200); // Make sure our data is written
+ d->socket->write(argumentData);
+ d->socket->waitForBytesWritten(200); // Make sure our data is written
qDebug() << "Terminating after sending data";
::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
} else {
- qDebug() << "waitForConnected didn't connect";
- delete d_ptr->memory;
+ delete d->memory;
::exit(EXIT_SUCCESS);
}
}
}
/**
* @brief Destructor
*/
SingleApplication::~SingleApplication()
{
- delete d_ptr->memory;
- d_ptr->server->close();
+ Q_D(SingleApplication);
+
+ delete d->memory;
+ d->server->close();
+}
+
+bool SingleApplication::createMutex(const QString &mutexName)
+{
+ Q_D(SingleApplication);
+ return d->createMutex(mutexName);
}
/**
* @brief Executed when the new instance connects with the LocalServer
*/
void SingleApplication::slotConnectionEstablished()
{
- QLocalSocket *socket = d_ptr->server->nextPendingConnection();
+ Q_D(SingleApplication);
- // Emit showUp as soon as the connection is established
- emit showUp();
+ QLocalSocket *socket = d->server->nextPendingConnection();
+ Q_EMIT showUp();
// Connect the socket's readyRead signal to a lambda that is in charge of
// grabbing the arguments and emitting the signal that they arrived.
connect(socket, &QLocalSocket::readyRead, [&, socket] {
// Grab all the data from the socket
- QByteArray argumentData = socket->readAll();
+ const QByteArray argumentData = socket->readAll();
// Deserialize it
QStringList arguments;
QDataStream ds(argumentData);
ds >> arguments;
- emit instanceArguments(arguments);
+ Q_EMIT instanceArguments(arguments);
socket->close();
});
// Makes sure we delete the socket object even if we receive no data
connect(socket, &QLocalSocket::aboutToClose, socket, &QLocalSocket::deleteLater);
}
+
+
+
diff --git a/singleapplication.h b/singleapplication.h
index d56cd98..82e1d24 100644
--- a/singleapplication.h
+++ b/singleapplication.h
@@ -1,37 +1,42 @@
#ifndef SINGLE_APPLICATION_H
#define SINGLE_APPLICATION_H
+#include <QtCore/QtGlobal>
-// Change this to inherit from QGuiApplication or QCoreApplication
#ifndef QAPPLICATION_CLASS
- #define QAPPLICATION_CLASS QCoreApplication
+ #define QAPPLICATION_CLASS QApplication
#endif
-#define QUOTE(C) #C
-#define INCLUDE_FILE(C) QUOTE(C)
-#include INCLUDE_FILE(QAPPLICATION_CLASS)
+#include QT_STRINGIFY(QAPPLICATION_CLASS)
class SingleApplicationPrivate;
/**
* @brief The SingleApplication class handles multipe instances of the same Application
* @see QApplication
*/
class SingleApplication : public QAPPLICATION_CLASS
{
Q_OBJECT
+ Q_DECLARE_PRIVATE(SingleApplication)
+
+ typedef QAPPLICATION_CLASS app_t;
+
public:
explicit SingleApplication(int &, char *[]);
~SingleApplication();
-signals:
+ bool createMutex(const QString& mutexName);
+
+Q_SIGNALS:
void showUp();
- void instanceArguments(const QStringList arguments);
+ void instanceArguments(const QStringList& arguments);
-private slots:
+private Q_SLOTS:
void slotConnectionEstablished();
private:
SingleApplicationPrivate *d_ptr;
+
};
#endif // SINGLE_APPLICATION_H
diff --git a/singleapplication.pri b/singleapplication.pri
index 8af6e67..5877e05 100644
--- a/singleapplication.pri
+++ b/singleapplication.pri
@@ -1,6 +1,4 @@
HEADERS += $$PWD/singleapplication.h
SOURCES += $$PWD/singleapplication.cpp
-QT *= network
-
-DEFINES += "QAPPLICATION_CLASS=QApplication"
+QT *= core network

File Metadata

Mime Type
text/x-diff
Expires
Thu, Sep 11, 12:27 PM (1 d, 6 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42649
Default Alt Text
(15 KB)

Event Timeline