From a915ecd6d60a8d0b42363c9f1f56ff75e9e335fb Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Tue, 13 Dec 2011 11:33:38 -0600
Subject: [PATCH] Add HAVE_TASK_FINDER define to simplify some code.

* runtime/runtime.h: Add HAVE_TASK_FINDER define if we've got any form of
  utrace.
* runtime/task_finder.c: Use HAVE_TASK_FINDER to know whether to define
  dummy functions.
* runtime/vma.c (_stp_vma_init): Use HAVE_TASK_FINDER define.
---
 runtime/runtime.h     |  4 ++++
 runtime/task_finder.c | 11 +++--------
 runtime/vma.c         |  3 +--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/runtime/runtime.h b/runtime/runtime.h
index 4ad2a37bb..3c0f27d60 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -134,6 +134,10 @@ static struct
 #include "regs.c"
 #include "regs-ia64.c"
 
+#if (defined(CONFIG_UTRACE) || defined(STAPCONF_UTRACE_VIA_TRACEPOINTS) \
+     || defined(STAPCONF_UTRACE_VIA_FTRACE))
+#define HAVE_TASK_FINDER
+#endif
 #include "task_finder.c"
 
 #include "sym.c"
diff --git a/runtime/task_finder.c b/runtime/task_finder.c
index 6c2788d19..b8c8ff75a 100644
--- a/runtime/task_finder.c
+++ b/runtime/task_finder.c
@@ -1,11 +1,6 @@
 #ifndef TASK_FINDER_C
 #define TASK_FINDER_C
 
-#if (defined(STAPCONF_UTRACE_VIA_TRACEPOINTS) \
-     || defined(STAPCONF_UTRACE_VIA_FTRACE))
-#define STP_CAN_USE_INTERNAL_UTRACE
-#endif
-
 /*
  * Which utrace shall we use?
  * (1) Built-in kernel utrace (preferred), indicated by
@@ -16,12 +11,12 @@
  * functions.
  */
 
-#if !defined(CONFIG_UTRACE) && !defined(STP_CAN_USE_INTERNAL_UTRACE)
+#ifndef HAVE_TASK_FINDER
 /* Dummy definitions for use in sym.c */
 struct stap_task_finder_target { };
 static int stap_start_task_finder(void) { return 0; }
 static void stap_stop_task_finder(void) { }
-#else  /* CONFIG_UTRACE || STP_CAN_USE_INTERNAL_UTRACE */
+#else  /* HAVE_TASK_FINDER */
 #if !defined(CONFIG_UTRACE)
 #include "task_finder2.c"
 #else  /* CONFIG_UTRACE */
@@ -1721,6 +1716,6 @@ stap_stop_task_finder(void)
 	debug_task_finder_report();
 }
 
-#endif /* CONFIG_UTRACE || STP_CAN_USE_INTERNAL_UTRACE */
 #endif /* CONFIG_UTRACE */
+#endif /* HAVE_TASK_FINDER */
 #endif /* TASK_FINDER_C */
diff --git a/runtime/vma.c b/runtime/vma.c
index 666812728..cba7129d1 100644
--- a/runtime/vma.c
+++ b/runtime/vma.c
@@ -210,8 +210,7 @@ static int _stp_vma_munmap_cb(struct stap_task_finder_target *tgt,
 static int _stp_vma_init(void)
 {
         int rc = 0;
-#if (defined(CONFIG_UTRACE) || defined(STAPCONF_UTRACE_VIA_TRACEPOINTS) \
-     || defined(STAPCONF_UTRACE_VIA_FTRACE))
+#ifdef HAVE_TASK_FINDER
         static struct stap_task_finder_target vmcb = {
                 // NB: no .pid, no .procname filters here.
                 // This means that we get a system-wide mmap monitoring
-- 
2.43.5