Common source file changes not directly applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/util.h b/open-vm-tools/lib/include/util.h
index 49265e99e2df265633093eed273b3e72594ab384..625aa7d43cf49e7c8d3043a088a1af23d1fdfb7e 100644 (file)
--- a/open-vm-tools/lib/include/util.h
+++ b/open-vm-tools/lib/include/util.h
@@ -111,17 +111,10 @@ Bool Util_IsPhysicalSSD(const char* device);
 typedef void (*Util_OutputFunc)(void *data, const char *fmt, ...);
 
 void Util_Backtrace(int bugNr);
-void Util_BacktraceFromPointer(uintptr_t *basePtr);
-void Util_BacktraceFromPointerWithFunc(uintptr_t *basePtr,
-                                       Util_OutputFunc outFunc,
-                                       void *outFuncData);
 void Util_BacktraceWithFunc(int bugNr,
                             Util_OutputFunc outFunc,
                             void *outFuncData);
 
-void Util_BacktraceToBuffer(uintptr_t *basePtr,
-                            uintptr_t *buffer, int len);
-
 // sleep functions
 
 void Util_Usleep(long usec);

diff --git a/open-vm-tools/lib/user/utilBacktrace.c b/open-vm-tools/lib/user/utilBacktrace.c
index b72340ad0305589b5755a181419034385e9d2e39..ae3581189b34a9c09490aa9ff335b215fbc1da9c 100644 (file)
--- a/open-vm-tools/lib/user/utilBacktrace.c
+++ b/open-vm-tools/lib/user/utilBacktrace.c
@@ -43,6 +43,10 @@
 #  include <dlfcn.h>
 #endif
 
+#if defined __APPLE__
+#  include <execinfo.h>
+#endif
+
 #if defined(__linux__) && !defined(VMX86_TOOLS) && !defined(__ANDROID__)
 #  include <link.h>
 #endif
@@ -61,6 +65,7 @@
 #include <unwind.h>
 
 #define MAX_SKIPPED_FRAMES 10
+#define MAX_STACK_DEPTH_APPLE 128
 
 struct UtilBacktraceFromPointerData {
    uintptr_t        basePtr;
@@ -125,49 +130,6 @@ UtilLogWrapper(void *ignored,    // IN:
 
 
 #ifdef UTIL_BACKTRACE_USE_UNWIND
-/*
- *-----------------------------------------------------------------------------
- *
- * UtilBacktraceToBufferCallback --
- *
- *      Callback from _Unwind_Backtrace to add one entry to the backtrace
- *      buffer.
- *
- * Results:
- *      _URC_NO_REASON : Please continue with backtrace.
- *      _URC_END_OF_STACK : Abort backtrace, we run out of space (*).
- *
- *          (*) Caller does not care.  Anything else than NO_REASON is fatal
- *              and forces _Unwind_Backtrace to report PHASE1 error.
- *
- * Side effects:
- *      None.
- *
- *-----------------------------------------------------------------------------
- */
-
-static _Unwind_Reason_Code
-UtilBacktraceToBufferCallback(struct _Unwind_Context *ctx, // IN: Unwind context
-                              void *cbData)                // IN/OUT: Our data
-{
-   struct UtilBacktraceToBufferData *data = cbData;
-   uintptr_t cfa = _Unwind_GetCFA(ctx);
-
-   /*
-    * Stack grows down.  So if we are below basePtr, do nothing...
-    */
-   if (cfa >= data->basePtr) {
-      if (data->len) {
-         *data->buffer++ = _Unwind_GetIP(ctx);
-         data->len--;
-      } else {
-         return _URC_END_OF_STACK;
-      }
-   }
-   return _URC_NO_REASON;
-}
-
-
 /*
  *-----------------------------------------------------------------------------
  *
@@ -299,34 +261,10 @@ UtilSymbolBacktraceFromPointerCallback(struct _Unwind_Context *ctx, // IN: Unwin
 #endif
 
 
-/*
- *----------------------------------------------------------------------
- *
- * Util_BacktraceFromPointer --
- *
- *      log the stack backtrace given a frame pointer
- *
- * Results:
- *
- *      void
- *
- * Side effects:
- *      None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Util_BacktraceFromPointer(uintptr_t *basePtr)  // IN:
-{
-   Util_BacktraceFromPointerWithFunc(basePtr, UtilLogWrapper, NULL);
-}
-
-
 /*
  *-----------------------------------------------------------------------------
  *
- * Util_BacktraceFromPointerWithFunc --
+ * UtilBacktraceFromPointerWithFunc --
  *
  *      Output a backtrace from the given frame porinter, using
  *      "outputFunc" as the logging function. For each line of the backtrace,
@@ -341,10 +279,10 @@ Util_BacktraceFromPointer(uintptr_t *basePtr)  // IN:
  *-----------------------------------------------------------------------------
  */
 
-void
-Util_BacktraceFromPointerWithFunc(uintptr_t *basePtr,       // IN:
-                                  Util_OutputFunc outFunc,  // IN:
-                                  void *outFuncData)        // IN:
+static void
+UtilBacktraceFromPointerWithFunc(uintptr_t *basePtr,       // IN:
+                                 Util_OutputFunc outFunc,  // IN:
+                                 void *outFuncData)        // IN:
 {
 #if defined(UTIL_BACKTRACE_USE_UNWIND)
    struct UtilBacktraceFromPointerData data;
@@ -413,50 +351,6 @@ Util_BacktraceFromPointerWithFunc(uintptr_t *basePtr,       // IN:
 }
 
 
-/*
- *-----------------------------------------------------------------------------
- *
- * Util_BacktraceToBuffer --
- *
- *      Output a backtrace from the given frame pointer to supplied buffer.
- *
- * Results:
- *      None.
- *
- * Side effects:
- *      See above.
- *
- *-----------------------------------------------------------------------------
- */
-
-void
-Util_BacktraceToBuffer(uintptr_t *basePtr,  // IN:
-                       uintptr_t *buffer,   // IN:
-                       int len)             // IN:
-{
-#if defined(UTIL_BACKTRACE_USE_UNWIND)
-   struct UtilBacktraceToBufferData data;
-
-   data.basePtr = (uintptr_t)basePtr;
-   data.buffer = buffer;
-   data.len = len;
-   _Unwind_Backtrace(UtilBacktraceToBufferCallback, &data);
-#elif !defined(VM_X86_64)
-   uintptr_t *x = basePtr;
-   int i;
-
-   for (i = 0; i < 256 && i < len; i++) {
-      if (x < basePtr ||
-         (uintptr_t) x - (uintptr_t) basePtr > 0x8000) {
-         break;
-      }
-      buffer[i] = x[1];
-      x = (uintptr_t *) x[0];
-   }
-#endif
-}
-
-
 /*
  *----------------------------------------------------------------------
  *
@@ -509,6 +403,32 @@ Util_BacktraceWithFunc(int bugNr,                // IN:
 
    options.bugNumber = bugNr;
    CoreDump_LogFullBacktraceToFunc(&options, outFunc, outFuncData);
+#elif defined(__APPLE__)
+   void *callstack[MAX_STACK_DEPTH_APPLE];
+   int frames;
+   unsigned i;
+   Dl_info dli;
+
+   if (bugNr == 0) {
+      outFunc(outFuncData, "Backtrace:\n");
+   } else {
+      outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
+   }
+   frames = backtrace(callstack, ARRAYSIZE(callstack));
+   for (i = 0; i < frames; i++) {
+      outFunc(outFuncData, "Backtrace[%d] rip=%016lx\n", i, callstack[i]);
+   }
+   for (i = 0; i < frames; i++) {
+      if (dladdr(callstack[i], &dli)) {
+         outFunc(outFuncData, "SymBacktrace[%d] rip=%016lx in function %s "
+                              "in object %s loaded at %#08x\n",
+                 i, callstack[i], dli.dli_sname, dli.dli_fname,
+                 dli.dli_fbase);
+      } else {
+         outFunc(outFuncData, "SymBacktrace[%d] rip=%016lxn", i,
+                 callstack[i]);
+      }
+   }
 #else
    uintptr_t *x = (uintptr_t *) &bugNr;
 
@@ -517,6 +437,6 @@ Util_BacktraceWithFunc(int bugNr,                // IN:
    } else {
       outFunc(outFuncData, "Backtrace for bugNr=%d\n",bugNr);
    }
-   Util_BacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
+   UtilBacktraceFromPointerWithFunc(&x[-2], outFunc, outFuncData);
 #endif
 }