Changeset c20f9f in git

Timestamp:

Aug 30, 2016, 3:26:43 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

c37f6e7ebb2fc206c5ea1e81fee94f2635bcf64c

Parents:

8f95fa5a16bb8841f4212fe2ecdf0604c8f45bf9

Message:

search for memory leaks in ssiLink.cc

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/links/ssiLink.cc (modified) (14 diffs)
• omalloc/omStats.c (modified) (1 diff)

Singular/iparith.cc

@@ -4618 +4618 @@
 static BOOLEAN jjMEMORY(leftv res, leftv v)
 {
+  // clean out "_":
+  sLastPrinted.CleanUp();
+  memset(&sLastPrinted,0,sizeof(sleftv));
+  // collect all info:
   omUpdateInfo();
   switch(((int)(long)v->Data()))

Singular/links/ssiLink.cc

@@ -333 +333 @@
 {
   ssiInfo *d=(ssiInfo*)l->data;
-  int Ll=lSize(dd);
+  int Ll=dd->nr;
   fprintf(d->f_write,"%d ",Ll+1);
   int i;
@@ -376 +376 @@
   l=s_readint(d->f_read);
   buf=(char*)omAlloc0(l+1);
-  int c =s_getc(d->f_read); /* skip ' '*/
-  int ll=s_readbytes(buf,l,d->f_read);
-  //if (ll!=l) printf("want %d, got %d bytes\n",l,ll);
+  int throwaway =s_getc(d->f_read); /* skip ' '*/
+  throwaway=s_readbytes(buf,l,d->f_read);
+  //if (throwaway!=l) printf("want %d, got %d bytes\n",l,throwaway);
   buf[l]='\0';
   return buf;
@@ -440 +440 @@
     cf=nFindCoeffByName(cf_name);
     if (cf==NULL)
-    { Werror("cannot find cf:%s",cf_name);return NULL;}
+    {
+      Werror("cannot find cf:%s",cf_name);
+      omFree(cf_name);
+      return NULL;
+    }
   }
   if (N!=0)
@@ -665 +669 @@
   int nr;
   nr=s_readint(d->f_read);
-  lists L=(lists)omAlloc(sizeof(*L));
+  lists L=(lists)omAlloc0Bin(slists_bin);
   L->Init(nr);
 
   int i;
   leftv v;
-  for(i=0;i<nr;i++)
+  for(i=0;i<=L->nr;i++)
   {
     v=ssiRead1(l);
@@ -717 +721 @@
 {
   ssiInfo *d=(ssiInfo*)l->data;
-  int throwaway;
-  throwaway=s_readint(d->f_read);
+  int throwaway=s_readint(d->f_read);
   char *name=ssiReadString(d);
   int tok;
@@ -732 +735 @@
     Werror("blackbox %s not found",name);
   }
+  omFree(name);
 }
 
@@ -748 +752 @@
   memcpy(res,tmp,sizeof(sleftv));
   memset(tmp,0,sizeof(sleftv));
-  omFreeSize(tmp,sizeof(sleftv));
+  omFreeBin(tmp,sleftv_bin);
   if (nr_of_attr>0)
   {
@@ -778 +782 @@
 
     SI_LINK_SET_OPEN_P(l, flag);
+    if(l->data!=NULL) omFreeSize(l->data,sizeof(ssiInfo));
     l->data=d;
     omFree(l->mode);
@@ -1237 +1242 @@
 {
   ssiInfo *d = (ssiInfo *)l->data;
-  leftv res=(leftv)omAlloc0(sizeof(sleftv));
+  leftv res=(leftv)omAlloc0Bin(sleftv_bin);
   int t=0;
   t=s_readint(d->f_read);
@@ -1267 +1272 @@
                ssiSetCurrRing(d->r);
              }
-             if (t==15) return ssiRead1(l);
+             if (t==15) // setring
+             {
+               omFreeBin(res,sleftv_bin);
+               return ssiRead1(l);
+             }
            }
            break;
@@ -1352 +1361 @@
                 si_opt_1=n98_o1;
                 si_opt_2=n98_o2;
+                omFreeBin(res,sleftv_bin);
                 return ssiRead1(l);
              }
-    case 99: ssiClose(l); m2_end(0);
+    case 99: omFreeBin(res,sleftv_bin); ssiClose(l); m2_end(0);
     case 0: if (s_iseof(d->f_read))
             {
@@ -1362 +1372 @@
             break;
     default: Werror("not implemented (t:%d)",t);
-             omFreeSize(res,sizeof(sleftv));
+             omFreeBin(res,sleftv_bin);
              res=NULL;
              break;
@@ -1376 +1386 @@
   return res;
 no_ring: WerrorS("no ring");
-  omFreeSize(res,sizeof(sleftv));
+  omFreeBin(res,sleftv_bin);
   return NULL;
 }
@@ -1785 +1795 @@
   sprintf(buf,"ssi:connect %s:%s",host,port);
   slInit(l, buf);
+  omFreeSize(buf,256);
   if (slOpen(l,SI_LINK_OPEN,NULL)) return 1;
   SI_LINK_SET_RW_OPEN_P(l);

omalloc/omStats.c

@@ -46 +46 @@
 #endif
 
-  om_Info.UsedBytes = om_Info.UsedBytesMalloc + om_Info.UsedBytesFromValloc;
+  om_Info.UsedBytes = om_Info.UsedBytesMalloc + om_Info.UsedBytesFromValloc - om_Info.InternalUsedBytesMalloc;
   om_Info.AvailBytes = om_Info.AvailBytesMalloc + om_Info.AvailBytesFromValloc;