X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=db0d661016889924c3310e42eec5f1a931e1f834;hb=bb3037a945835e64e852fbadc9c0e9f0d8a79b01;hp=7e4000a0fd1183365a9ccc7746e47297f0cb9d66;hpb=35a9059d90ff33b4cfd57ad613969e333dba23a1;p=lttng-tools.git

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 7e4000a0f..db0d66101 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -77,6 +77,8 @@ struct consumer_data {
 	char cmd_unix_sock_path[PATH_MAX];
 };
 
+#include "benchmark.h"
+
 /* Const values */
 const char default_home_dir[] = DEFAULT_HOME_DIR;
 const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP;
@@ -468,6 +470,25 @@ static void cleanup(void)
 	close(thread_quit_pipe[0]);
 	close(thread_quit_pipe[1]);
 
+	/* OUTPUT BENCHMARK RESULTS */
+	bench_init();
+
+	if (getenv("BENCH_UST_NOTIFY")) {
+		bench_print_ust_notification();
+	}
+
+	if (getenv("BENCH_UST_REGISTER")) {
+		bench_print_ust_register();
+		bench_print_ust_unregister();
+	}
+
+	if (getenv("BENCH_BOOT_PROCESS")) {
+		bench_print_boot_process();
+	}
+
+	bench_close();
+	/* END BENCHMARK */
+
 	/* <fun> */
 	MSG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
 			"Matthew, BEET driven development works!%c[%dm",
@@ -644,6 +665,8 @@ static int notify_ust_apps(int active)
 
 	DBG("Notifying applications of session daemon state: %d", active);
 
+	tracepoint(ust_notify_apps_start);
+
 	/* See shm.c for this call implying mmap, shm and futex calls */
 	wait_shm_mmap = shm_ust_get_mmap(wait_shm_path, is_root);
 	if (wait_shm_mmap == NULL) {
@@ -653,6 +676,8 @@ static int notify_ust_apps(int active)
 	/* Wake waiting process */
 	futex_wait_update((int32_t *) wait_shm_mmap, active);
 
+	tracepoint(ust_notify_apps_stop);
+
 	/* Apps notified successfully */
 	return 0;
 
@@ -824,6 +849,8 @@ static void *thread_manage_kernel(void *data)
 	char tmp;
 	struct lttng_poll_event events;
 
+	tracepoint(sessiond_th_kern_start);
+
 	DBG("Thread manage kernel started");
 
 	ret = create_thread_poll_set(&events, 2);
@@ -858,6 +885,8 @@ static void *thread_manage_kernel(void *data)
 		/* Zeroed the poll events */
 		lttng_poll_reset(&events);
 
+		tracepoint(sessiond_th_kern_poll);
+
 		/* Poll infinite value of time */
 		ret = lttng_poll_wait(&events, -1);
 		if (ret < 0) {
@@ -926,6 +955,8 @@ static void *thread_manage_consumer(void *data)
 	struct lttng_poll_event events;
 	struct consumer_data *consumer_data = data;
 
+	tracepoint(sessiond_th_kcon_start);
+
 	DBG("[thread] Manage consumer started");
 
 	ret = lttcomm_listen_unix_sock(consumer_data->err_sock);
@@ -949,6 +980,8 @@ static void *thread_manage_consumer(void *data)
 
 	nb_fd = LTTNG_POLL_GETNB(&events);
 
+	tracepoint(sessiond_th_kcon_poll);
+
 	/* Inifinite blocking call, waiting for transmission */
 	ret = lttng_poll_wait(&events, -1);
 	if (ret < 0) {
@@ -1081,6 +1114,8 @@ static void *thread_manage_apps(void *data)
 	struct ust_command ust_cmd;
 	struct lttng_poll_event events;
 
+	tracepoint(sessiond_th_apps_start);
+
 	DBG("[thread] Manage application started");
 
 	rcu_register_thread();
@@ -1104,6 +1139,8 @@ static void *thread_manage_apps(void *data)
 
 		DBG("Apps thread polling on %d fds", nb_fd);
 
+		tracepoint(sessiond_th_apps_poll);
+
 		/* Inifinite blocking call, waiting for transmission */
 		ret = lttng_poll_wait(&events, -1);
 		if (ret < 0) {
@@ -1127,13 +1164,16 @@ static void *thread_manage_apps(void *data)
 					ERR("Apps command pipe error");
 					goto error;
 				} else if (revents & LPOLLIN) {
+					tracepoint(ust_register_read_start);
 					/* Empty pipe */
 					ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
 					if (ret < 0 || ret < sizeof(ust_cmd)) {
 						perror("read apps cmd pipe");
 						goto error;
 					}
+					tracepoint(ust_register_read_stop);
 
+					tracepoint(ust_register_add_start);
 					/* Register applicaton to the session daemon */
 					ret = ust_app_register(&ust_cmd.reg_msg,
 							ust_cmd.sock);
@@ -1142,7 +1182,9 @@ static void *thread_manage_apps(void *data)
 					} else if (ret < 0) {
 						break;
 					}
+					tracepoint(ust_register_add_stop);
 
+					tracepoint(ust_register_done_start);
 					/*
 					 * Add channel(s) and event(s) to newly registered apps
 					 * from lttng global UST domain.
@@ -1169,7 +1211,7 @@ static void *thread_manage_apps(void *data)
 						DBG("Apps with sock %d added to poll set",
 								ust_cmd.sock);
 					}
-
+					tracepoint(ust_register_done_stop);
 					break;
 				}
 			} else {
@@ -1214,6 +1256,8 @@ static void *thread_dispatch_ust_registration(void *data)
 	struct cds_wfq_node *node;
 	struct ust_command *ust_cmd = NULL;
 
+	tracepoint(sessiond_th_dispatch_start);
+
 	DBG("[thread] Dispatch UST command started");
 
 	while (!dispatch_thread_exit) {
@@ -1221,6 +1265,8 @@ static void *thread_dispatch_ust_registration(void *data)
 		futex_nto1_prepare(&ust_cmd_queue.futex);
 
 		do {
+			tracepoint(sessiond_th_dispatch_block);
+
 			/* Dequeue command for registration */
 			node = cds_wfq_dequeue_blocking(&ust_cmd_queue.queue);
 			if (node == NULL) {
@@ -1229,6 +1275,8 @@ static void *thread_dispatch_ust_registration(void *data)
 				break;
 			}
 
+			tracepoint(ust_dispatch_register_start);
+
 			ust_cmd = caa_container_of(node, struct ust_command, node);
 
 			DBG("Dispatching UST registration pid:%d ppid:%d uid:%d"
@@ -1259,6 +1307,8 @@ static void *thread_dispatch_ust_registration(void *data)
 			free(ust_cmd);
 		} while (node != NULL);
 
+		tracepoint(ust_dispatch_register_stop);
+
 		/* Futex wait on queue. Blocking call on futex() */
 		futex_nto1_wait(&ust_cmd_queue.futex);
 	}
@@ -1282,6 +1332,8 @@ static void *thread_registration_apps(void *data)
 	 */
 	struct ust_command *ust_cmd = NULL;
 
+	tracepoint(sessiond_th_reg_start);
+
 	DBG("[thread] Manage application registration started");
 
 	ret = lttcomm_listen_unix_sock(apps_sock);
@@ -1315,6 +1367,8 @@ static void *thread_registration_apps(void *data)
 	while (1) {
 		DBG("Accepting application registration");
 
+		tracepoint(sessiond_th_reg_poll);
+
 		nb_fd = LTTNG_POLL_GETNB(&events);
 
 		/* Inifinite blocking call, waiting for transmission */
@@ -1340,6 +1394,9 @@ static void *thread_registration_apps(void *data)
 					ERR("Register apps socket poll error");
 					goto error;
 				} else if (revents & LPOLLIN) {
+					/* Registration starts here. Recording cycles */
+					tracepoint(ust_register_start);
+
 					sock = lttcomm_accept_unix_sock(apps_sock);
 					if (sock < 0) {
 						goto error;
@@ -1389,6 +1446,8 @@ static void *thread_registration_apps(void *data)
 					 * barrier with the exchange in cds_wfq_enqueue.
 					 */
 					futex_nto1_wake(&ust_cmd_queue.futex);
+
+					tracepoint(ust_register_stop);
 				}
 			}
 		}
@@ -1532,7 +1591,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			break;
 		case LTTNG_CONSUMER64_UST:
 		{
-			char *tmpnew;
+			char *tmpnew = NULL;
 
 			if (consumerd64_libdir[0] != '\0') {
 				char *tmp;
@@ -2073,6 +2132,11 @@ static int list_lttng_ust_global_events(char *channel_name,
 		case LTTNG_UST_FUNCTION:
 			tmp[i].type = LTTNG_EVENT_FUNCTION;
 			break;
+		case LTTNG_UST_TRACEPOINT_LOGLEVEL:
+			/* TODO */
+			ret = -LTTCOMM_NOT_IMPLEMENTED;
+			goto error;
+			break;
 		}
 		i++;
 	}
@@ -2191,6 +2255,12 @@ static int cmd_disable_channel(struct ltt_session *session,
 			goto error;
 		}
 
+		/* Already disabled */
+		if (!uchan->enabled) {
+			DBG2("UST channel %s already disabled", channel_name);
+			break;
+		}
+
 		ret = ust_app_disable_channel_glb(usess, uchan);
 		if (ret < 0) {
 			ret = LTTCOMM_UST_DISABLE_FAIL;
@@ -2299,28 +2369,32 @@ static int cmd_enable_channel(struct ltt_session *session,
 				goto error;
 			}
 
-			rcu_read_lock();
-			hashtable_add_unique(usess->domain_global.channels, &uchan->node);
-			rcu_read_unlock();
-			DBG2("UST channel %s added to global domain HT", attr->name);
-
 			/* Add channel to all registered applications */
 			ret = ust_app_create_channel_glb(usess, uchan);
 			if (ret != 0) {
 				ret = LTTCOMM_UST_CHAN_FAIL;
 				goto error;
 			}
+
+			rcu_read_lock();
+			hashtable_add_unique(usess->domain_global.channels, &uchan->node);
+			rcu_read_unlock();
+
+			DBG2("UST channel %s added to global domain HT", attr->name);
 		} else {
 			/* If already enabled, everything is OK */
 			if (uchan->enabled) {
-				ret = LTTCOMM_OK;
-				goto error;
+				break;
 			}
 
 			ret = ust_app_enable_channel_glb(usess, uchan);
 			if (ret < 0) {
-				ret = LTTCOMM_UST_ENABLE_FAIL;
-				goto error;
+				if (ret != -EEXIST) {
+					ret = LTTCOMM_UST_CHAN_ENABLE_FAIL;
+					goto error;
+				} else {
+					ret = LTTCOMM_OK;
+				}
 			}
 		}
 
@@ -2509,21 +2583,18 @@ static int cmd_add_context(struct ltt_session *session, int domain,
 		break;
 	case LTTNG_DOMAIN_UST:
 	{
-		/*
-		struct ltt_ust_session *usess;
+		struct ltt_ust_session *usess = session->ust_session;
 
-		cds_list_for_each_entry(usess, &session->ust_session_list.head, list) {
-			ret = context_ust_add(usess, ctx,
-					event_name, channel_name, domain);
-			if (ret != LTTCOMM_OK) {
-				goto error;
-			}
+		ret = context_ust_add(usess, domain, ctx, event_name, channel_name);
+		if (ret != LTTCOMM_OK) {
+			goto error;
 		}
 		break;
-		*/
 	}
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+	case LTTNG_DOMAIN_UST_PID:
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
 	default:
-		/* TODO: UST other domains */
 		ret = LTTCOMM_NOT_IMPLEMENTED;
 		goto error;
 	}
@@ -2665,15 +2736,16 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 			if (ret != LTTCOMM_OK) {
 				goto error;
 			}
-		}
 
-		/* Get the newly created kernel channel pointer */
-		kchan = trace_kernel_get_channel_by_name(channel_name,
-				session->kernel_session);
-		if (kchan == NULL) {
-			/* This sould not happen... */
-			ret = LTTCOMM_FATAL;
-			goto error;
+			/* Get the newly created kernel channel pointer */
+			kchan = trace_kernel_get_channel_by_name(channel_name,
+					session->kernel_session);
+			if (kchan == NULL) {
+				/* This sould not happen... */
+				ret = LTTCOMM_FATAL;
+				goto error;
+			}
+
 		}
 
 		switch (event_type) {
@@ -2698,6 +2770,8 @@ static int cmd_enable_event_all(struct ltt_session *session, int domain,
 			ret = LTTCOMM_KERN_ENABLE_FAIL;
 			goto error;
 		}
+
+		/* Manage return value */
 		if (ret != LTTCOMM_OK) {
 			goto error;
 		}
@@ -3383,14 +3457,18 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 	}
 	case LTTNG_CREATE_SESSION:
 	{
+		tracepoint(create_session_start);
 		ret = cmd_create_session(cmd_ctx->lsm->session.name,
 				cmd_ctx->lsm->session.path);
+		tracepoint(create_session_end);
 		break;
 	}
 	case LTTNG_DESTROY_SESSION:
 	{
+		tracepoint(destroy_session_start);
 		ret = cmd_destroy_session(cmd_ctx->session,
 				cmd_ctx->lsm->session.name);
+		tracepoint(destroy_session_end);
 		break;
 	}
 	case LTTNG_LIST_DOMAINS:
@@ -3540,6 +3618,8 @@ static void *thread_manage_clients(void *data)
 	struct command_ctx *cmd_ctx = NULL;
 	struct lttng_poll_event events;
 
+	tracepoint(sessiond_th_cli_start);
+
 	DBG("[thread] Manage client started");
 
 	rcu_register_thread();
@@ -3574,6 +3654,8 @@ static void *thread_manage_clients(void *data)
 	while (1) {
 		DBG("Accepting client command ...");
 
+		tracepoint(sessiond_th_cli_poll);
+
 		nb_fd = LTTNG_POLL_GETNB(&events);
 
 		/* Inifinite blocking call, waiting for transmission */
@@ -4153,6 +4235,7 @@ int main(int argc, char **argv)
 	void *status;
 	const char *home_path;
 
+	tracepoint(sessiond_boot_start);
 	rcu_register_thread();
 
 	/* Create thread quit pipe */
@@ -4358,6 +4441,8 @@ int main(int argc, char **argv)
 		goto exit_kernel;
 	}
 
+	tracepoint(sessiond_boot_end);
+
 	ret = pthread_join(kernel_thread, &status);
 	if (ret != 0) {
 		perror("pthread_join");