REORG: include: move debug.h from common/ to haproxy/

The debug file is cleaner now and does not depend on much anymore.

diff --git a/include/common/debug.h b/include/common/debug.h
deleted file mode 100644 (file)
index c1b7e42..0000000
--- a/include/common/debug.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-  include/common/debug.h
-  This files contains some macros to help debugging.
-
-  Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1
-  exclusively.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef _COMMON_DEBUG_H
-#define _COMMON_DEBUG_H
-
-#include <haproxy/api.h>
-#include <common/memory.h>
-
-struct task;
-struct buffer;
-extern volatile unsigned long threads_to_dump;
-extern unsigned int debug_commands_issued;
-void ha_task_dump(struct buffer *buf, const struct task *task, const char *pfx);
-void ha_thread_dump(struct buffer *buf, int thr, int calling_tid);
-void ha_thread_dump_all_to_trash();
-void ha_panic();
-
-/* This one is useful to automatically apply poisonning on an area returned
- * by malloc(). Only "p_" is required to make it work, and to define a poison
- * byte using -dM.
- */
-static inline void *p_malloc(size_t size)
-{
-       void *ret = malloc(size);
-       if (mem_poison_byte >= 0 && ret)
-               memset(ret, mem_poison_byte, size);
-       return ret;
-}
-
-#endif /* _COMMON_DEBUG_H */

diff --git a/include/haproxy/debug.h b/include/haproxy/debug.h
new file mode 100644 (file)
index 0000000..f9d0f45
--- /dev/null
+++ b/include/haproxy/debug.h
@@ -0,0 +1,49 @@
+/*
+ * include/haproxy/debug.h
+ * This files contains some macros to help debugging.
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _HAPROXY_DEBUG_H
+#define _HAPROXY_DEBUG_H
+
+#include <haproxy/api.h>
+#include <common/memory.h>
+
+struct task;
+struct buffer;
+extern volatile unsigned long threads_to_dump;
+extern unsigned int debug_commands_issued;
+void ha_task_dump(struct buffer *buf, const struct task *task, const char *pfx);
+void ha_thread_dump(struct buffer *buf, int thr, int calling_tid);
+void ha_thread_dump_all_to_trash();
+void ha_panic();
+
+/* This one is useful to automatically apply poisonning on an area returned
+ * by malloc(). Only "p_" is required to make it work, and to define a poison
+ * byte using -dM.
+ */
+static inline void *p_malloc(size_t size)
+{
+       void *ret = malloc(size);
+       if (mem_poison_byte >= 0 && ret)
+               memset(ret, mem_poison_byte, size);
+       return ret;
+}
+
+#endif /* _HAPROXY_DEBUG_H */

diff --git a/src/debug.c b/src/debug.c
index e1b9070bfd62b732bcece231c30f458e107bd9b1..340add082978cc5b634a94cc7b2cb4b6c0407299 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -21,7 +21,7 @@
 
 #include <haproxy/api.h>
 #include <common/buf.h>
-#include <common/debug.h>
+#include <haproxy/debug.h>
 #include <common/hathreads.h>
 #include <import/ist.h>
 #include <common/net_helper.h>

diff --git a/src/stats.c b/src/stats.c
index 08879256cb5c27b49bbca9d3b665d690973374c8..05dc223fb0df0a3e3c5e3548aaae19232ef439ab 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -26,7 +26,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/debug.h>
+#include <haproxy/debug.h>
 #include <common/http.h>
 #include <common/htx.h>
 #include <common/memory.h>

diff --git a/src/wdt.c b/src/wdt.c
index 53382ef87e92ed530209f5516167ce6dcb7469df..2d03b4a1f2710ced0cb29b3d50abc0ece1b0f80b 100644 (file)
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -13,7 +13,7 @@
 #include <time.h>
 
 #include <haproxy/api.h>
-#include <common/debug.h>
+#include <haproxy/debug.h>
 #include <common/hathreads.h>
 #include <common/standard.h>
 #include <types/global.h>