Commit 947ada23 authored by TheDebbio's avatar TheDebbio
Browse files

monitor thread conflict with mixer status

parent 63ae26a3

Medicina/Servers/MedicinaCBand/src/ComponentCore.cpp

+4 −2
Original line number Diff line number Diff line
@@ -306,8 +306,10 @@ void CComponentCore::checkLocalOscillator() throw (ComponentErrors::CORBAProblem 
{

    baci::ThreadSyncGuard guard(&m_mutex);    

    /* Load mixer if it's not ready */

    if (!m_mixer.isLoaded())

        m_mixer.loadComponents();

    if (!m_mixer.isLoaded()){        

        clearStatusBit(UNLOCKED);   

        return;

    }        

    if (!m_mixer.isLocked()) setStatusBit(UNLOCKED);

    else clearStatusBit(UNLOCKED);   

}

Medicina/Servers/MedicinaCBand/src/MixerOperator.cpp

+3 −1
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ bool MixerOperator::isDeviceLocked(Receivers::LocalOscillator_var p_loDev, 
	 ACSErr::Completion_var comp;

    ACS::ROlong_var isLockedRef;

    CORBA::Long isLocked;

    if (CORBA::is_nil(p_loDev))

        return false;

    try {        

        isLockedRef=p_loDev->isLocked();

    }