Changeset 1857 in Sophya for trunk/SophyaPI/PIGcont/pigncont.cc

Timestamp:

Jan 14, 2002, 2:42:24 PM (24 years ago)

Author:

perderos

Message:

1) correction de fuites de memoire
2) integration de glpc_set.* ds gp_contour (variables en commun)

File:

• trunk/SophyaPI/PIGcont/pigncont.cc (modified) (4 diffs)

trunk/SophyaPI/PIGcont/pigncont.cc

@@ -12 +12 @@
 #include "picntools.h"
 #include "pigncont.h"
+
+#include <sys/time.h>
+#include <sys/resource.h>
 
 /*  A virer ?? Reza 21/12/2001 
@@ -369 +372 @@
  
  struct gnuplot_contours *cntcur = _contours;
+ /*****
  struct gnuplot_contours *cntold;
 
- while(cntcur) {
+ while(cntcur) { 
    //cout << " ~GNUPlotContour() : destruction de _contours" << _contours <<endl; 
-   cntold = cntcur;
-   cntcur = cntold->next;
-   gp_free(cntold);
-   cntold=NULL;
- } 
- 
+   cntold = cntcur; 
+   cntcur = cntold->next; 
+   gp_free(cntold); 
+   cntold=NULL; 
+ }  
+ *******/
+ contour_free(cntcur);
  _contours = NULL;
 
@@ -390 +395 @@
 
 void GNUPlotContour::CalcContour(){
- cout << " GNUPlotContour::CalcContour(): determination des contours "<<endl;
+  //cout << " GNUPlotContour::CalcContour(): determination des contours "<<endl;
+
+ struct rusage r_usage;
+ int rcus;
 
  set_contour_kind(Contour_kind);
@@ -416 +424 @@
   }
 
+ 
+ rcus = getrusage( RUSAGE_SELF , &r_usage);
+
+ //if(rcus==0) 
+ //  cout << " rusage -> "<<  r_usage.ru_maxrss <<" , "<< r_usage.ru_ixrss <<" , "<< r_usage.ru_ixrss <<endl;
+ //else
+ //  perror("1er appel");
+
  if(_contours) {
-   //cout << " GNUPlotContour::CalcContour(): destruction des contours "<<endl;
+   cout << " GNUPlotContour::CalcContour(): destruction des contours "<<_contours<<endl;
    struct gnuplot_contours *cntcur = _contours;
-   struct gnuplot_contours *cntold;
-   while(cntcur) {
-     cntold = cntcur;
-     cntcur = cntold->next;
-     gp_free(cntold);
-   }
+   /******
+   struct gnuplot_contours *cntold; 
+   while(cntcur) { 
+   cout << " GNUPlotContour::CalcContour(): destruction des contours "<< cntcur<<endl; 
+     cntold = cntcur; 
+     cntcur = cntold->next; 
+     gp_free(cntold); 
+     cntold = NULL; 
+   } 
+   ******/
+   contour_free(cntcur);
    _contours = NULL;
    
  }
 
-   
- 
- //struct gnuplot_contours *cntcur;
+ //struct gnuplot_contours *cntcur; 
  //struct gnuplot_contours *cntold;
  
+
+ //rcus = getrusage( RUSAGE_SELF , &r_usage);
+ //if(rcus==0) 
+ //  cout << " rusage -> "<< r_usage.ru_maxrss <<" , "<< r_usage.ru_ixrss <<" , "<< r_usage.ru_ixrss <<endl;
+ //else
+ //  perror("2d appel");
+
+
  _contours = contour (_nx,iso1);
+ 
+
+ //rcus = getrusage( RUSAGE_SELF , &r_usage);
+ //if(rcus==0) 
+ //  cout << " rusage -> "<<  r_usage.ru_maxrss <<" , "<< r_usage.ru_ixrss <<" , "<< r_usage.ru_ixrss <<endl;
+ //else
+ //  perror("3ieme appel");
+
  //free_contour_levels_list();
-
+ 
  
 }