Changeset aad4e14 in git

Timestamp:

Nov 11, 2010, 12:18:07 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

24fd7045c041f0c1ce23de9358433e0667a8228d

Parents:

a80025e8d85c97a2cc2a6b86ef219a392df4f2b5

Message:

memory management and SI_DONT_HAVE_GLOBAL_VARS


git-svn-id: file:///usr/local/Singular/svn/trunk@13633 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• interpolation.cc (modified) (12 diffs)
• misc_ip.cc (modified) (1 diff)

Singular/interpolation.cc

@@ -311 +311 @@
      temp=(mon_list_entry*)omAlloc0(sizeof(mon_list_entry));
      (*temp).next=curptr;
-     (*temp).mon=(exponent*)omAlloc0(sizeof(exponent)*variables);
+     (*temp).mon=(exponent*)omAlloc(sizeof(exponent)*variables);
      memcpy(temp->mon,mon,sizeof(exponent)*variables);
      if (prevptr==NULL) return temp;
@@ -333 +333 @@
      mono_type m;
      m=(exponent*)omAlloc0(sizeof(exponent)*variables);
-     int i;
-     for (i=0;i<variables;i++) m[i]=0;
      return m;
 }
@@ -341 +339 @@
 {
      int i,j,k;
-     points=(coordinates*)omAlloc0(sizeof(coordinates)*n_points);
+     points=(coordinates*)omAlloc(sizeof(coordinates)*n_points);
      for (i=0;i<n_points;i++)
      {
-         points[i]=(coordinate_products*)omAlloc0(sizeof(coordinate_products)*variables);
+         points[i]=(coordinate_products*)omAlloc(sizeof(coordinate_products)*variables);
          for (j=0;j<variables;j++) points[i][j]=(modp_number*)omAlloc0(sizeof(modp_number)*(max_coord));
      }
      condition_list=(condition_type*)omAlloc0(sizeof(condition_type)*final_base_dim);
      for (i=0;i<final_base_dim;i++) condition_list[i].mon=(exponent*)omAlloc0(sizeof(exponent)*variables);
-     modp_points=(modp_coordinates*)omAlloc0(sizeof(modp_coordinates)*n_points);
+     modp_points=(modp_coordinates*)omAlloc(sizeof(modp_coordinates)*n_points);
      for (i=0;i<n_points;i++) modp_points[i]=(modp_number*)omAlloc0(sizeof(modp_number)*variables);
      if (!only_modp)
@@ -356 +354 @@
         for (i=0;i<n_points;i++)
         {
-            q_points[i]=(mpq_t*)omAlloc0(sizeof(mpq_t)*variables);
+            q_points[i]=(mpq_t*)omAlloc(sizeof(mpq_t)*variables);
             for (j=0;j<variables;j++) mpq_init(q_points[i][j]);
         }
@@ -362 +360 @@
         for (i=0;i<n_points;i++)
         {
-            int_points[i]=(mpz_t*)omAlloc0(sizeof(mpz_t)*variables);
+            int_points[i]=(mpz_t*)omAlloc(sizeof(mpz_t)*variables);
             for (j=0;j<variables;j++) mpz_init(int_points[i][j]);
         }
      }
-     coord_exist=(coord_exist_table*)omAlloc0(sizeof(coord_exist_table)*n_points);
+     coord_exist=(coord_exist_table*)omAlloc(sizeof(coord_exist_table)*n_points);
      for (i=0;i<n_points;i++)
      {
          coord_exist[i]=(bool*)omAlloc0(sizeof(bool)*variables);
-         for (j=0;j<variables;j++) coord_exist[i][j]=false;
-     }
-     generic_column_name=(mono_type*)omAlloc0(sizeof(mono_type)*final_base_dim);
+     }
+     generic_column_name=(mono_type*)omAlloc(sizeof(mono_type)*final_base_dim);
      for (i=0;i<final_base_dim;i++) generic_column_name[i]=ZeroMonomial ();
      good_primes=0;
@@ -379 +376 @@
      if (!only_modp)
      {
-        polycoef=(mpz_t*)omAlloc0(sizeof(mpz_t)*(final_base_dim+1));
-        polyexp=(mono_type*)omAlloc0(sizeof(mono_type)*(final_base_dim+1));
+        polycoef=(mpz_t*)omAlloc(sizeof(mpz_t)*(final_base_dim+1));
+        polyexp=(mono_type*)omAlloc(sizeof(mono_type)*(final_base_dim+1));
         for (i=0;i<=final_base_dim;i++)
         {
@@ -406 +403 @@
      my_row=(modp_number*)omAlloc0(sizeof(modp_number)*final_base_dim);
      my_solve_row=(modp_number*)omAlloc0(sizeof(modp_number)*final_base_dim);
-     column_name=(mono_type*)omAlloc0(sizeof(mono_type)*final_base_dim);
+     column_name=(mono_type*)omAlloc(sizeof(mono_type)*final_base_dim);
      for (i=0;i<final_base_dim;i++) column_name[i]=ZeroMonomial ();
      last_solve_column=0;
@@ -415 +412 @@
 
 // produces table of modp inverts by finding a generator of (Z_myp*,*)
-     gen_table=(modp_number*)omAlloc0(sizeof(modp_number)*myp);
+     gen_table=(modp_number*)omAlloc(sizeof(modp_number)*myp);
      gen_table[1]=1;
      for (pos_gen=2;pos_gen<myp;pos_gen++)
@@ -537 +534 @@
     int j,k;
     mono_type mn;
-    mn=(exponent*)omAlloc0(sizeof(exponent)*variables);
+    mn=(exponent*)omAlloc(sizeof(exponent)*variables);
     memcpy(mn,mon,sizeof(exponent)*variables);
     for (k=0;k<variables;k++)
@@ -562 +559 @@
     int j,k;
     mono_type mn;
-    mn=(exponent*)omAlloc0(sizeof(exponent)*variables);
+    mn=(exponent*)omAlloc(sizeof(exponent)*variables);
     memcpy(mn,mon,sizeof(exponent)*variables);
     for (k=0;k<variables;k++)
@@ -992 +989 @@
      }
      temp=(generator_entry*)omAlloc0(sizeof(generator_entry));
-     if (prev_ptr==NULL) cur_result->generator=temp; else prev_ptr->next=temp;
+     if (prev_ptr==NULL) cur_result->generator=temp;
+     else prev_ptr->next=temp;
      temp->next=NULL;
      temp->coef=(modp_number*)omAlloc0(sizeof(modp_number)*final_base_dim);
@@ -1375 +1373 @@
      if (prev==NULL) gen_list=temp; else prev->next=temp;
      temp->next=NULL;
-     temp->polycoef=(mpz_t*)omAlloc0(sizeof(mpz_t)*(final_base_dim+1));
-     temp->polyexp=(mono_type*)omAlloc0(sizeof(mono_type)*(final_base_dim+1));
+     temp->polycoef=(mpz_t*)omAlloc(sizeof(mpz_t)*(final_base_dim+1));
+     temp->polyexp=(mono_type*)omAlloc(sizeof(mono_type)*(final_base_dim+1));
      for (i=0;i<=final_base_dim;i++)
      {

Singular/misc_ip.cc

@@ -381 +381 @@
 
 #ifdef HAVE_FACTORY
+#define SI_DONT_HAVE_GLOBAL_VARS
 #include <factory/factory.h>
 // libfac: