Changeset 32608

Timestamp:

Nov 3, 2011, 7:51:29 AM (15 years ago)

Author:

eugene

Message:

build error from task_nice; chasing memory corruption in ringflux

Location:

branches/eam_branches/ipp-20110906/Ohana/src

Files:

• libohana/include/ohana.h (modified) (1 diff)
• libohana/src/ohana_allocate.c (modified) (1 diff)
• opihi/cmd.astro/ringflux.c (modified) (1 diff)
• opihi/cmd.data/vstats.c (modified) (1 diff)
• opihi/pantasks/init_server.c (modified) (1 diff)

branches/eam_branches/ipp-20110906/Ohana/src/libohana/include/ohana.h

@@ -20 +20 @@
 
 // comment this out to avoid the internal Ohana memory management code
-// # define OHANA_MEMORY
+# define OHANA_MEMORY
 
 // XXX I was including these before, but RHL claims they are not needed

branches/eam_branches/ipp-20110906/Ohana/src/libohana/src/ohana_allocate.c

@@ -112 +112 @@
   // memblock of supplied pointer
   old = (Memblock *) in - 1;
+
+  if (old->startblock != OHANA_MEMMAGIC) ohana_memabort ("corrupt memory (%s, %d, %s)\n", file, line, func);
+  if (old->endblock != OHANA_MEMMAGIC) ohana_memabort ("corrupt memory (%s, %d, %s)\n", file, line, func);
 
   Nelem = MAX (1, Nelem);

branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.astro/ringflux.c

@@ -62 +62 @@
       }
       if (Nvec >= vec[0].Nelements - 8) {
+          // counting error here
         ResetVector (vec, OPIHI_FLT, vec[0].Nelements + 64);
       }

branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.data/vstats.c

@@ -208 +208 @@
 skip:
   FREE(mask);
+  if (mask) mask = NULL;
 
   if (!Quiet) {

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/init_server.c

@@ -4 +4 @@
 int task            PROTO((int, char **));
 int task_host       PROTO((int, char **));
+int task_nice       PROTO((int, char **));
 int task_nmax       PROTO((int, char **));
 int task_npending   PROTO((int, char **));