paulmataruso/openbts
1
0
Fork 0
mirror of https://github.com/RangeNetworks/openbts.git synced 2025-11-04 13:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transceiver52M: Deallocate high level resources on shutdown

Browse Source 
This primarily addresses the error case at initialization.
In the event that the transceiver fails to start, we should
be able cleanly shutdown and release while providing a useful
reason for exiting.

After the radio is started and threads launched, there
are no thread state variables or shutdown messaging between
threads, and the transceiver cannot be consistently
shutdown. This issue remains to be solved.

Signed-off-by: Thomas Tsou <tom@tsou.cc>

git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@6752 19bc5d8c-e614-43d4-8b26-e1612bc8e597
This commit is contained in:
Thomas Tsou
2013-10-17 06:19:23 +00:00
parent 8794ac38c7
commit a03aa57de4
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Transceiver52M/runTransceiver.cpp
View File

@@ -47,8 +47,6 @@
*/
#define SPS 4
using namespace std;
ConfigurationKeyMap getConfigurationKeys();
ConfigurationTable gConfig(CONFIGDB, 0, getConfigurationKeys());
@@ -56,8 +54,8 @@ volatile bool gbShutdown = false;
static void ctrlCHandler(int signo)
{
cout << "Received shutdown signal" << endl;;
gbShutdown = true;
std::cout << "Received shutdown signal" << std::endl;
gbShutdown = true;
}
/*
@@ -111,28 +109,25 @@ int testConfig(const char *filename)
int main(int argc, char *argv[])
{
int trxPort;
int trxPort, fail = 0;
std::string deviceArgs, logLevel, trxAddr;
RadioDevice *usrp = NULL;
RadioInterface *radio = NULL;
Transceiver *trx = NULL;
if (argc == 3)
{
deviceArgs = std::string(argv[2]);
}
else
{
deviceArgs = "";
if (signal(SIGINT, ctrlCHandler) == SIG_ERR) {
std::cerr << "Couldn't install signal handler for SIGINT" << std::endl;
return EXIT_FAILURE;
}
if ( signal( SIGINT, ctrlCHandler ) == SIG_ERR )
{
cerr << "Couldn't install signal handler for SIGINT" << endl;
exit(1);
}
if ( signal( SIGTERM, ctrlCHandler ) == SIG_ERR )
{
cerr << "Couldn't install signal handler for SIGTERM" << endl;
exit(1);
if (signal(SIGTERM, ctrlCHandler) == SIG_ERR) {
std::cerr << "Couldn't install signal handler for SIGTERM" << std::endl;
return EXIT_FAILURE;
}
// Configure logger.
@@ -148,14 +143,13 @@ int main(int argc, char *argv[])
srandom(time(NULL));
RadioDevice *usrp = RadioDevice::make(SPS);
usrp = RadioDevice::make(SPS);
int radioType = usrp->open(deviceArgs);
if (radioType < 0) {
LOG(ALERT) << "Transceiver exiting..." << std::endl;
return EXIT_FAILURE;
}
RadioInterface* radio;
switch (radioType) {
case RadioDevice::NORMAL:
radio = new RadioInterface(usrp, 3, SPS, false);
@@ -166,27 +160,38 @@ int main(int argc, char *argv[])
break;
default:
LOG(ALERT) << "Unsupported configuration";
return EXIT_FAILURE;
fail = 1;
goto shutdown;
}
if (!radio->init(radioType)) {
LOG(ALERT) << "Failed to initialize radio interface";
fail = 1;
goto shutdown;
}
Transceiver *trx = new Transceiver(trxPort, trxAddr.c_str(),
SPS, GSM::Time(3,0), radio);
trx = new Transceiver(trxPort, trxAddr.c_str(), SPS, GSM::Time(3,0), radio);
if (!trx->init()) {
LOG(ALERT) << "Failed to initialize transceiver";
fail = 1;
goto shutdown;
}
trx->receiveFIFO(radio->receiveFIFO());
trx->start();
while (!gbShutdown) {
while (!gbShutdown)
sleep(1);
}
cout << "Shutting down transceiver..." << endl;
shutdown:
std::cout << "Shutting down transceiver..." << std::endl;
delete trx;
delete radio;
delete usrp;
if (fail)
return EXIT_FAILURE;
return 0;
}
ConfigurationKeyMap getConfigurationKeys()