cwWebSock.cpp : Replace queue with blocking queue to prevent possible problems on ARM based machines.
This commit is contained in:
parent
41c3f0eb34
commit
ed75129278
@ -3,8 +3,9 @@
|
|||||||
#include "cwCommonImpl.h"
|
#include "cwCommonImpl.h"
|
||||||
#include "cwMem.h"
|
#include "cwMem.h"
|
||||||
#include "cwFileSys.h"
|
#include "cwFileSys.h"
|
||||||
|
#include "cwMutex.h"
|
||||||
#include "cwWebSock.h"
|
#include "cwWebSock.h"
|
||||||
#include "cwMpScNbQueue.h"
|
#include "cwMpScQueue.h"
|
||||||
|
|
||||||
#include <libwebsockets.h>
|
#include <libwebsockets.h>
|
||||||
|
|
||||||
@ -35,7 +36,7 @@ namespace cw
|
|||||||
unsigned _nextSessionId = 0; // Next session id.
|
unsigned _nextSessionId = 0; // Next session id.
|
||||||
unsigned _connSessionN = 0; // Count of connected sessions.
|
unsigned _connSessionN = 0; // Count of connected sessions.
|
||||||
struct lws_http_mount* _mount = nullptr; //
|
struct lws_http_mount* _mount = nullptr; //
|
||||||
MpScNbQueue<msg_t>* _q; // Thread safe, non-blocking, protocol independent msg queue.
|
MpScQueue<msg_t>* _q; // Thread safe, non-blocking, protocol independent msg queue.
|
||||||
|
|
||||||
lws_pollfd* _pollfdA; // socket handle array used by poll()
|
lws_pollfd* _pollfdA; // socket handle array used by poll()
|
||||||
int _pollfdMaxN;
|
int _pollfdMaxN;
|
||||||
@ -444,7 +445,7 @@ cw::rc_t cw::websock::create(
|
|||||||
info.mounts = p->_mount;
|
info.mounts = p->_mount;
|
||||||
info.protocols = p->_protocolA;
|
info.protocols = p->_protocolA;
|
||||||
|
|
||||||
p->_q = new MpScNbQueue<msg_t>();
|
p->_q = new MpScQueue<msg_t>();
|
||||||
p->_cbFunc = cbFunc;
|
p->_cbFunc = cbFunc;
|
||||||
p->_cbArg = cbArg;
|
p->_cbArg = cbArg;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user