From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 25 Aug 2011 21:25:50 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6e81efd4955d52288a4b5fd462e9e51ca44e3f8f;p=lttng-tools.git

Merge branch 'master' into benchmark

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---

6e81efd4955d52288a4b5fd462e9e51ca44e3f8f
diff --cc configure.ac
index 7af39997a,026988853..8a1c162b6
--- a/configure.ac
+++ b/configure.ac
@@@ -27,9 -27,9 +27,15 @@@ AC_CHECK_DECL([cds_list_add], []
  	[AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
  )
  
++<<<<<<< HEAD
 +# Check liburcu
 +AC_CHECK_DECL([caa_get_cycles], [],
 +	[AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/arch.h>]]
++=======
+ # Check liburcu wfqueue.h
+ AC_CHECK_DECL([cds_wfq_init], [],
+ 	[AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/wfqueue.h>]]
++>>>>>>> master
  )
  
  AC_PROG_CC
diff --cc ltt-sessiond/main.c
index 78682f3a4,b636986f8..631812cae
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@@ -47,9 -48,8 +48,10 @@@
  #include "traceable-app.h"
  #include "ust-ctl.h"
  #include "utils.h"
+ #include "ust-comm.h"
  
 +#include "benchmark.h"
 +
  /* Const values */
  const char default_home_dir[] = DEFAULT_HOME_DIR;
  const char default_tracing_group[] = LTTNG_DEFAULT_TRACING_GROUP;
@@@ -819,20 -1043,13 +1061,25 @@@ static void *thread_registration_apps(v
  {
  	int sock = 0, ret;
  	struct pollfd pollfd[2];
+ 	/*
+ 	 * Get allocated in this thread, enqueued to a global queue, dequeued and
+ 	 * freed in the manage apps thread.
+ 	 */
+ 	struct ust_command *ust_cmd = NULL;
  
 +	tracepoint(sessiond_th_apps_start);
 +
 +	/* TODO: Something more elegant is needed but fine for now */
 +	/* FIXME: change all types to either uint8_t, uint32_t, uint64_t
 +	 * for 32-bit vs 64-bit compat processes. */
 +	/* replicate in ust with version number */
 +	struct {
 +		int reg;	/* 1:register, 0:unregister */
 +		pid_t pid;
 +		uid_t uid;
 +	} reg_msg;
 +
- 	DBG("[thread] Manage apps started");
+ 	DBG("[thread] Manage application registration started");
  
  	ret = lttcomm_listen_unix_sock(apps_sock);
  	if (ret < 0) {