Changeset 33729 for main/trunk

Timestamp:

2019-11-29T22:27:25+13:00 (4 years ago)

Author:

ak19

Message:

Fixes to variants of debug function printCaller().

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -140 +140 @@
      */
     static public void printCaller() {
-    int parent = 1;
+    //int parent = 1;
     // this function printCaller() itself adds another layer on the callstack since
     // it calls the overloaded method, so need to add 1 more to parent
-    printCaller(parent++); 
+    //printCaller(parent++); 
+    
+    StackTraceElement[] callstack = Thread.currentThread().getStackTrace();
+    StackTraceElement requestor = callstack[2]; // the calling function, the function that called this one
+    if(callstack.length > 3) {
+        StackTraceElement caller_requested = callstack[3]; // the function requested
+        System.err.println("\n@@@ Function " + requestor +  " called by:\n    "
+                   + caller_requested + " at 1 ancestors back\n");
+    } else {
+        StackTraceElement caller_requested = callstack[callstack.length-1]; // the function requested
+        System.err.println("\n@@@ Don't have callers beyond requestor function " + requestor + "\n");
+    }
     }
     
@@ -159 +170 @@
     StackTraceElement[] callstack = Thread.currentThread().getStackTrace();
     StackTraceElement requestor = callstack[2]; // the calling function, the function that called this one
-    StackTraceElement caller_requested = callstack[ancestor+3]; // the function requested
-    System.err.println("@@@ Function " + requestor +  " called by:\n    "
-               + caller_requested + " at " + ancestor + " ancestors back");
+    if(callstack.length > (ancestor+3)) {
+        StackTraceElement caller_requested = callstack[ancestor+3]; // the function requested
+        System.err.println("\n@@@ Function " + requestor +  " called by:\n    "
+                   + caller_requested + " at " + ancestor + " ancestors back\n");
+    } else {
+        StackTraceElement caller_requested = callstack[callstack.length-1]; // the function requested
+        System.err.println("\n@@@ Don't have " + ancestor +  " ancestor callers. Function " + requestor +  " called by:\n    "
+                   + caller_requested + " at max " + (callstack.length-1) + " ancestors back\n");
+    }
     }