Small updates/wins around non-block IO

[m6w6/libmemcached] / libmemcached / watchpoint.h

diff --git a/libmemcached/watchpoint.h b/libmemcached/watchpoint.h
index a69d3916723b9933f571eac3af851db3b124f5fc..31d0a12b6099421d623c8681ba0839974ea6c13c 100644 (file)
--- a/libmemcached/watchpoint.h
+++ b/libmemcached/watchpoint.h
@@ -9,12 +9,39 @@
  *
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_WATCHPOINT_H
-#define LIBMEMCACHED_MEMCACHED_WATCHPOINT_H
+#ifndef __LIBMEMCACHED_WATCHPOINT_H__
+#define __LIBMEMCACHED_WATCHPOINT_H__
 
 /* Some personal debugging functions */
 #if defined(DEBUG)
 
+#ifdef TARGET_OS_LINUX
+static inline void __stack_dump(void)
+{
+  void *array[10];
+  int size;
+  char **strings;
+
+  size= backtrace(array, 10);
+  strings= backtrace_symbols(array, size);
+
+  fprintf(stderr, "Found %d stack frames.\n", size);
+
+  for (int x= 0; x < size; x++)
+    fprintf(stderr, "%s\n", strings[x]);
+
+  free (strings);
+
+  fflush(stderr);
+}
+
+#else
+
+static inline void __stack_dump(void)
+{ }
+
+#endif // __stack_dump()
+
 #include <assert.h>
 
 #define WATCHPOINT do { fprintf(stderr, "\nWATCHPOINT %s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout); } while (0)
@@ -23,10 +50,13 @@
 #define WATCHPOINT_STRING(A) do { fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__,A);fflush(stdout); } while (0)
 #define WATCHPOINT_STRING_LENGTH(A,B) do { fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %.*s\n", __FILE__, __LINE__,__func__,(int)B,A);fflush(stdout); } while (0)
 #define WATCHPOINT_NUMBER(A) do { fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %zu\n", __FILE__, __LINE__,__func__,(size_t)(A));fflush(stdout); } while (0)
+#define WATCHPOINT_LABELED_NUMBER(A,B) do { fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s:%zu\n", __FILE__, __LINE__,__func__,(A),(size_t)(B));fflush(stdout); } while (0)
+#define WATCHPOINT_IF_LABELED_NUMBER(A,B,C) do { if(A) {fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s:%zu\n", __FILE__, __LINE__,__func__,(B),(size_t)(C));fflush(stdout);} } while (0)
 #define WATCHPOINT_ERRNO(A) do { fprintf(stderr, "\nWATCHPOINT %s:%d (%s) %s\n", __FILE__, __LINE__,__func__, strerror(A));fflush(stdout); } while (0)
-#define WATCHPOINT_ASSERT_PRINT(A,B,C) do { if(!(A)){fprintf(stderr, "\nWATCHPOINT ASSERT %s:%d (%s) ", __FILE__, __LINE__,__func__);fprintf(stderr, (B),(C));fprintf(stderr,"\n");fflush(stdout);}assert((A)); } while (0)
-#define WATCHPOINT_ASSERT(A) assert((A))
-#define WATCHPOINT_ASSERT_INITIALIZED(A) assert(memcached_is_initialized((A)))
+#define WATCHPOINT_ASSERT_PRINT(A,B,C) do { if(!(A)){fprintf(stderr, "\nWATCHPOINT ASSERT %s:%d (%s) ", __FILE__, __LINE__,__func__);fprintf(stderr, (B),(C));fprintf(stderr,"\n");fflush(stdout); __stack_dump(); } assert((A)); } while (0)
+#define WATCHPOINT_ASSERT(A) do { if (! (A)) {__stack_dump();} assert((A)); } while (0)
+#define WATCHPOINT_ASSERT_INITIALIZED(A) do { if (! (A)) { __stack_dump(); } assert(memcached_is_initialized((A))); } while (0);
+#define WATCHPOINT_SET(A) do { A; } while(0);
 
 #else
 
@@ -35,11 +65,14 @@
 #define WATCHPOINT_IFERROR(A)
 #define WATCHPOINT_STRING(A)
 #define WATCHPOINT_NUMBER(A)
+#define WATCHPOINT_LABELED_NUMBER(A,B)
+#define WATCHPOINT_IF_LABELED_NUMBER(A,B,C)
 #define WATCHPOINT_ERRNO(A)
 #define WATCHPOINT_ASSERT_PRINT(A,B,C)
 #define WATCHPOINT_ASSERT(A)
 #define WATCHPOINT_ASSERT_INITIALIZED(A)
+#define WATCHPOINT_SET(A)
 
 #endif /* DEBUG */
 
-#endif /* LIBMEMCACHED_MEMCACHED_WATCHPOINT_H */
+#endif /* __LIBMEMCACHED_WATCHPOINT_H__ */