X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=9527371380e02c45011ad60a0f806872e194a861;hb=12744796179ed3bfa9c3b6e22bfdeabf2e6081bf;hp=f6a051aa1cb52f8080cc9b2209a71044f052e860;hpb=dec56f6cc894de41b312354d360b6a4c09fc199d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index f6a051aa1..952737138 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -232,6 +232,9 @@ static enum consumerd_state kernel_consumerd_state;
  */
 static int app_socket_timeout;
 
+/* Set in main() with the current page size. */
+long page_size;
+
 static
 void setup_consumerd_path(void)
 {
@@ -2159,6 +2162,8 @@ error:
  * Copy consumer output from the tracing session to the domain session. The
  * function also applies the right modification on a per domain basis for the
  * trace files destination directory.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
  */
 static int copy_session_consumer(int domain, struct ltt_session *session)
 {
@@ -2216,6 +2221,8 @@ error:
 
 /*
  * Create an UST session and add it to the session ust list.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
  */
 static int create_ust_session(struct ltt_session *session,
 		struct lttng_domain *domain)
@@ -2341,6 +2348,8 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
  * Return any error encountered or 0 for success.
  *
  * "sock" is only used for special-case var. len data.
+ *
+ * Should *NOT* be called with RCU read-side lock held.
  */
 static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
 		int *sock_error)
@@ -4032,6 +4041,13 @@ int main(int argc, char **argv)
 
 	setup_consumerd_path();
 
+	page_size = sysconf(_SC_PAGESIZE);
+	if (page_size < 0) {
+		PERROR("sysconf _SC_PAGESIZE");
+		page_size = LONG_MAX;
+		WARN("Fallback page size to %ld", page_size);
+	}
+
 	/* Parse arguments */
 	progname = argv[0];
 	if ((ret = parse_args(argc, argv)) < 0) {