Changeset 1857 in Sophya

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)

Location:

trunk/SophyaPI/PIGcont

Files:

• Makefile (modified) (5 diffs)
• gp_alloc.c (modified) (2 diffs)
• gp_contour.c (modified) (10 diffs)
• gp_contour.h (modified) (2 diffs)
• gpc_set.c (deleted)
• gpc_set.h (deleted)
• objlist.list (modified) (1 diff)
• picntools.cc (modified) (5 diffs)
• pigncont.cc (modified) (4 diffs)
• pigncont.h (modified) (1 diff)

trunk/SophyaPI/PIGcont/Makefile

@@ -4 +4 @@
  
 all: $(LIB)libPIGcont.a
-$(LIB)libPIGcont.a : $(OBJ)gp_alloc.o $(OBJ)gp_axis.o $(OBJ)gp_contour.o $(OBJ)gpc_set.o $(OBJ)picntools.o $(OBJ)pigncont.o
+$(LIB)libPIGcont.a : $(OBJ)gp_alloc.o $(OBJ)gp_axis.o $(OBJ)gp_contour.o  $(OBJ)picntools.o $(OBJ)pigncont.o
         $(AR) $(ARFLAGS)  $@ $($(ARARGS)) 
 ifeq ($(CXX),cxx)
@@ -11 +11 @@
  
 clean:
-        rm -f $(OBJ)gp_alloc.o $(OBJ)gp_axis.o $(OBJ)gp_contour.o $(OBJ)gpc_set.o $(OBJ)picntools.o $(OBJ)pigncont.o
+        rm -f $(OBJ)gp_alloc.o $(OBJ)gp_axis.o $(OBJ)gp_contour.o $(OBJ)picntools.o $(OBJ)pigncont.o
 ifeq ($(CXX),cxx)
         cd $(REPM); rm -f *.o
@@ -20 +20 @@
 $(OBJ)gp_contour.o: gp_contour.c gp_contour.h gp_types.h gpc_misc.h \
  gp_dynarray.h gp_graph3d.h gp_alloc.h gp_axis.h
-$(OBJ)gpc_set.o: gpc_set.c gpc_set.h gp_contour.h gp_types.h gpc_misc.h \
- gp_dynarray.h gp_graph3d.h
 $(OBJ)picntools.o: picntools.cc $(INC)machdefs.h \
  picntools.h $(INC)pisysdep.h \
@@ -88 +86 @@
  $(INC)ntuple.h \
  $(INC)ntupintf.h gp_contour.h gp_types.h \
- gpc_misc.h gp_dynarray.h gp_graph3d.h gp_alloc.h gpc_set.h
+ gpc_misc.h gp_dynarray.h gp_graph3d.h gp_alloc.h 
 $(OBJ)pigncont.o: pigncont.cc $(INC)machdefs.h \
  $(INC)histos.h \
@@ -167 +165 @@
  $(INC)periodic.h \
  $(INC)piscdrawwdg.h gp_contour.h gp_types.h \
- gpc_misc.h gp_dynarray.h gp_graph3d.h gp_alloc.h gpc_set.h
+ gpc_misc.h gp_dynarray.h gp_graph3d.h gp_alloc.h 

trunk/SophyaPI/PIGcont/gp_alloc.c

@@ -55 +55 @@
 
 void contour_free(struct gnuplot_contours *ptr){
-  char *c;
+  //char *c;
   struct coordinate *coords;
   struct gnuplot_contours *old;
@@ -61 +61 @@
  
   cur = ptr; 
+  //printf("\n contour_free  %x \n",cur);
   while(cur){
+    /*printf(" contour_free  %x \n",cur);*/
     old = cur;
-    cur = cur->next;
-    c=old->label;
-    coords = old->coords;
-    if(c){free(c); c=NULL;}
+    cur = cur->next;    
+    coords = old->coords;    
     if(coords){free(coords) ; coords = NULL;}
     free(old);    
-  }
+    old=NULL;
+  } 
+  
 
 }

trunk/SophyaPI/PIGcont/gp_contour.c

@@ -41 +41 @@
  *        Hans-Martin Keller, 1995,1997 (hkeller@gwdg.de)
  *
+ *   Quelques modifs (adaptation pour SOPHYA/PEIDA) O. PErdereau 11/2001
  */
 
@@ -47 +48 @@
 #include "gp_alloc.h"
 #include "gp_axis.h"
+
+#include <sys/time.h>
+#include <sys/resource.h>
+
 /*  #include "setshow.h" */
 
@@ -52 +57 @@
 
 char contour_format[32] = "%8.3g";      /* format for contour key entries */
-t_contour_kind contour_kind = CONTOUR_KIND_LINEAR;
-t_contour_levels_kind contour_levels_kind = LEVELS_AUTO;
-int contour_levels = DEFAULT_CONTOUR_LEVELS;
-int contour_order = DEFAULT_CONTOUR_ORDER;
-int contour_pts = DEFAULT_NUM_APPROX_PTS;
+static t_contour_kind contour_kind = CONTOUR_KIND_LINEAR;
+static t_contour_levels_kind contour_levels_kind = LEVELS_AUTO;
+static int contour_levels = DEFAULT_CONTOUR_LEVELS;
+static int contour_order = DEFAULT_CONTOUR_ORDER;
+static int contour_pts = DEFAULT_NUM_APPROX_PTS;
 
 dynarray dyn_contour_levels_list;/* storage for z levels to draw contours at */
@@ -70 +75 @@
 
 /* Valeur de zero - Reza 21/12/2001 - Pourquoi zero = 0. ??? */
-static double zero = 0.;
+        double zero = 0.;
 
 /* FIXME HBB 2000052: yet another local copy of 'epsilon'. Why? */
@@ -206 +211 @@
 struct iso_curve *iso_lines;
 {
+    struct rusage r_usage;
+    int rcus;
+ 
     int i;
     /*OP    int num_of_z_levels;*/      /* # Z contour levels. */
@@ -217 +225 @@
 
     contour_list = NULL;
-
+    /******* DEBUG ********
+    rcus = getrusage( RUSAGE_SELF , &r_usage);
+    if(rcus==0) 
+      printf("contour[1] / rusage -> %ld , %ld , %ld \n",  r_usage.ru_maxrss , r_usage.ru_ixrss , r_usage.ru_ixrss);
+    else
+      perror("contour/1er appel");
+    *************/
     /* 
      * Calculate min/max values :
@@ -224 +238 @@
                  &x_min, &y_min, &z_min, &x_max, &y_max, &z_max);
 
+
     dz = fabs(z_max - z_min);
     /* 
@@ -232 +247 @@
     gen_triangle(num_isolines, iso_lines, &p_polys, &p_edges);
     crnt_cntr_pt_index = 0;
+
+
     /*AJOUT OP */
     if (contour_levels_kind == LEVELS_NUM) {
@@ -279 +296 @@
     /* Free all contouring related temporary data. */ 
     while (p_polys) {
+        
         p_poly = p_polys->next;
         free(p_polys);
         p_polys = p_poly; 
     }
-    while (p_edges) {
+
+
+    while (p_edges) {        
         p_edge = p_edges->next;
         free(p_edges);
         p_edges = p_edge;
     }
+    /*********DEBUG 
+    rcus = getrusage( RUSAGE_SELF , &r_usage);
+    if(rcus==0) 
+      printf("contour[5] / rusage -> %ld , %ld , %ld \n",  r_usage.ru_maxrss , r_usage.ru_ixrss , r_usage.ru_ixrss);
+    else
+      perror("contour / 5eme appel");
+    rcus = getrusage( RUSAGE_SELF , &r_usage);
+    ********/
 
     return contour_list;
@@ -1534 +1562 @@
     }
 }
+
+
+/* setting et getting de variables */
+/*        OP 01/2002               */
+
+void set_contour_kind(t_contour_kind in){
+  contour_kind = in;
+}
+
+t_contour_kind get_contour_kind(){
+  return (contour_kind);
+}
+
+void set_contour_levels_kind(t_contour_levels_kind in){
+ contour_levels_kind = in;
+
+}
+
+t_contour_levels_kind get_contour_levels_kind(){
+
+  return(contour_levels_kind);
+}
+
+void set_contour_levels(int num){
+  contour_levels = num;
+}
+
+int get_contour_levels(){
+  return(contour_levels);
+}
+void set_contour_levels_list(double *vec){
+
+  contour_levels_list=vec;
+}
+
+/*******
+void set_contour_levels_list(double *vec,int sz){
+  int i;
+  printf(" <set_contour_levels_list> sz %d \n",sz);
+  contour_levels_list = (double *)  malloc(sz*sizeof(double));
+  for (i=0 ; i<sz ; i++){
+    printf(" <set_contour_levels_list> i %d vec %g\n",i,vec[i]);
+    contour_levels_list[i] = vec[i];
+    
+  }
+}
+void free_contour_levels_list(){
+  if(contour_levels_list != NULL){
+    free(contour_levels_list);
+    contour_levels_list = NULL;
+  }
+}
+*****/
+double * get_contour_levels_list(){
+
+return(contour_levels_list);
+}
+ 

trunk/SophyaPI/PIGcont/gp_contour.h

@@ -77 +77 @@
 
 extern char contour_format[];
-extern t_contour_kind contour_kind;
-extern t_contour_levels_kind contour_levels_kind;
-extern int contour_levels;
-extern int contour_order;
-extern int contour_pts;
+/***********************************************/
+/* VARIABLES MAINTENANT STATIQUES - OP 01/2002 */
+/*extern t_contour_kind contour_kind;*/
+/*extern t_contour_levels_kind contour_levels_kind;*/
+/*extern int contour_levels;*/
+/*extern int contour_order;*/
+/*extern int contour_pts;*/
+/***********************************************/
 
 /* storage for z levels to draw contours at */
@@ -94 +97 @@
 int Get_Num_Of_Z_Levels();
 
+/* seting de variables OP 01/2002 */
+
+void set_contour_kind(t_contour_kind);
+t_contour_kind get_contour_kind();
+
+void set_contour_levels_kind(t_contour_levels_kind);
+t_contour_levels_kind get_contour_levels_kind();
+
+void set_contour_levels(int);
+int get_contour_levels();
+void set_contour_levels_list(double *);
+double * get_contour_levels_list();
+
+
+
 #endif /* GNUPLOT_CONTOUR_H */

trunk/SophyaPI/PIGcont/objlist.list

@@ -2 +2 @@
 gp_axis.o
 gp_contour.o
-gpc_set.o
 picntools.o
 pigncont.o

trunk/SophyaPI/PIGcont/picntools.cc

@@ -14 +14 @@
 //++
 // Class        PICnTools
-// Lib          PI
-// include      pidrwtools.h
+// Lib          PIGcont
+// include      pidcntools.h
 //
 //      Classe de fenêtre de dialogue permettant de modifier interactivement
-//      Les attributs graphique des "Drawer" attachés aux "PIBaseWdg".
+//      les attributs graphique des "PIContourDrawer" ainsi que 
+//      les parametres de calcul des contours. 
 //--
 // Links        Parents
@@ -27 +28 @@
 // PIDrawer
 // PIBaseWdg
+// PIContourDrawer
 //--
 //++
@@ -41 +43 @@
 // void  ShowPICnTools()        
 //      Méthode statique permettant l'affichage de la fenêtre de contrôle des
-//      attributs graphiques des "Drawer". L'instance de la classe
-//       "PICnTools" est créée si nécessaire.
+//      attributs graphiques des "PIContourDrawer". L'instance de la classe
+//      "PICnTools" est créée si nécessaire. Un seul "PIContourDrawer" est gere.      
 // void  HidePICnTools() 
-//      Désacative (cache) la fenêtre "PICnTools" (méthode statique).
+//      Désactive (cache) la fenêtre "PICnTools" (méthode statique).
 // void  SetCurrentBaseWdg(PIBaseWdgGen* cbw)
-//      Méthode statique permettant de sélectionner le "PIBaseWdg" courant.
+//      Méthode statique permettant de s'attacher au "PIBaseWdg" courant.
 // PIBaseWdgGen*  GetCurrentBaseWdg()
 //      Retourne le "PIBaseWdg" courant (méthode statique).
+// void  SetCurrentCnDrw( PIContourDrawer* pcd) 
+//      Méthode statique permettant de s'attacher au "PIContourDrawer".
+// PIBaseWdgGen*  :GetCurrentCnDrw()
+//      Retourne le "PIContourDrawer" (méthode statique).
 //--
 
@@ -375 +381 @@
 cpx += bsx*1.2+spx;
 
-/******
-mButcf[3] = new PIButton(this, "Calc", 3200, bsx*0.8, bsyo, cpx, cpy);
-mButcf[3]->ActivatePress(true);
-mButcf[3]->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
-*****/ 
 cpx += bsx*0.8+spx; 
 
@@ -453 +454 @@
 return;
 }
-
+// Liste des differentes options de calcul 
 static t_contour_kind crbe_algo[3]={CONTOUR_KIND_LINEAR,CONTOUR_KIND_CUBIC_SPL,CONTOUR_KIND_BSPLINE};
 static t_contour_levels_kind lev_kind[4]={LEVELS_AUTO,LEVELS_NUM,LEVELS_INCREMENTAL,LEVELS_DISCRETE};

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();
-
+ 
  
 }

trunk/SophyaPI/PIGcont/pigncont.h

@@ -15 +15 @@
 #include "gp_contour.h"
 #include "gp_alloc.h"
-#include "gpc_set.h"
+  //#include "gpc_set.h"
 }