Add function instrumentation type accessors to function location type

Since the uprobe instrumentation is currently limited to function
entries, and since support for the instrumentation function return
is planned to be introduced at some point, it makes sense
to introduce an "instrumentation type" attribute on function
locations.

Currently, the only available instrumentation type is
"entry", which matches what is supported by the kernel tracer as of
2.11.

In the future, a RETURN and ENTRY_RETURN/BOTH instrumentation type
could be added without changing the default behavior of rules
such a userspace probe.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/lttng/userspace-probe-internal.h b/include/lttng/userspace-probe-internal.h
index 8708ec01c4dad7d2931f48ad67c03a759c2c23af..909d56c53af186b4bc57013c43cea5eca5121de1 100644 (file)
--- a/include/lttng/userspace-probe-internal.h
+++ b/include/lttng/userspace-probe-internal.h
@@ -102,6 +102,7 @@ struct lttng_userspace_probe_location_function {
         * Set to -1 if not open.
         */
        int binary_fd;
         * Set to -1 if not open.
         */
        int binary_fd;

+       enum lttng_userspace_probe_location_function_instrumentation_type instrumentation_type;

 };
 
 struct lttng_userspace_probe_location_tracepoint {
 };
 
 struct lttng_userspace_probe_location_tracepoint {

diff --git a/include/lttng/userspace-probe.h b/include/lttng/userspace-probe.h
index 6b90363073b09605221d1327a648833ebfcc5c74..cedb7d8b8fc7e260f85350592a0cc3599295ac82 100644 (file)
--- a/include/lttng/userspace-probe.h
+++ b/include/lttng/userspace-probe.h
@@ -69,9 +69,15 @@ lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create(void);
  */
 struct lttng_userspace_probe_location;
 
  */
 struct lttng_userspace_probe_location;
 

+enum lttng_userspace_probe_location_status {
+       LTTNG_USERSPACE_PROBE_LOCATION_STATUS_OK        = 0,
+       /* Invalid parameters provided. */
+       LTTNG_USERSPACE_PROBE_LOCATION_STATUS_INVALID   = -1,
+};
+

 enum lttng_userspace_probe_location_type {
        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_UNKNOWN     = -1,
 enum lttng_userspace_probe_location_type {
        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_UNKNOWN     = -1,

-       /* Function entry. */
+       /* Function. */

        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION    = 0,
        /* SDT probe's callsites. */
        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT  = 1,
        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION    = 0,
        /* SDT probe's callsites. */
        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT  = 1,


@@ -90,6 +96,13 @@ lttng_userspace_probe_location_get_type(
 extern void lttng_userspace_probe_location_destroy(
                struct lttng_userspace_probe_location *location);
 
 extern void lttng_userspace_probe_location_destroy(
                struct lttng_userspace_probe_location *location);
 

+
+enum lttng_userspace_probe_location_function_instrumentation_type {
+       LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_UNKNOWN = -1,
+       /* Only instrument the function's entry. */
+       LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY = 0,
+};
+

 /*
  * Create a probe location of the function type.
  * Receives the target binary file path and function to instrument.
 /*
  * Create a probe location of the function type.
  * Receives the target binary file path and function to instrument.


@@ -122,6 +135,27 @@ extern const char *lttng_userspace_probe_location_function_get_function_name(
 extern int lttng_userspace_probe_location_function_get_binary_fd(
                const struct lttng_userspace_probe_location *location);
 
 extern int lttng_userspace_probe_location_function_get_binary_fd(
                const struct lttng_userspace_probe_location *location);
 

+/*
+ * Get the instrumentation type of the function probe location.
+ */
+extern enum lttng_userspace_probe_location_function_instrumentation_type
+lttng_userspace_probe_location_function_get_instrumentation_type(
+               const struct lttng_userspace_probe_location *location);
+
+/*
+ * Get the instrumentation type of the function probe location.
+ * Defaults to
+ * LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY.
+ *
+ * Returns LTTNG_USERSPACE_PROBE_LOCATION_STATUS_OK on success,
+ * LTTNG_USERSPACE_PROBE_LOCATION_STATUS_INVALID if invalid parameters
+ * are provided.
+ */
+extern enum lttng_userspace_probe_location_status
+lttng_userspace_probe_location_function_set_instrumentation_type(
+               const struct lttng_userspace_probe_location *location,
+               enum lttng_userspace_probe_location_function_instrumentation_type instrumentation_type);
+

 /*
  * Get the lookup method of the given userspace probe location.
  * Returns NULL if the probe location type is unsupported.
 /*
  * Get the lookup method of the given userspace probe location.
  * Returns NULL if the probe location type is unsupported.

diff --git a/src/common/userspace-probe.c b/src/common/userspace-probe.c
index 37bdcc7b1b7897ac3ef588b4839744995dd17591..7f038f5b53ec8a0e76d77df6c121542dbb3129f9 100644 (file)
--- a/src/common/userspace-probe.c
+++ b/src/common/userspace-probe.c
@@ -196,6 +196,8 @@ lttng_userspace_probe_location_function_create_no_check(const char *binary_path,
        location->function_name = function_name_copy;
        location->binary_path = binary_path_copy;
        location->binary_fd = binary_fd;
        location->function_name = function_name_copy;
        location->binary_path = binary_path_copy;
        location->binary_fd = binary_fd;

+       location->instrumentation_type =
+                       LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY;

 
        ret = &location->parent;
        ret->lookup_method = lookup_method;
 
        ret = &location->parent;
        ret->lookup_method = lookup_method;


@@ -692,6 +694,52 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+enum lttng_userspace_probe_location_function_instrumentation_type
+lttng_userspace_probe_location_function_get_instrumentation_type(
+               const struct lttng_userspace_probe_location *location)
+{
+       enum lttng_userspace_probe_location_function_instrumentation_type type;
+       struct lttng_userspace_probe_location_function *function_location;
+
+       if (!location || lttng_userspace_probe_location_get_type(location) !=
+                       LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION) {
+               ERR("Invalid argument(s)");
+               type = LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_UNKNOWN;
+               goto end;
+       }
+
+       function_location = container_of(location,
+               struct lttng_userspace_probe_location_function, parent);
+       type = function_location->instrumentation_type;
+end:
+       return type;
+}
+
+enum lttng_userspace_probe_location_status
+lttng_userspace_probe_location_function_set_instrumentation_type(
+               const struct lttng_userspace_probe_location *location,
+               enum lttng_userspace_probe_location_function_instrumentation_type instrumentation_type)
+{
+       enum lttng_userspace_probe_location_status status =
+                       LTTNG_USERSPACE_PROBE_LOCATION_STATUS_OK;
+       struct lttng_userspace_probe_location_function *function_location;
+
+       if (!location || lttng_userspace_probe_location_get_type(location) !=
+                       LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION ||
+                       instrumentation_type !=
+                       LTTNG_USERSPACE_PROBE_LOCATION_FUNCTION_INSTRUMENTATION_TYPE_ENTRY) {
+               ERR("Invalid argument(s)");
+               status = LTTNG_USERSPACE_PROBE_LOCATION_STATUS_INVALID;
+               goto end;
+       }
+
+       function_location = container_of(location,
+               struct lttng_userspace_probe_location_function, parent);
+       function_location->instrumentation_type = instrumentation_type;
+end:
+       return status;
+}
+

 int lttng_userspace_probe_location_tracepoint_get_binary_fd(
                const struct lttng_userspace_probe_location *location)
 {
 int lttng_userspace_probe_location_tracepoint_get_binary_fd(
                const struct lttng_userspace_probe_location *location)
 {