free-malloc -> realloc

jmfriedt · Aug 18, 2019 · 3127c19 · 3127c19
1 parent 8e303e6
commit 3127c19
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/oscilloscope_impl.cc b/lib/oscilloscope_impl.cc
@@ -302,6 +302,12 @@ void oscilloscope_impl::set_duration(float duration)
  else
     _sample_size = 8192;
  printf("_sample_size=%d\n",_sample_size);
+ _data_buffer=(char*)realloc(_data_buffer,2*_sample_size+100);
+ _tab1=(float*)realloc(_tab1,_sample_size*sizeof(float));
+ _tab2=(float*)realloc(_tab2,_sample_size*sizeof(float));
+ _tab3=(float*)realloc(_tab3,_sample_size*sizeof(float));
+ _tab4=(float*)realloc(_tab4,_sample_size*sizeof(float));
+/*
  if (_data_buffer!=NULL)
    {free(_data_buffer);
     free(_tab1);
@@ -314,6 +320,7 @@ void oscilloscope_impl::set_duration(float duration)
  _tab2=(float*)malloc(_sample_size*sizeof(float));
  _tab3=(float*)malloc(_sample_size*sizeof(float));
  _tab4=(float*)malloc(_sample_size*sizeof(float));
+*/
  _duration=duration;
 }
 
@@ -359,6 +366,12 @@ void oscilloscope_impl::set_rate(float rate)
  else
     _sample_size = 8192;
  printf("_sample_size=%d\n",_sample_size);
+ _data_buffer=(char*)realloc(_data_buffer,2*_sample_size+100);
+ _tab1=(float*)realloc(_tab1,_sample_size*sizeof(float));
+ _tab2=(float*)realloc(_tab2,_sample_size*sizeof(float));
+ _tab3=(float*)realloc(_tab3,_sample_size*sizeof(float));
+ _tab4=(float*)realloc(_tab4,_sample_size*sizeof(float));
+/*
  if (_data_buffer!=NULL)
    {free(_data_buffer);
     free(_tab1);
@@ -371,6 +384,7 @@ void oscilloscope_impl::set_rate(float rate)
  _tab2=(float*)malloc(_sample_size*sizeof(float));
  _tab3=(float*)malloc(_sample_size*sizeof(float));
  _tab4=(float*)malloc(_sample_size*sizeof(float));
+*/
  _rate=rate;
 }
 

diff --git a/lib/oscilloscope_impl.h b/lib/oscilloscope_impl.h
@@ -49,7 +49,7 @@ namespace gr {
        int longueur,result;
 // #endif
        float _range,_duration,_rate;
-       float *_tab1,*_tab2,*_tab3,*_tab4;
+       float *_tab1=NULL,*_tab2=NULL,*_tab3=NULL,*_tab4=NULL;
        int _sample_size;
        char device_ip[16]; // IP @
        char *_data_buffer=NULL;