X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Fsession.h;h=b8a2b7dcc91b18fff4b2181c0ad54be7bf0e1a4d;hp=8ba8179136f09931ed66e21247fa3124d69e408f;hb=5129845658a1d277c22ca1b194ab59afa2d672f9;hpb=3e3665b89947ebdd812bcfaca1090d22b34d5778

diff --git a/include/lttng/session.h b/include/lttng/session.h
index 8ba817913..b8a2b7dcc 100644
--- a/include/lttng/session.h
+++ b/include/lttng/session.h
@@ -23,6 +23,9 @@
 extern "C" {
 #endif
 
+#include <lttng/constant.h>
+
+struct lttng_handle;
 struct lttng_session_descriptor;
 struct lttng_destruction_handle;
 
@@ -34,7 +37,7 @@ struct lttng_destruction_handle;
  *
  * The structures should be initialized to zero before use.
  */
-#define LTTNG_SESSION_PADDING1             12
+#define LTTNG_SESSION_PADDING1             8
 struct lttng_session {
 	char name[LTTNG_NAME_MAX];
 	/*
@@ -51,7 +54,29 @@ struct lttng_session {
 	uint32_t snapshot_mode;
 	unsigned int live_timer_interval;	/* usec */
 
+	/*
+	 * End of public attributes.
+	 * The remaining fields are used to deal with ABI management concerns.
+	 */
+
+	/*
+	 * 32-bit architectures are already naturally aligned on 4 bytes after
+	 * 'live_timer_interval'. However, the offset does not result in a
+	 * natural alignment on 64-bit architectures. Adding 4 bytes of
+	 * padding here results in an aligned offset after 'alignement_padding'
+	 * for both bitnesses.
+	 *
+	 * This was added since not all compilers appear to align unions in the
+	 * same way. Some (e.g. MSVC) do not seem to impose an alignement
+	 * constraint while others (e.g. gcc, clang, icc) seem to align it to
+	 * ensure 'ptr' is naturally aligned.
+	 */
+	char alignment_padding[4];
 	union {
+		/*
+		 * Ensure the 'extended' union has the same size for both
+		 * 32-bit and 64-bit builds.
+		 */
 		char padding[LTTNG_SESSION_PADDING1];
 		void *ptr;
 	} extended;
@@ -130,7 +155,7 @@ extern int lttng_create_session_live(const char *name, const char *url,
  *
  * The name can't be NULL here.
  *
- * Returns LTTNG_OK on success, else a negative LTTng error code.
+ * Return 0 on success else a negative LTTng error code.
  */
 extern int lttng_destroy_session(const char *name);
 
@@ -141,7 +166,7 @@ extern int lttng_destroy_session(const char *name);
  * an lttng_destruction_handle which can be used to wait for the completion
  * of the session's destruction. The lttng_destroy_handle can also be used
  * obtain the status and archive location of any implicit session
- * rotation that may have occured during the session's destruction.
+ * rotation that may have occurred during the session's destruction.
  *
  * Returns LTTNG_OK on success. The returned handle is owned by the caller
  * and must be free'd using lttng_destruction_handle_destroy().
@@ -192,39 +217,6 @@ extern enum lttng_error_code lttng_session_get_creation_time(
 extern int lttng_set_session_shm_path(const char *session_name,
 		const char *shm_path);
 
-/*
- * Add PID to session tracker.
- *
- * A pid argument >= 0 adds the PID to the session tracker.
- * A pid argument of -1 means "track all PIDs".
- *
- * Return 0 on success else a negative LTTng error code.
- */
-extern int lttng_track_pid(struct lttng_handle *handle, int pid);
-
-/*
- * Remove PID from session tracker.
- *
- * A pid argument >= 0 removes the PID from the session tracker.
- * A pid argument of -1 means "untrack all PIDs".
- *
- * Return 0 on success else a negative LTTng error code.
- */
-extern int lttng_untrack_pid(struct lttng_handle *handle, int pid);
-
-/*
- * List PIDs in the tracker.
- *
- * enabled is set to whether the PID tracker is enabled.
- * pids is set to an allocated array of PIDs currently tracked. On
- * success, pids must be freed by the caller.
- * nr_pids is set to the number of entries contained by the pids array.
- *
- * Returns 0 on success, else a negative LTTng error code.
- */
-extern int lttng_list_tracker_pids(struct lttng_handle *handle,
-		int *enabled, int32_t **pids, size_t *nr_pids);
-
 #ifdef __cplusplus
 }
 #endif