Commit 252df89a authored by Marco De Marco's avatar Marco De Marco
Browse files

Some properties moved from signed to unsigned

parent c55e2872

src/Configuration.h

+8 −8
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ public: 
	}			



	std::string getWatchPath() const { return m_watchPath; }

	int getWorkerNumber() const { return m_workerNumber; }

    int getSleepTime() const { return m_sleepTime; }

	int getWaitTime() const { return m_waitTime; }

	int getConnectionNumber() const { return m_connectionNumber; }

	unsigned int getWorkerNumber() const { return m_workerNumber; }

    unsigned int getSleepTime() const { return m_sleepTime; }

	unsigned int getWaitTime() const { return m_waitTime; }

	unsigned int getConnectionNumber() const { return m_connectionNumber; }

	uint32_t getINotifyMask() const { return m_iNotifyMask; }



private:
@@ -64,16 +64,16 @@ private: 
	const std::string m_watchPath;



	//Worker thread number	

	const int m_workerNumber;

	const unsigned int m_workerNumber;



	//Event thread sleep time

	const int m_sleepTime;    

	const unsigned int m_sleepTime;    

    

	//Worker thread wait time

	const int m_waitTime;

	const unsigned int m_waitTime;



	//Number of connection per destination

	const int m_connectionNumber;

	const unsigned int m_connectionNumber;



	//INotify mask

	const uint32_t m_iNotifyMask;

src/ConnectionManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ ConnectionManager::ConnectionManager(Tango::DeviceImpl* deviceImpl_p, 
{

    DEBUG_STREAM << "ConnectionManager::ConnectionManager()" << endl;



	int connectionNumber = configuration_sp->getConnectionNumber();

	unsigned int connectionNumber = configuration_sp->getConnectionNumber();



	if(connectionNumber < 1)

		throw std::runtime_error("Connection number property must be greater than 0");
@@ -44,7 +44,7 @@ ConnectionManager::ConnectionManager(Tango::DeviceImpl* deviceImpl_p, 
		{

			PoolSP pool_sp( new soci::connection_pool(connectionNumber) );



			for(int i=0; i<connectionNumber; i++)

			for(unsigned int i=0; i<connectionNumber; i++)

			{

				std::stringstream connection;

				connection << " host=" << host;

src/EventThread.cpp

+3 −3
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ void EventThread::initThreadGroup() throw(std::runtime_error) 


	m_threadGroup_sp.reset(new boost::thread_group);



	int workerNumber = m_configuration_sp->getWorkerNumber();

	unsigned int workerNumber = m_configuration_sp->getWorkerNumber();



    //Create a worker thread and pass all arguments

	WorkerThread worker(m_fitsImporter_p, m_eventBuffer_sp, m_connectionManager_sp,
@@ -231,7 +231,7 @@ void EventThread::initThreadGroup() throw(std::runtime_error) 
            new boost::thread(&EventThread::eventLoop, this));			



		//Add to thread group worker threads	

		for(int i=0; i<workerNumber; i++)

		for(unsigned int i=0; i<workerNumber; i++)

			m_threadGroup_sp->add_thread(

                new boost::thread(&WorkerThread::workerLoop, worker));

	}
@@ -250,7 +250,7 @@ void EventThread::eventLoop() 
{

	DEBUG_STREAM << "EventThread::eventLoop() starting loop" << endl;

       

	int sleepTime = m_configuration_sp->getSleepTime();

	unsigned int sleepTime = m_configuration_sp->getSleepTime();

	boost::filesystem::path watchPath(m_configuration_sp->getWatchPath());

    

	while(true)

src/FitsImporter.h

+1 −8
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ class FitsImporter : public TANGO_BASE_CLASS 


/*----- PROTECTED REGION ID(FitsImporter::Data Members) ENABLED START -----*/

    

private:

//------------------------------------------------------------------------------

//  [Private] Class variables

//------------------------------------------------------------------------------
@@ -98,15 +97,9 @@ private: 
    //Max milli second of sleep time allowed

    static const unsigned long MAX_SLEEP_TIME = 10000;    

        

    //Min milli second of wait time allowed

    //static const unsigned long MIN_WAIT_TIME = 0;    

    

    //Max milli second of wait time allowed

    static const unsigned long MAX_WAIT_TIME = 10000; 



    //Min port number allowed value

    //static const unsigned long MIN_DMDB_PORT = 0;    

    

    //Max port number allowed value

    static const unsigned int MAX_DMDB_PORT = 65535;