mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 20:20:35 +00:00
Code Issues Releases Wiki Activity

Merging

Browse Source
This commit is contained in:
Carles Fernandez 2017-07-25 16:28:56 +02:00
commit edd675ade9
9 changed files with 190 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
View File

@ -250,15 +250,28 @@ void galileo_e1_dll_pll_veml_tracking_cc::start_tracking()
galileo_e1_dll_pll_veml_tracking_cc::~galileo_e1_dll_pll_veml_tracking_cc() galileo_e1_dll_pll_veml_tracking_cc::~galileo_e1_dll_pll_veml_tracking_cc()
{
if (d_dump_file.is_open())
{
try
{ {
d_dump_file.close(); d_dump_file.close();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_correlator_outs); volk_gnsssdr_free(d_correlator_outs);
volk_gnsssdr_free(d_ca_code); volk_gnsssdr_free(d_ca_code);
delete[] d_Prompt_buffer; delete[] d_Prompt_buffer;
multicorrelator_cpu.free(); multicorrelator_cpu.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }

21
src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
View File

@ -243,16 +243,29 @@ void Galileo_E1_Tcp_Connector_Tracking_cc::start_tracking()
Galileo_E1_Tcp_Connector_Tracking_cc::~Galileo_E1_Tcp_Connector_Tracking_cc() Galileo_E1_Tcp_Connector_Tracking_cc::~Galileo_E1_Tcp_Connector_Tracking_cc()
{
if (d_dump_file.is_open())
{
try
{ {
d_dump_file.close(); d_dump_file.close();
}catch(const std::exception & ex)
delete[] d_Prompt_buffer; {
volk_gnsssdr_free(d_ca_code); LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_correlator_outs); volk_gnsssdr_free(d_correlator_outs);
volk_gnsssdr_free(d_ca_code);
delete[] d_Prompt_buffer;
d_tcp_com.close_tcp_connection(d_port); d_tcp_com.close_tcp_connection(d_port);
multicorrelator_cpu.free(); multicorrelator_cpu.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }

21
src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
View File

@ -212,21 +212,32 @@ Galileo_E5a_Dll_Pll_Tracking_cc::Galileo_E5a_Dll_Pll_Tracking_cc(
Galileo_E5a_Dll_Pll_Tracking_cc::~Galileo_E5a_Dll_Pll_Tracking_cc () Galileo_E5a_Dll_Pll_Tracking_cc::~Galileo_E5a_Dll_Pll_Tracking_cc ()
{
if (d_dump_file.is_open())
{
try
{ {
d_dump_file.close(); d_dump_file.close();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
delete[] d_codeI; delete[] d_codeI;
delete[] d_codeQ; delete[] d_codeQ;
delete[] d_Prompt_buffer; delete[] d_Prompt_buffer;
d_dump_file.close();
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_correlator_outs); volk_gnsssdr_free(d_correlator_outs);
volk_gnsssdr_free(d_Single_Prompt_data); volk_gnsssdr_free(d_Single_Prompt_data);
delete[] d_Prompt_buffer;
multicorrelator_cpu_Q.free(); multicorrelator_cpu_Q.free();
multicorrelator_cpu_I.free(); multicorrelator_cpu_I.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }

17
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
View File

@ -299,14 +299,27 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::start_tracking()
gps_l1_ca_dll_pll_c_aid_tracking_cc::~gps_l1_ca_dll_pll_c_aid_tracking_cc() gps_l1_ca_dll_pll_c_aid_tracking_cc::~gps_l1_ca_dll_pll_c_aid_tracking_cc()
{ {
d_dump_file.close();
if (d_dump_file.is_open())
{
try
{
d_dump_file.close();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_correlator_outs); volk_gnsssdr_free(d_correlator_outs);
volk_gnsssdr_free(d_ca_code); volk_gnsssdr_free(d_ca_code);
delete[] d_Prompt_buffer; delete[] d_Prompt_buffer;
multicorrelator_cpu.free(); multicorrelator_cpu.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }

17
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
View File

@ -301,16 +301,29 @@ void gps_l1_ca_dll_pll_c_aid_tracking_sc::start_tracking()
gps_l1_ca_dll_pll_c_aid_tracking_sc::~gps_l1_ca_dll_pll_c_aid_tracking_sc() gps_l1_ca_dll_pll_c_aid_tracking_sc::~gps_l1_ca_dll_pll_c_aid_tracking_sc()
{
if (d_dump_file.is_open())
{
try
{ {
d_dump_file.close(); d_dump_file.close();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_ca_code); volk_gnsssdr_free(d_ca_code);
volk_gnsssdr_free(d_ca_code_16sc); volk_gnsssdr_free(d_ca_code_16sc);
volk_gnsssdr_free(d_correlator_outs_16sc); volk_gnsssdr_free(d_correlator_outs_16sc);
delete[] d_Prompt_buffer; delete[] d_Prompt_buffer;
multicorrelator_cpu_16sc.free(); multicorrelator_cpu_16sc.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }

16
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
View File

@ -266,15 +266,27 @@ void Gps_L1_Ca_Dll_Pll_Tracking_cc::start_tracking()
} }
Gps_L1_Ca_Dll_Pll_Tracking_cc::~Gps_L1_Ca_Dll_Pll_Tracking_cc() Gps_L1_Ca_Dll_Pll_Tracking_cc::~Gps_L1_Ca_Dll_Pll_Tracking_cc()
{
if (d_dump_file.is_open())
{
try
{ {
d_dump_file.close(); d_dump_file.close();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_correlator_outs); volk_gnsssdr_free(d_correlator_outs);
volk_gnsssdr_free(d_ca_code); volk_gnsssdr_free(d_ca_code);
delete[] d_Prompt_buffer; delete[] d_Prompt_buffer;
multicorrelator_cpu.free(); multicorrelator_cpu.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }

17
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
View File

@ -273,14 +273,29 @@ void Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc::start_tracking()
Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc::~Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc() Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc::~Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc()
{ {
if (d_dump_file.is_open())
{
try
{
d_dump_file.close(); d_dump_file.close();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
cudaFreeHost(in_gpu); cudaFreeHost(in_gpu);
cudaFreeHost(d_correlator_outs); cudaFreeHost(d_correlator_outs);
cudaFreeHost(d_local_code_shift_chips); cudaFreeHost(d_local_code_shift_chips);
cudaFreeHost(d_ca_code); cudaFreeHost(d_ca_code);
multicorrelator_gpu->free_cuda();
delete[] d_Prompt_buffer; delete[] d_Prompt_buffer;
multicorrelator_gpu->free_cuda();
delete(multicorrelator_gpu); delete(multicorrelator_gpu);
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }

20
src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
View File

@ -275,16 +275,28 @@ void Gps_L1_Ca_Tcp_Connector_Tracking_cc::start_tracking()
Gps_L1_Ca_Tcp_Connector_Tracking_cc::~Gps_L1_Ca_Tcp_Connector_Tracking_cc() Gps_L1_Ca_Tcp_Connector_Tracking_cc::~Gps_L1_Ca_Tcp_Connector_Tracking_cc()
{
if (d_dump_file.is_open())
{
try
{ {
d_dump_file.close(); d_dump_file.close();
}catch(const std::exception & ex)
delete[] d_Prompt_buffer; {
volk_gnsssdr_free(d_ca_code); LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_correlator_outs); volk_gnsssdr_free(d_correlator_outs);
volk_gnsssdr_free(d_ca_code);
d_tcp_com.close_tcp_connection(d_port); d_tcp_com.close_tcp_connection(d_port);
delete[] d_Prompt_buffer;
multicorrelator_cpu.free(); multicorrelator_cpu.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }
int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work (int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)), int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work (int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)),

17
src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
View File

@ -271,14 +271,27 @@ void gps_l2_m_dll_pll_tracking_cc::start_tracking()
gps_l2_m_dll_pll_tracking_cc::~gps_l2_m_dll_pll_tracking_cc() gps_l2_m_dll_pll_tracking_cc::~gps_l2_m_dll_pll_tracking_cc()
{ {
d_dump_file.close();
if (d_dump_file.is_open())
{
try
{
d_dump_file.close();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
}
try{
volk_gnsssdr_free(d_local_code_shift_chips); volk_gnsssdr_free(d_local_code_shift_chips);
volk_gnsssdr_free(d_correlator_outs); volk_gnsssdr_free(d_correlator_outs);
volk_gnsssdr_free(d_ca_code); volk_gnsssdr_free(d_ca_code);
delete[] d_Prompt_buffer; delete[] d_Prompt_buffer;
multicorrelator_cpu.free(); multicorrelator_cpu.free();
}catch(const std::exception & ex)
{
LOG(WARNING)<<"Exception in destructor "<<ex.what();
}
} }