X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng-abi.c;fp=lttng-abi.c;h=18b115079138806001ef658ed2911cf718a0dde4;hb=6599a4eb8b93ae14c01fe301c7e953047a71e2af;hp=c45c10f42c747fa4d553d08d18900b5bca1a9e08;hpb=50f48712d7d32a8d6e67b8f18f4f5559df24b5cc;p=deliverable%2Flttng-modules.git

diff --git a/lttng-abi.c b/lttng-abi.c
index c45c10f4..18b11507 100644
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -463,6 +463,27 @@ fd_error:
 	return ret;
 }
 
+static
+enum tracker_type get_tracker_type(struct lttng_kernel_tracker_args *tracker)
+{
+	switch (tracker->type) {
+	case LTTNG_KERNEL_TRACKER_PID:
+		return TRACKER_PID;
+	case LTTNG_KERNEL_TRACKER_VPID:
+		return TRACKER_VPID;
+	case LTTNG_KERNEL_TRACKER_UID:
+		return TRACKER_UID;
+	case LTTNG_KERNEL_TRACKER_VUID:
+		return TRACKER_VUID;
+	case LTTNG_KERNEL_TRACKER_GID:
+		return TRACKER_GID;
+	case LTTNG_KERNEL_TRACKER_VGID:
+		return TRACKER_VGID;
+	default:
+		return TRACKER_UNKNOWN;
+	}
+}
+
 /**
  *	lttng_session_ioctl - lttng session fd ioctl
  *
@@ -480,9 +501,13 @@ fd_error:
  *	LTTNG_KERNEL_METADATA
  *		Returns a LTTng metadata file descriptor
  *	LTTNG_KERNEL_SESSION_TRACK_PID
- *		Add PID to session tracker
+ *		Add PID to session PID tracker
  *	LTTNG_KERNEL_SESSION_UNTRACK_PID
- *		Remove PID from session tracker
+ *		Remove PID from session PID tracker
+ *	LTTNG_KERNEL_SESSION_TRACK_ID
+ *		Add ID to tracker
+ *	LTTNG_KERNEL_SESSION_UNTRACK_ID
+ *		Remove ID from tracker
  *
  * The returned channel will be deleted when its file descriptor is closed.
  */
@@ -563,11 +588,54 @@ long lttng_session_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 				METADATA_CHANNEL);
 	}
 	case LTTNG_KERNEL_SESSION_TRACK_PID:
-		return lttng_session_track_pid(session, (int) arg);
+		return lttng_session_track_id(session, TRACKER_PID, (int) arg);
 	case LTTNG_KERNEL_SESSION_UNTRACK_PID:
-		return lttng_session_untrack_pid(session, (int) arg);
+		return lttng_session_untrack_id(session, TRACKER_PID, (int) arg);
+	case LTTNG_KERNEL_SESSION_TRACK_ID:
+	{
+		struct lttng_kernel_tracker_args tracker;
+		enum tracker_type tracker_type;
+
+		if (copy_from_user(&tracker,
+				(struct lttng_kernel_tracker_args __user *) arg,
+				sizeof(struct lttng_kernel_tracker_args)))
+			return -EFAULT;
+		tracker_type = get_tracker_type(&tracker);
+		if (tracker_type == TRACKER_UNKNOWN)
+			return -EINVAL;
+		return lttng_session_track_id(session, tracker_type, tracker.id);
+	}
+	case LTTNG_KERNEL_SESSION_UNTRACK_ID:
+	{
+		struct lttng_kernel_tracker_args tracker;
+		enum tracker_type tracker_type;
+
+		if (copy_from_user(&tracker,
+				(struct lttng_kernel_tracker_args __user *) arg,
+				sizeof(struct lttng_kernel_tracker_args)))
+			return -EFAULT;
+		tracker_type = get_tracker_type(&tracker);
+		if (tracker_type == TRACKER_UNKNOWN)
+			return -EINVAL;
+		return lttng_session_untrack_id(session, tracker_type,
+				tracker.id);
+	}
 	case LTTNG_KERNEL_SESSION_LIST_TRACKER_PIDS:
-		return lttng_session_list_tracker_pids(session);
+		return lttng_session_list_tracker_ids(session, TRACKER_PID);
+	case LTTNG_KERNEL_SESSION_LIST_TRACKER_IDS:
+	{
+		struct lttng_kernel_tracker_args tracker;
+		enum tracker_type tracker_type;
+
+		if (copy_from_user(&tracker,
+				(struct lttng_kernel_tracker_args __user *) arg,
+				sizeof(struct lttng_kernel_tracker_args)))
+			return -EFAULT;
+		tracker_type = get_tracker_type(&tracker);
+		if (tracker_type == TRACKER_UNKNOWN)
+			return -EINVAL;
+		return lttng_session_list_tracker_ids(session, tracker_type);
+	}
 	case LTTNG_KERNEL_SESSION_METADATA_REGEN:
 		return lttng_session_metadata_regenerate(session);
 	case LTTNG_KERNEL_SESSION_STATEDUMP: