Changeset 7782

Timestamp:

Jun 30, 2006, 7:17:36 PM (20 years ago)

Author:

eugene

Message:

fixes..

Location:

trunk/Ohana/src

Files:

• libdvo/src/skyregion_gsc.c (modified) (1 diff)
• libohana/src/ohana_allocate.c (modified) (5 diffs)

trunk/Ohana/src/libdvo/src/skyregion_gsc.c

@@ -3 +3 @@
 # define NDIV 4
 
-static int DecLines[] = {593, 584, 551, 530, 522, 465, 406, 362, 280, 198, 123, 24, 0,
+static int DecLines[] = {593, 584, 551, 530, 522, 465, 406, 362, 280, 198, 123, 25, 0,
                          597, 578, 574, 577, 534, 499, 442, 376, 294, 212, 144, 48, 0};
 

trunk/Ohana/src/libohana/src/ohana_allocate.c

@@ -39 +39 @@
 } Memlist;
 
+// XXX consider fixing the memory tracking model (list?)
+// static long *memsort;
+// static long *memhash;
 static Memlist *memlist = NULL;
 int Nmemlist = 0;
@@ -48 +51 @@
   NMEMLIST = 1000;
   OHANA_ALLOCATE (memlist, Memlist, NMEMLIST);
+  // OHANA_ALLOCATE (memsort, long, NMEMLIST);
+  // OHANA_ALLOCATE (memhash, long, NMEMLIST);
   NMEMBYTE = sizeof(size_t);
 }
@@ -86 +91 @@
   memlist[Nmemlist].size = size;
   memlist[Nmemlist].state = STATE_ALLOC;
+
+  // before each free, we sort this pair to speed up searching
+  // memsort[Nmemlist] = ptr;
+  // memhash[Nmemlist] = Nmemlist;
+
   Nmemlist ++;
   if (Nmemlist == NMEMLIST) {
@@ -143 +153 @@
 }
 
+// this is very slow.  should we speed this up by indexing on the ptr?
 void ohana_free (char *file, int line, void *in) {
 
@@ -199 +210 @@
 
   header = FALSE;
+  fprintf (stderr, "checking %d memory blocks\n", Nmemlist);
   for (i = 0; i < Nmemlist; i++) {
     if (memlist[i].state == STATE_EXTERNAL) continue;