Added possibility to provide stack addresses

Author: mhahnFr

code/callstack.c

@@ -24,8 +24,12 @@
 #include <string.h>
 
 struct callstack * callstack_new() {
+    return callstack_newWithAddress(__builtin_return_address(0));
+}
+
+struct callstack * callstack_newWithAddress(void * address) {
     void * trace[CALLSTACK_BACKTRACE_SIZE];
-    int size = backtrace(trace, CALLSTACK_BACKTRACE_SIZE);
+    int size = callstack_backtrace(trace, CALLSTACK_BACKTRACE_SIZE, address);
     if (size < 0) return NULL;
 
     struct callstack * ret = callstack_allocate();
@@ -36,8 +40,12 @@ struct callstack * callstack_new() {
 }
 
 bool callstack_emplace(struct callstack * self) {
+    return callstack_emplaceWithAddress(self, __builtin_return_address(0));
+}
+
+bool callstack_emplaceWithAddress(struct callstack * self, void * address) {
     void * trace[CALLSTACK_BACKTRACE_SIZE];
-    int size = backtrace(trace, CALLSTACK_BACKTRACE_SIZE);
+    int size = callstack_backtrace(trace, CALLSTACK_BACKTRACE_SIZE, address);
     return callstack_emplaceWithBacktrace(self, trace, size);
 }
 

code/callstackInternal.c

@@ -21,6 +21,7 @@
 #include "callstack_parser.h"
 #include "../include/callstack_defs.h"
 
+#include <execinfo.h>
 #include <string.h>
 
 void callstack_createWithBacktrace(struct callstack * self,
@@ -31,6 +32,17 @@ void callstack_createWithBacktrace(struct callstack * self,
     self->backtraceSize = traceLength;
 }
 
+int callstack_backtrace(void * buffer[], int bufferSize, void * address) {
+    int i,
+        frames = backtrace(buffer, bufferSize);
+    
+    if (frames < 0) return frames;
+    
+    for (i = 0; buffer[i] != address && i < bufferSize; ++i);
+    (void) memmove(buffer, buffer + i, (size_t) bufferSize - i);
+    return frames - i;
+}
+
 enum callstack_type callstack_translate(struct callstack * self) {
     struct callstack_parser parser;
     callstack_parser_create(&parser);

code/callstackInternal.h

@@ -55,6 +55,8 @@ void callstack_createWithBacktrace(struct callstack * self,
  */
 size_t callstack_getTotalStringLength(struct callstack * self);
 
+int callstack_backtrace(void * buffer[], int bufferSize, void * address);
+
 /**
  * @brief Translates the given callstack object into a human readable format.
  *

include/callstack.h

@@ -54,19 +54,43 @@ struct callstack {
  */
 struct callstack * callstack_new(void);
 
+/**
+ * @brief Creates a new callstack object, ignoring all frames after the given address.
+ *
+ * The struct is allocated and needs to be freed using the function callstack_delete(struct callstack *).
+ * Returns NULL if an error occurs.
+ *
+ * @param address The stack address after which frames are ignored.
+ * @return A newly allocated callstack object.
+ */
+struct callstack * callstack_newWithAddress(void * address);
+
 /**
  * @brief Constructs the given callstack object.
  *
  * Stores the backtrace of the calling function.
  * The callstack object needs to be destructed using the function callstack_destroy(struct callstack *)
- * after use.
+ * upon successfull construction and use.
  * If an error occurs during the initialization of the given callstack object, false is returned.
  *
  * @param self A pointer to the callstack object to be constructed.
  * @return Whether the given callstack object was constructed successfully.
  */
 bool callstack_emplace(struct callstack * self);
 
+/**
+ * @brief Constructs the given callstack object.
+ *
+ * Stores the backtrace of the calling function, ignoring all frames after the given address.
+ * The callstack object needs to be destructed using the function callstack_destroy(struct callstack *)
+ * upon successfull construction and use.
+ *
+ * @param self A pointer to the callstack object to be constructed.
+ * @param address The stack address after which frames are ignored.
+ * @return Whether the given callstack object was constructed successfully.
+ */
+bool callstack_emplaceWithAddress(struct callstack * self, void * address);
+
 /**
  * @brief Constructs the given callstack object.
  *