Remove duplication in deprecated tapset functions

* Removed systemtap version compile conditions on
deprecated functions.  Deprecated functions now refer to their
replacements rather than being a direct copy.

diff --git a/tapset/ansi.stp b/tapset/ansi.stp
index f057c4aa0490ce9b430343ecdd25a5c6d0f80ac0..aeb8a034b0791ba2b602b26da5d9b5a3f4538e85 100644 (file)
--- a/tapset/ansi.stp
+++ b/tapset/ansi.stp
@@ -45,11 +45,9 @@ function ansi_set_color(fg:long) {
 function ansi_set_color(fg:long, bg:long) {
        printf("\033[%d;%dm", bg, fg)
 }
-%(systemtap_v <= "3.0" %?
 function ansi_set_color2(fg:long, bg:long) {
-       printf("\033[%d;%dm", bg, fg)
+       ansi_set_color(fg, bg);
 }
-%)
 
 /**
  * sfunction ansi_set_color - Set the ansi Select Graphic Rendition mode.
@@ -69,12 +67,9 @@ function ansi_set_color(fg:long, bg:long, attr:long) {
        attr_str = attr ? sprintf(";%dm", attr) : "m"
        printf("\033[%d;%d%s", bg, fg, attr_str)
 }
-%(systemtap_v <= "3.0" %?
 function ansi_set_color3(fg:long, bg:long, attr:long) {
-       attr_str = attr ? sprintf(";%dm", attr) : "m"
-       printf("\033[%d;%d%s", bg, fg, attr_str)
+       ansi_set_color(fg, bg, attr);
 }
-%)
 
 /**
  * sfunction ansi_reset_color - Resets Select Graphic Rendition mode.

diff --git a/tapset/linux/conversions.stp b/tapset/linux/conversions.stp
index 49d8d6b7d8ad315f0706e764f444d3b622800619..ca03afbcb4d75b0e3e90daf36d67aa990f909594 100644 (file)
--- a/tapset/linux/conversions.stp
+++ b/tapset/linux/conversions.stp
@@ -42,11 +42,9 @@ deref_fault: /* branched to from deref_string() */
 function kernel_string:string (addr:long, err_msg:string) {
   try { return kernel_string(addr) } catch { return err_msg }
 }
-%(systemtap_v <= "3.0" %?
 function kernel_string2:string (addr:long, err_msg:string) {
-  try { return kernel_string(addr) } catch { return err_msg }
+  return kernel_string(addr, err_msg);
 }
-%)
 
 /**
  * sfunction kernel_string_quoted - Retrieves and quotes string from kernel memory
@@ -139,11 +137,9 @@ deref_fault: /* branched to from deref_string() */
 function kernel_string_utf32:string (addr:long, err_msg:string) {
   try { return kernel_string_utf32(addr) } catch { return err_msg }
 }
-%(systemtap_v <= "3.0" %?
 function kernel_string2_utf32:string (addr:long, err_msg:string) {
-  try { return kernel_string_utf32(addr) } catch { return err_msg }
+  return kernel_string_utf32(addr, err_msg);
 }
-%)
 
 /**
  * sfunction kernel_string_quoted_utf32 - Quote given UTF-32 kernel string.
@@ -219,11 +215,9 @@ deref_fault: /* branched to from deref_string() */
 function kernel_string_utf16:string (addr:long, err_msg:string) {
   try { return kernel_string_utf16(addr) } catch { return err_msg }
 }
-%(systemtap_v <= "3.0" %?
 function kernel_string2_utf16:string (addr:long, err_msg:string) {
-  try { return kernel_string_utf16(addr) } catch { return err_msg }
+  return kernel_string_utf16(addr, err_msg);
 }
-%)
 
 
 /**

diff --git a/tapset/linux/proc_mem.stp b/tapset/linux/proc_mem.stp
index b45ef4d65b4fcfa576a8b824e3f57496aa1d34e1..de6f423a88950476cb908fd7f1a720d7c782b970 100644 (file)
--- a/tapset/linux/proc_mem.stp
+++ b/tapset/linux/proc_mem.stp
@@ -148,18 +148,10 @@ function proc_mem_size:long (pid:long)
   }
   return 0
 }
-%(systemtap_v <= "3.0" %?
 function proc_mem_size_pid:long (pid:long)
 {
-  task = pid2task(pid)
-  if (_stp_valid_task(task)) {
-    mm = task->mm
-    if (mm != 0)
-      return mm->total_vm
-  }
-  return 0
+  return proc_mem_size(pid)
 }
-%)
 
 /**
  * sfunction proc_mem_rss - Program resident set size in pages
@@ -200,19 +192,10 @@ function proc_mem_rss:long (pid:long)
   }
   return 0
 }
-%(systemtap_v <= "3.0" %?
 function proc_mem_rss_pid:long (pid:long)
 {
-  task = pid2task(pid)
-  if (_stp_valid_task(task)) {
-    mm = task->mm
-    if (mm != 0)
-        return (_stp_get_mm_counter(mm, _MM_FILEPAGES())
-                + _stp_get_mm_counter(mm, _MM_ANONPAGES()))
-  }
-  return 0
+  return proc_mem_rss(pid)
 }
-%)
 
 /**
  * sfunction proc_mem_shr - Program shared pages (from shared mappings)
@@ -251,18 +234,10 @@ function proc_mem_shr:long (pid:long)
   }
   return 0
 }
-%(systemtap_v <= "3.0" %?
 function proc_mem_shr_pid:long (pid:long)
 {
-  task = pid2task(pid)
-  if (_stp_valid_task(task)) {
-    mm = task->mm
-    if (mm != 0)
-      return _stp_get_mm_counter(mm, _MM_FILEPAGES())
-  }
-  return 0
+  return proc_mem_shr(pid)
 }
-%)
 
 @__private30 function _stp_mem_txt_adjust:long (start_code:long, end_code:long)
 %{ /* pure */
@@ -315,21 +290,10 @@ function proc_mem_txt:long (pid:long)
   }
   return 0
 }
-%(systemtap_v <= "3.0" %?
 function proc_mem_txt_pid:long (pid:long)
 {
-  task = pid2task(pid)
-  if (_stp_valid_task(task)) {
-    mm = task->mm
-    if (mm != 0) {
-      s = mm->start_code
-      e = mm->end_code
-      return _stp_mem_txt_adjust (s, e)
-    }
-  }
-  return 0
+  return proc_mem_txt(pid)
 }
-%)
 
 /**
  * sfunction proc_mem_data - Program data size (data + stack) in pages
@@ -372,20 +336,10 @@ function proc_mem_data:long (pid:long)
   }
   return 0
 }
-%(systemtap_v <= "3.0" %?
 function proc_mem_data_pid:long (pid:long)
 {
-  task = pid2task(pid)
-  if (_stp_valid_task(task)) {
-    mm = task->mm
-    if (mm != 0) {
-      return (@defined(&@mm(0)->data_vm) ? (mm->data_vm + mm->stack_vm)
-             : (mm->total_vm - mm->shared_vm))
-    }
-  }
-  return 0
+  return proc_mem_data(pid)
 }
-%)
 
 /**
  * sfunction mem_page_size - Number of bytes in a page for this architecture
@@ -488,14 +442,7 @@ function proc_mem_string:string (pid:long)
                   pages_to_string(proc_mem_txt(pid)),
                   pages_to_string(proc_mem_data(pid)));
 }
-%(systemtap_v <= "3.0" %?
 function proc_mem_string_pid:string (pid:long)
 {
-  return sprintf ("size: %s, rss: %s, shr: %s, txt: %s, data: %s",
-                  pages_to_string(proc_mem_size(pid)),
-                  pages_to_string(proc_mem_rss(pid)),
-                  pages_to_string(proc_mem_shr(pid)),
-                  pages_to_string(proc_mem_txt(pid)),
-                  pages_to_string(proc_mem_data(pid)));
+  return proc_mem_string(pid)
 }
-%)

diff --git a/tapset/linux/task_time.stp b/tapset/linux/task_time.stp
index 3bdbe47dcc20fcdeabd678a8963f9c7e3ac178f7..501ef964a1de55777d033711b03a1be2128bccfd 100644 (file)
--- a/tapset/linux/task_time.stp
+++ b/tapset/linux/task_time.stp
@@ -76,16 +76,10 @@ function task_utime:long(tid:long)
   else
     return 0;
 }
-%(systemtap_v <= "3.0" %?
 function task_utime_tid:long(tid:long)
 {
-  task = pid2task(tid);
-  if (task != 0)
-    return task->utime;
-  else
-    return 0;
+  return task_utime(tid);
 }
-%)
 
 /**
  * sfunction task_stime - System time of the task
@@ -117,16 +111,10 @@ function task_stime:long(tid:long)
   else
     return 0;
 }
-%(systemtap_v <= "3.0" %?
 function task_stime_tid:long(tid:long)
 {
-  task = pid2task(tid);
-  if (task != 0)
-    return task->stime;
-  else
-    return 0;
+  return task_stime(tid);
 }
-%)
 
 /**
  * sfunction task_start_time - Start time of the given task

diff --git a/tapset/uconversions.stp b/tapset/uconversions.stp
index 3ca87299497288d8f19f8a1ae46a1d6cdc601778..0d7ec03c372992255ca7033ec39c965234c5b5cc 100644 (file)
--- a/tapset/uconversions.stp
+++ b/tapset/uconversions.stp
@@ -42,11 +42,9 @@ function user_string:string (addr:long) {
 function user_string:string (addr:long, err_msg:string) {
        return user_string_n(addr, @MAXSTRINGLEN, err_msg)
 }
-%(systemtap_v <= "3.0" %?
 function user_string2:string (addr:long, err_msg:string) {
        return user_string_n(addr, @MAXSTRINGLEN, err_msg)
 }
-%)
 
 /**
  * sfunction user_string_warn - Retrieves string from user space
@@ -80,11 +78,9 @@ function user_string_warn:string (addr:long) {
 function user_string_warn:string (addr:long, warn_msg:string) {
        return user_string_n_warn(addr, @MAXSTRINGLEN, warn_msg)
 }
-%(systemtap_v <= "3.0" %?
 function user_string2_warn:string (addr:long, warn_msg:string) {
        return user_string_n_warn(addr, @MAXSTRINGLEN, warn_msg)
 }
-%)
 
 /**
  * sfunction user_string_quoted - Retrieves and quotes string from user space
@@ -156,17 +152,9 @@ function user_string_n:string (addr:long, n:long, err_msg:string)
   else
     STAP_RETVALUE[len - 1] = '\0';
 %}
-%(systemtap_v <= "3.0" %?
-function user_string_n2:string (addr:long, n:long, err_msg:string)
-%{ /* pure */ /* myproc-unprivileged */ /* unmodified-fnargs */
-  int64_t len = clamp_t(int64_t, STAP_ARG_n + 1, 1, MAXSTRINGLEN);
-  if (_stp_strncpy_from_user(STAP_RETVALUE, 
-        (char __user *) (uintptr_t) STAP_ARG_addr, len) < 0)
-    strlcpy(STAP_RETVALUE, STAP_ARG_err_msg, MAXSTRINGLEN);
-  else
-    STAP_RETVALUE[len - 1] = '\0';
-%}
-%)
+function user_string_n2:string (addr:long, n:long, err_msg:string) {
+  return user_string_n(addr, n, err_msg);
+}
 
 /**
  * sfunction user_string_n_warn - Retrieves string from user space
@@ -216,25 +204,9 @@ function user_string_n_warn:string (addr:long, n:long, warn_msg:string)
        } else
                STAP_RETVALUE[len - 1] = '\0';
 %}
-%(systemtap_v <= "3.0" %?
-function user_string2_n_warn:string (addr:long, n:long, warn_msg:string)
-%{ /* pure */ /* myproc-unprivileged */ /* unmodified-fnargs */
-       int64_t len = clamp_t(int64_t, STAP_ARG_n + 1, 1, MAXSTRINGLEN);
-       long rc;
-       rc = _stp_strncpy_from_user(STAP_RETVALUE,
-                       (char __user *) (uintptr_t) STAP_ARG_addr, len);
-       if (rc < 0) {
-               // NB: using error_buffer to get local space for the warning, but we're
-               // not aborting, so leave last_error alone.
-               snprintf (CONTEXT->error_buffer, sizeof(CONTEXT->error_buffer),
-                               "user string copy fault %ld at %p [man error::fault]", rc,
-                               (void *) (uintptr_t) STAP_ARG_addr);
-               _stp_warn(CONTEXT->error_buffer);
-               strlcpy (STAP_RETVALUE, STAP_ARG_warn_msg, MAXSTRINGLEN);
-       } else
-               STAP_RETVALUE[len - 1] = '\0';
-%}
-%)
+function user_string2_n_warn:string (addr:long, n:long, warn_msg:string) {
+  user_string_n_warn(addr, n, warn_msg);
+}
 
 /**
  * sfunction user_string_n_quoted - Retrieves and quotes string from user space
@@ -321,56 +293,10 @@ function user_string_n_quoted:string (addr:long, inlen:long, outlen:long)
 %}
    
 %)
-%(systemtap_v <= "3.0" %?
-function user_string_n2_quoted:string (addr:long, inlen:long, outlen:long)
-%( systemtap_v >= "3.0" %?
-   {
-     try
-       {
-         __str = string_quoted(user_string_n(addr, inlen))
-         if (strlen(__str) > outlen-2) // room for the double-quotes plus \ldots
-           __str = (substr(__str,0,outlen-4) . "\"...")
-         return __str
-       }
-     catch
-       {
-         return sprintf("0x%x", addr)
-       }
-   }
-%:   
+function user_string_n2_quoted:string (addr:long, inlen:long, outlen:long) {
+  return user_string_n_quoted(addr, inlen, outlen);
 
-%{ /* pure */ /* myproc-unprivileged */
-       // Note the lack of STAP_ARG_n+1 as in other funcs() -- PR15617
-       int64_t inlen = clamp_t(int64_t, STAP_ARG_inlen, 0, MAXSTRINGLEN);
-       int64_t outlen = clamp_t(int64_t, STAP_ARG_outlen, 0, MAXSTRINGLEN);
-       if (STAP_ARG_addr == 0)
-#if STAP_COMPAT_VERSION < STAP_VERSION(2,3) // PR15044
-               strlcpy(STAP_RETVALUE, "NULL", MAXSTRINGLEN);
-#else
-               snprintf(STAP_RETVALUE, MAXSTRINGLEN, "%p", (void *)(long)STAP_ARG_addr);
-#endif
-       else {
-               int rc = _stp_text_str(STAP_RETVALUE,
-                       (char *)(uintptr_t)STAP_ARG_addr, inlen, outlen, 1, 1, 0);
-               if (rc < 0) {
-#if STAP_COMPAT_VERSION < STAP_VERSION(2,3) // PR15044
-                       strlcpy(STAP_RETVALUE, "<unknown>", MAXSTRINGLEN);
-#else
-#ifdef CONFIG_COMPAT
-                       if (_stp_is_compat_task())
-                               snprintf(STAP_RETVALUE, MAXSTRINGLEN, "%x",
-                                        (compat_long_t)STAP_ARG_addr);
-                       else
-#endif
-                               snprintf(STAP_RETVALUE, MAXSTRINGLEN, "%p",
-                                        (void *)(long)STAP_ARG_addr);
-#endif
-               }
-       }
-%}
-   
-%)
-%)
+}
 
 /**
  * sfunction user_string_utf32 - Retrieves UTF-32 string from user memory
@@ -420,11 +346,9 @@ deref_fault: /* branched to from deref_string() */
 function user_string_utf32:string (addr:long, err_msg:string) {
   try { return user_string_utf32(addr) } catch { return err_msg }
 }
-%(systemtap_v <= "3.0" %?
 function user_string2_utf32:string (addr:long, err_msg:string) {
-  try { return user_string_utf32(addr) } catch { return err_msg }
+  return user_string_utf32 (addr, err_msg);
 }
-%)
 
 
 /**
@@ -502,11 +426,9 @@ deref_fault: /* branched to from deref_string() */
 function user_string_utf16:string (addr:long, err_msg:string) {
   try { return user_string_utf16(addr) } catch { return err_msg }
 }
-%(systemtap_v <= "3.0" %?
 function user_string2_utf16:string (addr:long, err_msg:string) {
-  try { return user_string_utf16(addr) } catch { return err_msg }
+  return user_string_utf16(addr, err_msg);
 }
-%)
 
 
 /**