mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-24 06:14:25 -04:00
Added Mutex protection to the core comms (pqihandler + pqipersongrp).
also added a Mutex to the ServiceServer. This will hopefully fix the random threading crashes. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
c46b823261
commit
4610d1ddac
5 changed files with 93 additions and 17 deletions
|
@ -35,6 +35,7 @@ const int pqiservicezone = 60478;
|
|||
|
||||
p3ServiceServer::p3ServiceServer()
|
||||
{
|
||||
RsStackMutex stack(srvMtx); /********* LOCKED *********/
|
||||
|
||||
#ifdef SERVICE_DEBUG
|
||||
pqioutput(PQL_DEBUG_BASIC, pqiservicezone,
|
||||
|
@ -47,6 +48,8 @@ p3ServiceServer::p3ServiceServer()
|
|||
|
||||
int p3ServiceServer::addService(pqiService *ts)
|
||||
{
|
||||
RsStackMutex stack(srvMtx); /********* LOCKED *********/
|
||||
|
||||
#ifdef SERVICE_DEBUG
|
||||
pqioutput(PQL_DEBUG_BASIC, pqiservicezone,
|
||||
"p3ServiceServer::addService()");
|
||||
|
@ -67,6 +70,8 @@ int p3ServiceServer::addService(pqiService *ts)
|
|||
|
||||
int p3ServiceServer::incoming(RsRawItem *item)
|
||||
{
|
||||
RsStackMutex stack(srvMtx); /********* LOCKED *********/
|
||||
|
||||
#ifdef SERVICE_DEBUG
|
||||
pqioutput(PQL_DEBUG_BASIC, pqiservicezone,
|
||||
"p3ServiceServer::incoming()");
|
||||
|
@ -120,6 +125,7 @@ int p3ServiceServer::incoming(RsRawItem *item)
|
|||
|
||||
RsRawItem *p3ServiceServer::outgoing()
|
||||
{
|
||||
RsStackMutex stack(srvMtx); /********* LOCKED *********/
|
||||
|
||||
#ifdef SERVICE_DEBUG
|
||||
pqioutput(PQL_DEBUG_ALL, pqiservicezone,
|
||||
|
@ -186,6 +192,8 @@ RsRawItem *p3ServiceServer::outgoing()
|
|||
int p3ServiceServer::tick()
|
||||
{
|
||||
|
||||
RsStackMutex stack(srvMtx); /********* LOCKED *********/
|
||||
|
||||
#ifdef SERVICE_DEBUG
|
||||
pqioutput(PQL_DEBUG_ALL, pqiservicezone,
|
||||
"p3ServiceServer::tick()");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue