cwWebSock.cpp: replace use of MpScNbQueue until MpScQueue can be debugged.

This commit is contained in:
kpl 2021-01-12 17:05:34 -05:00
parent ed75129278
commit a82c423725

View File

@ -3,9 +3,8 @@
#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 "cwMpScQueue.h" #include "cwMpScNbQueue.h"
#include <libwebsockets.h> #include <libwebsockets.h>
@ -36,7 +35,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; //
MpScQueue<msg_t>* _q; // Thread safe, non-blocking, protocol independent msg queue. MpScNbQueue<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;
@ -445,7 +444,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 MpScQueue<msg_t>(); p->_q = new MpScNbQueue<msg_t>();
p->_cbFunc = cbFunc; p->_cbFunc = cbFunc;
p->_cbArg = cbArg; p->_cbArg = cbArg;