Move _stp_tf_vm_cb to sym.c.

* tapsets.cxx (utrace_derived_probe_group::emit_module_decls):
  Remove output task finder vma callback _stp_tf_vm_cb.
* runtime/sym.c (_stp_tf_vm_cb): And add it here.

2 files changed, 34 insertions, 41 deletions

diff --git a/runtime/sym.c b/runtime/sym.c
index ed108f08..d0c5d9fd 100644
--- a/runtime/sym.c
+++ b/runtime/sym.c
@@ -20,6 +20,40 @@
  * @{
  */
 
+/* Callback that needs to be registered (in tapsets.cxx for
+   emit_module_init) for every user task path or pid for which we
+   might need symbols or unwind info. */
+static int _stp_tf_vm_cb(struct stap_task_finder_target *tgt,
+			 struct task_struct *tsk,
+			 int map_p, char *vm_path,
+			 unsigned long vm_start, unsigned long vm_end,
+			 unsigned long vm_pgoff)
+{
+  int i;
+#ifdef DEBUG_TASK_FINDER_VMA
+  _stp_dbug(__FUNCTION__, __LINE__, "vm_cb: tsk %d:%d path %s, start 0x%08lx, end 0x%08lx, offset 0x%lx\n", tsk->pid, map_p, vm_path, vm_start, vm_end, vm_pgoff);
+#endif
+  if (map_p)
+    {
+      struct _stp_module *module = NULL;
+      if (vm_path != NULL)
+	for (i = 0; i < _stp_num_modules; i++)
+	  if (strcmp(vm_path, _stp_modules[i]->path) == 0)
+	    {
+#ifdef DEBUG_TASK_FINDER_VMA
+	      _stp_dbug(__FUNCTION__, __LINE__, "vm_cb: matched path %s to module\n", vm_path);
+#endif
+	      module = _stp_modules[i];
+	      break;
+	    }
+      stap_add_vma_map_info(tsk, vm_start, vm_end, vm_pgoff, module);
+    }
+  else
+    stap_remove_vma_map_info(tsk, vm_start, vm_end, vm_pgoff);
+
+  return 0;
+}
+
 /* XXX: this needs to be address-space-specific. */
 static unsigned long _stp_module_relocate(const char *module, const char *section, unsigned long offset)
 {
diff --git a/tapsets.cxx b/tapsets.cxx
index 52eb1edf..c8852f0f 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -7170,47 +7170,6 @@ utrace_derived_probe_group::emit_module_decls (systemtap_session& s)
   s.op->newline() << "return rc;";
   s.op->newline(-1) << "}";
 
-  // Output task finder vma callback
-  s.op->newline() << "static int _stp_tf_vm_cb(struct stap_task_finder_target *tgt, struct task_struct *tsk, int map_p, char *vm_path, unsigned long vm_start, unsigned long vm_end, unsigned long vm_pgoff) {";
-  s.op->indent(1);
-  s.op->newline() << "int i;";
-  s.op->newline() << "#ifdef DEBUG_TASK_FINDER_VMA";
-  s.op->indent(1);
-  s.op->newline() << "_stp_dbug(__FUNCTION__, __LINE__, \"vm_cb: tsk %d:%d path %s, start 0x%08lx, end 0x%08lx, offset 0x%lx\\n\", tsk->pid, map_p, vm_path, vm_start, vm_end, vm_pgoff);";
-  s.op->indent(-1);
-  s.op->newline() << "#endif";
-  s.op->newline() << "if (map_p) {";
-  s.op->indent(1);
-  s.op->newline() << "struct _stp_module *module = NULL;";
-  s.op->newline() << "if (vm_path != NULL)";
-  s.op->indent(1);
-  s.op->newline() << "for (i = 0; i < _stp_num_modules; i++)";
-  s.op->indent(1);
-  s.op->newline() << "if (strcmp(vm_path, _stp_modules[i]->path) == 0) {";
-  s.op->indent(1);
-  s.op->newline() << "#ifdef DEBUG_TASK_FINDER_VMA";
-  s.op->indent(1);
-  s.op->newline() << "_stp_dbug(__FUNCTION__, __LINE__, \"vm_cb: matched path %s to module\\n\", vm_path);";
-  s.op->indent(-1);
-  s.op->newline() << "#endif";
-  s.op->newline() << "module = _stp_modules[i];";
-  s.op->newline() << "break;";
-  s.op->indent(-1);
-  s.op->newline() << "}";
-  s.op->indent(-2);
-  // XXX Check return value
-  s.op->newline() << "stap_add_vma_map_info(tsk, vm_start, vm_end, vm_pgoff, module);";
-  s.op->indent(-1);
-  s.op->newline() << "} else {";
-  s.op->indent(1);
-  // XXX Check return value
-  s.op->newline() << "stap_remove_vma_map_info(tsk, vm_start, vm_end, vm_pgoff);";
-  s.op->indent(-1);
-  s.op->newline() << "}";
-  s.op->newline() << "return 0;";
-  s.op->indent(-1);
-  s.op->newline() << "}";
-
   s.op->newline() << "static struct stap_utrace_probe stap_utrace_probes[] = {";
   s.op->indent(1);