From: David Goulet <david.goulet@polymtl.ca>
Date: Thu, 29 Sep 2011 20:29:48 +0000 (-0400)
Subject: Merge branch 'master' into benchmark
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4f58e6273aa4799c0d7f40bad34398ff8e118c5c;p=lttng-tools.git

Merge branch 'master' into benchmark

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

4f58e6273aa4799c0d7f40bad34398ff8e118c5c
diff --cc configure.ac
index e445a3278,b38b0e2ea..b4accb0e5
--- a/configure.ac
+++ b/configure.ac
@@@ -25,16 -25,10 +25,15 @@@ AC_CHECK_LIB([popt], [poptGetContext], 
  	[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
  )
  
- # Check liburcu list.h, wfqueue.h, futex.h
- AC_CHECK_DECL([cds_list_add], [],
- 	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
- )
- 
- # Check liburcu
++# Needed for benchmark time
 +AC_CHECK_DECL([caa_get_cycles], [],
 +	[AC_MSG_ERROR([liburcu liburcu_version or newer is needed])], [[#include <urcu/arch.h>]]
 +)
 +
+ # Check liburcu needed function calls
+ AC_CHECK_DECL([cds_list_add], [],
+ 	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]]
+ )
  AC_CHECK_DECL([cds_wfq_init], [],
  	[AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
  )
diff --cc ltt-sessiond/main.c
index 16067d354,e1bf1e416..07a4ba6de
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@@ -1021,11 -984,9 +1021,11 @@@ static void *thread_manage_apps(void *d
  						perror("read apps cmd pipe");
  						goto error;
  					}
 +					tracepoint(ust_register_read_stop);
  
 +					tracepoint(ust_register_add_start);
  					/* Register applicaton to the session daemon */
- 					ret = register_traceable_app(&ust_cmd.reg_msg,
+ 					ret = ust_app_register(&ust_cmd.reg_msg,
  							ust_cmd.sock);
  					if (ret < 0) {
  						/* Only critical ENOMEM error can be returned here */