eeva/jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Review comment fixes

Browse Source
This commit is contained in:
Peter L Jones 2020-05-11 20:12:16 +01:00
parent b60c3cab7b
commit db357ae2bc
4 changed files with 219 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/server.cpp
View File

@ -251,7 +251,8 @@ CServer::CServer ( const int iNewMaxNumChan,
bAutoRunMinimized ( false ), bAutoRunMinimized ( false ),
strWelcomeMessage ( strNewWelcomeMessage ), strWelcomeMessage ( strNewWelcomeMessage ),
eLicenceType ( eNLicenceType ), eLicenceType ( eNLicenceType ),
bDisconnectAllClients ( bNDisconnectAllClients ) bDisconnectAllClients ( bNDisconnectAllClients ),
pSignalHandler ( CSignalHandler::getSingletonP() )
{ {
int iOpusError; int iOpusError;
int i; int i;
@ -917,11 +918,7 @@ void CServer::OnCLDisconnection ( CHostAddress InetAddr )
void CServer::OnAboutToQuit() void CServer::OnAboutToQuit()
{ {
if ( IsRunning() ) Stop();
{
// Clean up
CleanShutdown();
}
// if server was registered at the central server, unregister on shutdown // if server was registered at the central server, unregister on shutdown
if ( GetServerListEnabled() ) if ( GetServerListEnabled() )
@ -936,33 +933,6 @@ void CServer::OnShutdown ( int )
QCoreApplication::instance()->exit(); QCoreApplication::instance()->exit();
} }
void CServer::CleanShutdown() {
Mutex.lock();
{
bool oldDAC = bDisconnectAllClients;
// This is to prevent new connections
bDisconnectAllClients = true;
// This is to disconnect all connected channels
for ( int i = 0; i < iMaxNumChannels; i++ )
{
if ( vecChannels[i].IsConnected() )
{
vecChannels[i].Disconnect();
}
}
// This should tell the jam recorder than the jam has ended...
Stop();
// Restore the value in case we are not exiting
bDisconnectAllClients = oldDAC;
}
Mutex.unlock();
}
void CServer::Start() void CServer::Start()
{ {
// only start if not already running // only start if not already running

6
src/server.h
View File

@ -258,8 +258,6 @@ protected:
int GetNumberOfConnectedClients(); int GetNumberOfConnectedClients();
CVector<CChannelInfo> CreateChannelList(); CVector<CChannelInfo> CreateChannelList();
CSignalHandler* pSignalHandler = CSignalHandler::getSingletonP();
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
virtual void CreateAndSendChanListForAllConChannels(); virtual void CreateAndSendChanListForAllConChannels();
virtual void CreateAndSendChanListForThisChan ( const int iCurChanID ); virtual void CreateAndSendChanListForThisChan ( const int iCurChanID );
@ -306,8 +304,6 @@ protected:
const CVector<CVector<int16_t> > vecvecsData, const CVector<CVector<int16_t> > vecvecsData,
CVector<uint16_t>& vecLevelsOut ); CVector<uint16_t>& vecLevelsOut );
void CleanShutdown();
// do not use the vector class since CChannel does not have appropriate // do not use the vector class since CChannel does not have appropriate
// copy constructor/operator // copy constructor/operator
CChannel vecChannels[MAX_NUM_CHANNELS]; CChannel vecChannels[MAX_NUM_CHANNELS];
@ -375,6 +371,8 @@ protected:
ELicenceType eLicenceType; ELicenceType eLicenceType;
bool bDisconnectAllClients; bool bDisconnectAllClients;
CSignalHandler* pSignalHandler;
signals: signals:
void Started(); void Started();
void Stopped(); void Stopped();

37
src/signalhandler.cpp
View File

@ -20,6 +20,43 @@
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
******************************************************************************
*
* This code contains some ideas derived from QCtrlSignals
* https://github.com/Skycoder42/QCtrlSignals.git
* - mostly the singleton and emitSignal code, plus some of the structure
* - virtually everything else is common knowledge across SourceForge answers
*
* BSD 3-Clause License
*
* Copyright (c) 2016, Felix Barz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* * Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
\******************************************************************************/ \******************************************************************************/
#include "signalhandler.h" #include "signalhandler.h"

317
src/signalhandler.h
View File

@ -1,140 +1,177 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2020 * Copyright (c) 2020
* *
* Author(s): * Author(s):
* Peter L Jones * Peter L Jones
* *
****************************************************************************** ******************************************************************************
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software * the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later * Foundation; either version 2 of the License, or (at your option) any later
* version. * version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
\******************************************************************************/ ******************************************************************************
*
#pragma once * This code contains some ideas derived from QCtrlSignals
* https://github.com/Skycoder42/QCtrlSignals.git
#include <QtCore/QObject> * - mostly the singleton and emitSignal code, plus some of the structure
#include <QtCore/QScopedPointer> * - virtually everything else is common knowledge across SourceForge answers
#include <QtCore/QHash> *
#include <QtCore/QReadWriteLock> * BSD 3-Clause License
#include <QtCore/QSet> *
#include <QGlobalStatic> * Copyright (c) 2016, Felix Barz
* All rights reserved.
#ifdef _WIN32 *
#include <qt_windows.h> * Redistribution and use in source and binary forms, with or without
#include <QtCore/QCoreApplication> * modification, are permitted provided that the following conditions are met:
#include <QtCore/QSemaphore> *
#include <QtCore/QThread> * * Redistributions of source code must retain the above copyright notice, this
#include <QtCore/QDebug> * list of conditions and the following disclaimer.
#else *
#include <QSocketNotifier> * * Redistributions in binary form must reproduce the above copyright notice,
#include <QObject> * this list of conditions and the following disclaimer in the documentation
#include <QCoreApplication> * and/or other materials provided with the distribution.
#include <csignal> *
#include <signal.h> * * Neither the name of the copyright holder nor the names of its
#include <unistd.h> * contributors may be used to endorse or promote products derived from
#include <sys/socket.h> * this software without specific prior written permission.
#endif *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
class CSignalBase; * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
class CSignalHandler : public QObject * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
{ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
Q_OBJECT * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
friend class CSignalBase; * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
friend class CSignalHandlerSingleton; * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
public: *
static CSignalHandler* getSingletonP(); \******************************************************************************/
bool emitSignal ( int ); #pragma once
#ifndef _WIN32 #include <QtCore/QObject>
public slots: #include <QtCore/QScopedPointer>
void OnSocketNotify ( int socket ); #include <QtCore/QHash>
#endif #include <QtCore/QReadWriteLock>
#include <QtCore/QSet>
signals: #include <QGlobalStatic>
void ShutdownSignal ( int sigNum );
#ifdef _WIN32
private: #include <qt_windows.h>
QScopedPointer<CSignalBase> pSignalBase; #include <QtCore/QCoreApplication>
#include <QtCore/QSemaphore>
explicit CSignalHandler(); #include <QtCore/QThread>
~CSignalHandler() override; #include <QtCore/QDebug>
}; #else
#include <QSocketNotifier>
// ---------------------------------------------------------- #include <QObject>
#include <QCoreApplication>
class CSignalBase #include <csignal>
{ #include <signal.h>
Q_DISABLE_COPY ( CSignalBase ) #include <unistd.h>
#include <sys/socket.h>
public: #endif
static CSignalBase* withSignalHandler ( CSignalHandler* );
virtual ~CSignalBase(); class CSignalBase;
virtual QReadWriteLock* getLock() const = 0; class CSignalHandler : public QObject
{
QSet<int> sHandledSigNums; Q_OBJECT
protected: friend class CSignalBase;
CSignalBase ( CSignalHandler* ); friend class CSignalHandlerSingleton;
CSignalHandler* pSignalHandler; public:
static CSignalHandler* getSingletonP();
template <typename T>
static T *getSelf() bool emitSignal ( int );
{
return static_cast<T*>( CSignalHandler::getSingletonP()->pSignalBase.data() ); #ifndef _WIN32
} public slots:
void OnSocketNotify ( int socket );
}; #endif
#ifdef _WIN32 signals:
void ShutdownSignal ( int sigNum );
class CSignalWin : public CSignalBase
{ private:
public: QScopedPointer<CSignalBase> pSignalBase;
CSignalWin ( CSignalHandler* );
~CSignalWin() override; explicit CSignalHandler();
~CSignalHandler() override;
virtual QReadWriteLock* getLock() const override; };
private: // ----------------------------------------------------------
mutable QReadWriteLock lock;
class CSignalBase
static BOOL WINAPI signalHandler ( _In_ DWORD sigNum ); {
}; Q_DISABLE_COPY ( CSignalBase )
#else public:
static CSignalBase* withSignalHandler ( CSignalHandler* );
class CSignalUnix : public CSignalBase virtual ~CSignalBase();
{
public: virtual QReadWriteLock* getLock() const = 0;
CSignalUnix ( CSignalHandler* );
~CSignalUnix() override; QSet<int> sHandledSigNums;
virtual QReadWriteLock* getLock() const override; protected:
CSignalBase ( CSignalHandler* );
private:
QSocketNotifier* socketNotifier = nullptr; CSignalHandler* pSignalHandler;
bool setSignalHandled ( int sigNum, bool state );
template <typename T>
static int socketPair[2]; static T *getSelf()
static void signalHandler ( int sigNum ); {
}; return static_cast<T*>( CSignalHandler::getSingletonP()->pSignalBase.data() );
}
#endif
};
#ifdef _WIN32
class CSignalWin : public CSignalBase
{
public:
CSignalWin ( CSignalHandler* );
~CSignalWin() override;
virtual QReadWriteLock* getLock() const override;
private:
mutable QReadWriteLock lock;
static BOOL WINAPI signalHandler ( _In_ DWORD sigNum );
};
#else
class CSignalUnix : public CSignalBase
{
public:
CSignalUnix ( CSignalHandler* );
~CSignalUnix() override;
virtual QReadWriteLock* getLock() const override;
private:
QSocketNotifier* socketNotifier = nullptr;
bool setSignalHandled ( int sigNum, bool state );
static int socketPair[2];
static void signalHandler ( int sigNum );
};
#endif