Changeset 41154 for trunk

Timestamp:

Nov 27, 2019, 5:29:35 AM (7 years ago)

Author:

eugene

Message:

added 2 new swap functions; added memory dump options

Location:

trunk/Ohana/src/libohana

Files:

• include/ohana_allocate.h (modified) (1 diff)
• include/ohana_sort.h (modified) (1 diff)
• src/ohana_allocate.c (modified) (4 diffs)
• src/sorts.c (modified) (1 diff)

trunk/Ohana/src/libohana/include/ohana_allocate.h

@@ -44 +44 @@
 void ohana_memcheck_block_func (const char *myFile, int myLine, const char *myFunc, void *in);
 void  real_free (void *in);
+
+void ohana_memdump_strings_file (FILE *f, int VERBOSE);
+void ohana_memdump_set_maxlines (int N);
 
 # define ohana_memcheck(X) ohana_memcheck_func (__FILE__, __LINE__, __func__, X)

trunk/Ohana/src/libohana/include/ohana_sort.h

@@ -83 +83 @@
 void isortfour (int *X, int *Y, int *Z, int *W, int N);
 
+void dsort_indexonly (double *X, off_t *S, off_t N);
+void dsort_int_indexonly (double *X, int *S, int N);
+
 #endif

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

@@ -45 +45 @@
 
 static pthread_mutex_t memBlockListMutex = PTHREAD_MUTEX_INITIALIZER;
+
+static int NblockMaxDump = 100;
 
 void ohana_meminit () {
@@ -435 +437 @@
         fprintf (stderr, "memory corruption\n");
       }
-      if (Nbad < 100) {
+      if (Nbad < NblockMaxDump) {
         fprintf (stderr, "  file: %s, line: %d, func: %s\n", thisBlock->file, thisBlock->line, thisBlock->func);
       }
@@ -613 +615 @@
     Nbytes += thisBlock->size;
 
-    if (Ntotal < 100) {
+    if (Ntotal < NblockMaxDump) {
       if (good) {
         fprintf (f, "  %zd  %zd  %zd  GOOD  %s %d, func: %s\n", Ntotal, thisBlock->size, Nbytes, thisBlock->file, thisBlock->line, thisBlock->func);
@@ -677 +679 @@
   return memstats;
 }
+
+void ohana_memdump_strings_file (FILE *f, int VERBOSE) {
+
+  if (!lastBlock) {
+    if (VERBOSE) fprintf (f, "no memory allocated\n");
+    return;
+  }
+
+  OhanaMemblock *thisBlock = lastBlock;
+
+  size_t Ntotal = 0;
+  size_t Nbytes = 0;
+  size_t Nstring = 0;
+
+  fprintf (f, "    entry |    bytes | cumulative : line : string\n");
+
+  while (thisBlock) {
+
+    // pointer to the start of the user memory
+    char *ptr = (char *)(thisBlock + 1);
+
+    Ntotal ++;
+    Nbytes += thisBlock->size;
+
+    int N = strlen(thisBlock->file);
+    if (N > 22) {
+      int found = !strcmp("libohana/src/string.c", &thisBlock->file[N - 21]);
+      if (found) {
+        if (Nstring < NblockMaxDump) {
+          fprintf (f, " %8zd | %8zd | %10zd : %4d : %s\n", Ntotal, thisBlock->size, Nbytes, thisBlock->line, ptr);
+        }
+        Nstring ++;
+      }
+      thisBlock = thisBlock->prevBlock;
+    }
+  }
+
+  if (Nstring || VERBOSE) {
+    fprintf (f, "%zd strings allocated\n", Nstring);
+  }
+
+  return;
+}
+
+void ohana_memdump_set_maxlines (int N) {
+  NblockMaxDump = N;
+}

trunk/Ohana/src/libohana/src/sorts.c

@@ -196 +196 @@
 }
 
+/* sort the index of a vector (vector stays unsorted) */
+void dsort_indexonly (double *X, off_t *S, off_t N) {
+  
+# define SWAPFUNC(A,B){ off_t itmp; \
+  itmp = S[A]; S[A] = S[B]; S[B] = itmp; \
+}
+# define COMPARE(A,B)((!isfinite(X[S[A]]) && isfinite(X[S[B]])) || (X[S[A]] < X[S[B]]))
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+/* sort the index of a vector (vector stays unsorted) */
+void dsort_int_indexonly (double *X, int *S, int N) {
+  
+# define SWAPFUNC(A,B){ int itmp; \
+  itmp = S[A]; S[A] = S[B]; S[B] = itmp; \
+}
+# define COMPARE(A,B)((!isfinite(X[S[A]]) && isfinite(X[S[B]])) || (X[S[A]] < X[S[B]]))
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+