Merge branch 'master' into pr6866

Resolved conflicts:
	runtime/task_finder.c: name vs path.

1 files changed, 5 insertions, 44 deletions

diff --git a/tapset/timestamp.stp b/tapset/timestamp.stp
index 29763cb9..0b9d350a 100644
--- a/tapset/timestamp.stp
+++ b/tapset/timestamp.stp
@@ -6,11 +6,11 @@
 // redistribute it and/or modify it under the terms of the GNU General
 // Public License (GPL); either version 2, or (at your option) any
 // later version.
-
-%{
-#include <linux/time.h>
-%}
-
+// <tapsetdescription>
+// Each timestamp function returns a value to indicate when a function is executed. These 
+//returned values can then be used to indicate when an event occurred, provide an ordering for events, 
+//or compute the amount of time elapsed between two time stamps.
+// </tapsetdescription>
 /**
  * sfunction get_cycles - Processor cycle count.
  *
@@ -21,43 +21,4 @@ function get_cycles:long () %{ /* pure */
   THIS->__retvalue = (int64_t) c;
 %}
 
-
-/**
- * sfunction gettimeofday_ns - Number of nanoseconds since UNIX epoch.
- *
- *  Return the number of nanoseconds since the UNIX epoch.
- */
-function gettimeofday_ns:long () %{ /* pure */
-  /* NOTE: we can't use do_gettimeofday because we could be called from a
-   * context where xtime_lock is already held.  See bug #2525. */
-  THIS->__retvalue = _stp_gettimeofday_ns();
-%}
-
-/**
- * sfunction gettimeofday_us - Number of microseconds since UNIX epoch.
- *
- *  Return the number of microseconds since the UNIX epoch.
- */
-function gettimeofday_us:long () {
-  return gettimeofday_ns() / 1000;
-}
-
-/**
- * sfunction gettimeofday_ms - Number of milliseconds since UNIX epoch.
- *
- *  Return the number of milliseconds since the UNIX epoch.
- */
-function gettimeofday_ms:long () {
-  return gettimeofday_ns() / 1000000;
-}
-
-/**
- * sfunction gettimeofday_s - Number of seconds since UNIX epoch.
- *
- * Return the number of seconds since the UNIX epoch.
- */
-function gettimeofday_s:long () {
-  return gettimeofday_ns() / 1000000000;
-}
-
 // likewise jiffies, monotonic_clock ...