From 50c8f4840cc0cf140c760159c8705592d6b434ea Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@efficios.com>
Date: Tue, 8 May 2012 15:47:53 -0400
Subject: [PATCH] Move futex.c/.h to libcommon

This is done so the future lttng-relayd and other possible binaries
could use it.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---
 src/bin/lttng-sessiond/Makefile.am         | 1 -
 src/bin/lttng-sessiond/main.c              | 3 +--
 src/common/Makefile.am                     | 4 ++--
 src/{bin/lttng-sessiond => common}/futex.c | 0
 src/{bin/lttng-sessiond => common}/futex.h | 0
 5 files changed, 3 insertions(+), 5 deletions(-)
 rename src/{bin/lttng-sessiond => common}/futex.c (100%)
 rename src/{bin/lttng-sessiond => common}/futex.h (100%)

diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am
index 8748dd6bb..e450e4515 100644
--- a/src/bin/lttng-sessiond/Makefile.am
+++ b/src/bin/lttng-sessiond/Makefile.am
@@ -12,7 +12,6 @@ lttng_sessiond_SOURCES = utils.c utils.h \
                        context.c context.h \
                        channel.c channel.h \
                        event.c event.h \
-                       futex.c futex.h \
                        shm.c shm.h \
                        session.c session.h \
                        modprobe.c modprobe.h kern-modules.h \
diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 7327c3cb2..e1b3a828b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -33,7 +33,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <urcu/futex.h>
 #include <urcu/uatomic.h>
 #include <unistd.h>
 #include <config.h>
@@ -44,12 +43,12 @@
 #include <common/defaults.h>
 #include <common/kernel-consumer/kernel-consumer.h>
 #include <common/ust-consumer/ust-consumer.h>
+#include <common/futex.h>
 
 #include "lttng-sessiond.h"
 #include "channel.h"
 #include "context.h"
 #include "event.h"
-#include "futex.h"
 #include "kernel.h"
 #include "modprobe.h"
 #include "shm.h"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5d79210b8..460f2a2de 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -4,11 +4,11 @@ SUBDIRS = compat hashtable kernel-ctl sessiond-comm kernel-consumer ust-consumer
 
 AM_CFLAGS = -fno-strict-aliasing
 
-noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h
+noinst_HEADERS = lttng-kernel.h defaults.h macros.h error.h futex.h
 
 noinst_LTLIBRARIES = libcommon.la
 
-libcommon_la_SOURCES = runas.c runas.h common.h
+libcommon_la_SOURCES = runas.c runas.h common.h futex.c futex.h
 
 # Consumer library
 noinst_LTLIBRARIES += libconsumer.la
diff --git a/src/bin/lttng-sessiond/futex.c b/src/common/futex.c
similarity index 100%
rename from src/bin/lttng-sessiond/futex.c
rename to src/common/futex.c
diff --git a/src/bin/lttng-sessiond/futex.h b/src/common/futex.h
similarity index 100%
rename from src/bin/lttng-sessiond/futex.h
rename to src/common/futex.h
-- 
2.34.1