Merge in fetch updates/break out memory/create error bits for host failures.

[awesomized/libmemcached] / libmemcached / libmemcached_probes.h

diff --git a/libmemcached/libmemcached_probes.h b/libmemcached/libmemcached_probes.h
index cf59cc595501a8e612d446ff194d2e9e8d3507a8..70d69f3dba7f07800063c0f8f9aaec06f10eaa30 100644 (file)
--- a/libmemcached/libmemcached_probes.h
+++ b/libmemcached/libmemcached_probes.h
@@ -1,154 +1,35 @@
-/*
- * Generated by dtrace(1M).
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
  */
 
-#ifndef        _LIBMEMCACHED_PROBES_H
-#define        _LIBMEMCACHED_PROBES_H
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if _DTRACE_VERSION
-
-#define        LIBMEMCACHED_MEMCACHED_ADD_END() \
-       __dtrace_libmemcached___memcached_add_end()
-#define        LIBMEMCACHED_MEMCACHED_ADD_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_add_end()
-#define        LIBMEMCACHED_MEMCACHED_ADD_START() \
-       __dtrace_libmemcached___memcached_add_start()
-#define        LIBMEMCACHED_MEMCACHED_ADD_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_add_start()
-#define        LIBMEMCACHED_MEMCACHED_CONNECT_END() \
-       __dtrace_libmemcached___memcached_connect_end()
-#define        LIBMEMCACHED_MEMCACHED_CONNECT_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_connect_end()
-#define        LIBMEMCACHED_MEMCACHED_CONNECT_START() \
-       __dtrace_libmemcached___memcached_connect_start()
-#define        LIBMEMCACHED_MEMCACHED_CONNECT_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_connect_start()
-#define        LIBMEMCACHED_MEMCACHED_DECREMENT_END() \
-       __dtrace_libmemcached___memcached_decrement_end()
-#define        LIBMEMCACHED_MEMCACHED_DECREMENT_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_decrement_end()
-#define        LIBMEMCACHED_MEMCACHED_DECREMENT_START() \
-       __dtrace_libmemcached___memcached_decrement_start()
-#define        LIBMEMCACHED_MEMCACHED_DECREMENT_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_decrement_start()
-#define        LIBMEMCACHED_MEMCACHED_DELETE_END() \
-       __dtrace_libmemcached___memcached_delete_end()
-#define        LIBMEMCACHED_MEMCACHED_DELETE_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_delete_end()
-#define        LIBMEMCACHED_MEMCACHED_DELETE_START() \
-       __dtrace_libmemcached___memcached_delete_start()
-#define        LIBMEMCACHED_MEMCACHED_DELETE_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_delete_start()
-#define        LIBMEMCACHED_MEMCACHED_FLUSH_END() \
-       __dtrace_libmemcached___memcached_flush_end()
-#define        LIBMEMCACHED_MEMCACHED_FLUSH_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_flush_end()
-#define        LIBMEMCACHED_MEMCACHED_FLUSH_START() \
-       __dtrace_libmemcached___memcached_flush_start()
-#define        LIBMEMCACHED_MEMCACHED_FLUSH_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_flush_start()
-#define        LIBMEMCACHED_MEMCACHED_GET_END() \
-       __dtrace_libmemcached___memcached_get_end()
-#define        LIBMEMCACHED_MEMCACHED_GET_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_get_end()
-#define        LIBMEMCACHED_MEMCACHED_GET_START() \
-       __dtrace_libmemcached___memcached_get_start()
-#define        LIBMEMCACHED_MEMCACHED_GET_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_get_start()
-#define        LIBMEMCACHED_MEMCACHED_INCREMENT_END() \
-       __dtrace_libmemcached___memcached_increment_end()
-#define        LIBMEMCACHED_MEMCACHED_INCREMENT_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_increment_end()
-#define        LIBMEMCACHED_MEMCACHED_INCREMENT_START() \
-       __dtrace_libmemcached___memcached_increment_start()
-#define        LIBMEMCACHED_MEMCACHED_INCREMENT_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_increment_start()
-#define        LIBMEMCACHED_MEMCACHED_MGET_END() \
-       __dtrace_libmemcached___memcached_mget_end()
-#define        LIBMEMCACHED_MEMCACHED_MGET_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_mget_end()
-#define        LIBMEMCACHED_MEMCACHED_MGET_START() \
-       __dtrace_libmemcached___memcached_mget_start()
-#define        LIBMEMCACHED_MEMCACHED_MGET_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_mget_start()
-#define        LIBMEMCACHED_MEMCACHED_REPLACE_END() \
-       __dtrace_libmemcached___memcached_replace_end()
-#define        LIBMEMCACHED_MEMCACHED_REPLACE_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_replace_end()
-#define        LIBMEMCACHED_MEMCACHED_REPLACE_START() \
-       __dtrace_libmemcached___memcached_replace_start()
-#define        LIBMEMCACHED_MEMCACHED_REPLACE_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_replace_start()
-#define        LIBMEMCACHED_MEMCACHED_SERVER_ADD_END() \
-       __dtrace_libmemcached___memcached_server_add_end()
-#define        LIBMEMCACHED_MEMCACHED_SERVER_ADD_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_server_add_end()
-#define        LIBMEMCACHED_MEMCACHED_SERVER_ADD_START() \
-       __dtrace_libmemcached___memcached_server_add_start()
-#define        LIBMEMCACHED_MEMCACHED_SERVER_ADD_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_server_add_start()
-#define        LIBMEMCACHED_MEMCACHED_SET_END() \
-       __dtrace_libmemcached___memcached_set_end()
-#define        LIBMEMCACHED_MEMCACHED_SET_END_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_set_end()
-#define        LIBMEMCACHED_MEMCACHED_SET_START() \
-       __dtrace_libmemcached___memcached_set_start()
-#define        LIBMEMCACHED_MEMCACHED_SET_START_ENABLED() \
-       __dtraceenabled_libmemcached___memcached_set_start()
-
+/*
+ * This file contains the definition of the various probes supported by
+ * libmemcached. Currently it only support DTRACE, but just create an
+ * implementation of the following macros to create your own sort of
+ * probing :)
+ */
+#ifndef        __LIBMEMCACHED_PROBES_H__
+#define        __LIBMEMCACHED_PROBES_H__
 
-extern void __dtrace_libmemcached___memcached_add_end(void);
-extern int __dtraceenabled_libmemcached___memcached_add_end(void);
-extern void __dtrace_libmemcached___memcached_add_start(void);
-extern int __dtraceenabled_libmemcached___memcached_add_start(void);
-extern void __dtrace_libmemcached___memcached_connect_end(void);
-extern int __dtraceenabled_libmemcached___memcached_connect_end(void);
-extern void __dtrace_libmemcached___memcached_connect_start(void);
-extern int __dtraceenabled_libmemcached___memcached_connect_start(void);
-extern void __dtrace_libmemcached___memcached_decrement_end(void);
-extern int __dtraceenabled_libmemcached___memcached_decrement_end(void);
-extern void __dtrace_libmemcached___memcached_decrement_start(void);
-extern int __dtraceenabled_libmemcached___memcached_decrement_start(void);
-extern void __dtrace_libmemcached___memcached_delete_end(void);
-extern int __dtraceenabled_libmemcached___memcached_delete_end(void);
-extern void __dtrace_libmemcached___memcached_delete_start(void);
-extern int __dtraceenabled_libmemcached___memcached_delete_start(void);
-extern void __dtrace_libmemcached___memcached_flush_end(void);
-extern int __dtraceenabled_libmemcached___memcached_flush_end(void);
-extern void __dtrace_libmemcached___memcached_flush_start(void);
-extern int __dtraceenabled_libmemcached___memcached_flush_start(void);
-extern void __dtrace_libmemcached___memcached_get_end(void);
-extern int __dtraceenabled_libmemcached___memcached_get_end(void);
-extern void __dtrace_libmemcached___memcached_get_start(void);
-extern int __dtraceenabled_libmemcached___memcached_get_start(void);
-extern void __dtrace_libmemcached___memcached_increment_end(void);
-extern int __dtraceenabled_libmemcached___memcached_increment_end(void);
-extern void __dtrace_libmemcached___memcached_increment_start(void);
-extern int __dtraceenabled_libmemcached___memcached_increment_start(void);
-extern void __dtrace_libmemcached___memcached_mget_end(void);
-extern int __dtraceenabled_libmemcached___memcached_mget_end(void);
-extern void __dtrace_libmemcached___memcached_mget_start(void);
-extern int __dtraceenabled_libmemcached___memcached_mget_start(void);
-extern void __dtrace_libmemcached___memcached_replace_end(void);
-extern int __dtraceenabled_libmemcached___memcached_replace_end(void);
-extern void __dtrace_libmemcached___memcached_replace_start(void);
-extern int __dtraceenabled_libmemcached___memcached_replace_start(void);
-extern void __dtrace_libmemcached___memcached_server_add_end(void);
-extern int __dtraceenabled_libmemcached___memcached_server_add_end(void);
-extern void __dtrace_libmemcached___memcached_server_add_start(void);
-extern int __dtraceenabled_libmemcached___memcached_server_add_start(void);
-extern void __dtrace_libmemcached___memcached_set_end(void);
-extern int __dtraceenabled_libmemcached___memcached_set_end(void);
-extern void __dtrace_libmemcached___memcached_set_start(void);
-extern int __dtraceenabled_libmemcached___memcached_set_start(void);
+#ifdef HAVE_DTRACE
+/*
+ * Create the DTrace probes on the system using it (to support both Solaris
+ * and MacOS X
+ */
+#include "libmemcached/dtrace_probes.h"
 
 #else
+/*
+ * Provide dummy macros so that we don't need to clutter the code with
+ * ifdefs when we want to use the probes.
+ */
 
 #define        LIBMEMCACHED_MEMCACHED_ADD_END()
 #define        LIBMEMCACHED_MEMCACHED_ADD_END_ENABLED() (0)
@@ -162,6 +43,10 @@ extern int __dtraceenabled_libmemcached___memcached_set_start(void);
 #define        LIBMEMCACHED_MEMCACHED_DECREMENT_END_ENABLED() (0)
 #define        LIBMEMCACHED_MEMCACHED_DECREMENT_START()
 #define        LIBMEMCACHED_MEMCACHED_DECREMENT_START_ENABLED() (0)
+#define        LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_END()
+#define        LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_END_ENABLED() (0)
+#define        LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_START()
+#define        LIBMEMCACHED_MEMCACHED_DECREMENT_WITH_INITIAL_START_ENABLED() (0)
 #define        LIBMEMCACHED_MEMCACHED_DELETE_END()
 #define        LIBMEMCACHED_MEMCACHED_DELETE_END_ENABLED() (0)
 #define        LIBMEMCACHED_MEMCACHED_DELETE_START()
@@ -178,6 +63,10 @@ extern int __dtraceenabled_libmemcached___memcached_set_start(void);
 #define        LIBMEMCACHED_MEMCACHED_INCREMENT_END_ENABLED() (0)
 #define        LIBMEMCACHED_MEMCACHED_INCREMENT_START()
 #define        LIBMEMCACHED_MEMCACHED_INCREMENT_START_ENABLED() (0)
+#define        LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_END()
+#define        LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_END_ENABLED() (0)
+#define        LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START()
+#define        LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START_ENABLED() (0)
 #define        LIBMEMCACHED_MEMCACHED_MGET_END()
 #define        LIBMEMCACHED_MEMCACHED_MGET_END_ENABLED() (0)
 #define        LIBMEMCACHED_MEMCACHED_MGET_START()
@@ -197,9 +86,4 @@ extern int __dtraceenabled_libmemcached___memcached_set_start(void);
 
 #endif
 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LIBMEMCACHED_PROBES_H */
+#endif /* __LIBMEMCACHED_PROBES_H__ */