X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=825b6682bbee9f39cbaaf2c0093cc1ba3984cdca;hb=b66cbf1731486ab4dc7e0b2e1c3fa05cc5360c19;hp=84032d1ec6f3da16976c46368101016fd9ff34c2;hpb=e957bf98e634c79b13281d0a2fe144be0245d310;p=lttng-tools.git

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 84032d1ec..825b6682b 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -17,39 +17,48 @@
 
 /* Include every LTTng ABI/API available. */
 #include <lttng/action/action.h>
-#include <lttng/action/group.h>
+#include <lttng/action/list.h>
 #include <lttng/action/notify.h>
+#include <lttng/action/path.h>
+#include <lttng/action/rate-policy.h>
 #include <lttng/action/rotate-session.h>
 #include <lttng/action/snapshot-session.h>
 #include <lttng/action/start-session.h>
 #include <lttng/action/stop-session.h>
 #include <lttng/channel.h>
-#include <lttng/clear.h>
 #include <lttng/clear-handle.h>
+#include <lttng/clear.h>
 #include <lttng/condition/buffer-usage.h>
 #include <lttng/condition/condition.h>
 #include <lttng/condition/evaluation.h>
-#include <lttng/condition/event-rule.h>
+#include <lttng/condition/event-rule-matches.h>
 #include <lttng/condition/session-consumed-size.h>
 #include <lttng/condition/session-rotation.h>
 #include <lttng/constant.h>
 #include <lttng/destruction-handle.h>
 #include <lttng/domain.h>
 #include <lttng/endpoint.h>
-#include <lttng/event.h>
+#include <lttng/error-query.h>
 #include <lttng/event-expr.h>
 #include <lttng/event-field-value.h>
 #include <lttng/event-rule/event-rule.h>
-#include <lttng/event-rule/kernel-probe.h>
-#include <lttng/event-rule/syscall.h>
-#include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/userspace-probe.h>
+#include <lttng/event-rule/log4j-logging.h>
+#include <lttng/event-rule/jul-logging.h>
+#include <lttng/event-rule/kernel-kprobe.h>
+#include <lttng/event-rule/kernel-syscall.h>
+#include <lttng/event-rule/python-logging.h>
+#include <lttng/event-rule/kernel-tracepoint.h>
+#include <lttng/event-rule/kernel-uprobe.h>
+#include <lttng/event-rule/user-tracepoint.h>
+#include <lttng/event.h>
 #include <lttng/handle.h>
 #include <lttng/health.h>
 #include <lttng/kernel-probe.h>
 #include <lttng/load.h>
 #include <lttng/location.h>
+#include <lttng/log-level-rule.h>
 #include <lttng/lttng-error.h>
+#include <lttng/lttng-export.h>
 #include <lttng/notification/channel.h>
 #include <lttng/notification/notification.h>
 #include <lttng/rotation.h>
@@ -87,14 +96,14 @@ struct lttng_calibrate {
  * Return 1 if alive or 0 if not. On error, returns a negative negative LTTng
  * error code.
  */
-extern int lttng_session_daemon_alive(void);
+LTTNG_EXPORT extern int lttng_session_daemon_alive(void);
 
 /*
  * Set the tracing group for the *current* flow of execution.
  *
  * On success, returns 0 else a negative LTTng error code.
  */
-extern int lttng_set_tracing_group(const char *name);
+LTTNG_EXPORT extern int lttng_set_tracing_group(const char *name);
 
 /*
  * This call registers an "outside consumer" for a session and an lttng domain.
@@ -106,7 +115,7 @@ extern int lttng_set_tracing_group(const char *name);
  *
  * Return 0 on success else a negative LTTng error code.
  */
-extern int lttng_register_consumer(struct lttng_handle *handle,
+LTTNG_EXPORT extern int lttng_register_consumer(struct lttng_handle *handle,
 		const char *socket_path);
 
 /*
@@ -114,7 +123,7 @@ extern int lttng_register_consumer(struct lttng_handle *handle,
  *
  * Return 0 on success else a negative LTTng error code.
  */
-extern int lttng_start_tracing(const char *session_name);
+LTTNG_EXPORT extern int lttng_start_tracing(const char *session_name);
 
 /*
  * Stop tracing for *all* domain(s) in the session.
@@ -128,20 +137,23 @@ extern int lttng_start_tracing(const char *session_name);
  *
  * Return 0 on success else a negative LTTng error code.
  */
-extern int lttng_stop_tracing(const char *session_name);
+LTTNG_EXPORT extern int lttng_stop_tracing(const char *session_name);
 
 /*
  * Behave exactly like lttng_stop_tracing but does not wait for data
  * availability.
  */
-extern int lttng_stop_tracing_no_wait(const char *session_name);
+LTTNG_EXPORT extern int lttng_stop_tracing_no_wait(const char *session_name);
 
 /*
  * Deprecated: As of LTTng 2.9, this function always returns
  * -LTTNG_ERR_UND.
  */
-extern int lttng_calibrate(struct lttng_handle *handle,
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
+LTTNG_EXPORT extern int lttng_calibrate(struct lttng_handle *handle,
 		struct lttng_calibrate *calibrate);
+#pragma GCC diagnostic pop
 
 /*
  * Set URL for a consumer for a session and domain.
@@ -167,7 +179,7 @@ extern int lttng_calibrate(struct lttng_handle *handle,
  *
  * Return 0 on success else a negative LTTng error code.
  */
-extern int lttng_set_consumer_url(struct lttng_handle *handle,
+LTTNG_EXPORT extern int lttng_set_consumer_url(struct lttng_handle *handle,
 		const char *control_url, const char *data_url);
 
 /*
@@ -180,13 +192,13 @@ extern int lttng_set_consumer_url(struct lttng_handle *handle,
  * traced data is pending. On error, a negative value is returned and readable
  * by lttng_strerror().
  */
-extern int lttng_data_pending(const char *session_name);
+LTTNG_EXPORT extern int lttng_data_pending(const char *session_name);
 
 /*
  * Deprecated, replaced by lttng_regenerate_metadata.
  */
-LTTNG_DEPRECATED()
-extern int lttng_metadata_regenerate(const char *session_name);
+LTTNG_DEPRECATED("Use lttng_regenerate_metadata")
+LTTNG_EXPORT extern int lttng_metadata_regenerate(const char *session_name);
 
 /*
  * Trigger the regeneration of the metadata for a session.
@@ -194,7 +206,7 @@ extern int lttng_metadata_regenerate(const char *session_name);
  * the lttng-relayd). Only kernel, per-uid and non-live sessions are supported.
  * Return 0 on success, a negative LTTng error code on error.
  */
-extern int lttng_regenerate_metadata(const char *session_name);
+LTTNG_EXPORT extern int lttng_regenerate_metadata(const char *session_name);
 
 /*
  * Trigger the regeneration of the statedump for a session. The new statedump
@@ -203,7 +215,7 @@ extern int lttng_regenerate_metadata(const char *session_name);
  *
  * Return 0 on success, a negative LTTng error code on error.
  */
-extern int lttng_regenerate_statedump(const char *session_name);
+LTTNG_EXPORT extern int lttng_regenerate_statedump(const char *session_name);
 
 #ifdef __cplusplus
 }