Fix: Move rand-compat to private src dir

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 61301c20808ddb31a066edfd7ae9e18903b94d15..2792f9956b480ffd98ae7046091cffae0223a496 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -7,7 +7,6 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \
                urcu/lfstack.h urcu/syscall-compat.h \
                $(top_srcdir)/include/urcu/map/*.h \
                $(top_srcdir)/include/urcu/static/*.h \
-               urcu/rand-compat.h \
                urcu/tls-compat.h urcu/debug.h
 
 # Don't distribute generated headers

diff --git a/include/urcu/rand-compat.h b/include/urcu/rand-compat.h
deleted file mode 100644 (file)
index 2c57751..0000000
--- a/include/urcu/rand-compat.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef _URCU_RAND_COMPAT_H
-#define _URCU_RAND_COMPAT_H
-
-/*
- * urcu/rand-compat.h
- *
- * Userspace RCU library - rand/rand_r Compatibility Header
- *
- * Copyright 1996 - Ulrich Drepper <drepper@cygnus.com >
- * Copyright 2013 - Pierre-Luc St-Charles <pierre-luc.st-charles@polymtl.ca>
- *
- * Note: this file is only used to simplify the code required to
- * use the 'rand_r(...)' system function across multiple platforms,
- * which might not always be referenced the same way.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifdef __ANDROID__
-/*
- * Reentrant random function from POSIX.1c.
- * Copyright (C) 1996, 1999 Free Software Foundation, Inc.
- * This file is part of the GNU C Library.
- * Contributed by Ulrich Drepper <drepper@cygnus.com <mailto:drepper@cygnus.com>>, 1996.
- */
-static inline int rand_r(unsigned int *seed)
-{
-       unsigned int next = *seed;
-       int result;
-
-       next *= 1103515245;
-       next += 12345;
-       result = (unsigned int) (next / 65536) % 2048;
-
-       next *= 1103515245;
-       next += 12345;
-       result <<= 10;
-       result ^= (unsigned int) (next / 65536) % 1024;
-
-       next *= 1103515245;
-       next += 12345;
-       result <<= 10;
-       result ^= (unsigned int) (next / 65536) % 1024;
-
-       *seed = next;
-
-       return result;
-}
-#endif /* __ANDROID__ */
-
-#endif /* _URCU_RAND_COMPAT_H */

diff --git a/include/urcu/static/urcu.h b/include/urcu/static/urcu.h
index 9082af71a92c443dd0efe8be74d879c55dd56ddd..7048f9938a6eeb31a7a441ee762219e35d11fc4c 100644 (file)
--- a/include/urcu/static/urcu.h
+++ b/include/urcu/static/urcu.h
@@ -41,7 +41,6 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
-#include <urcu/rand-compat.h>
 #include <urcu/debug.h>
 
 #ifdef __cplusplus

diff --git a/src/Makefile.am b/src/Makefile.am
index e7eb2bceb62a0e27adee4ac8b4c83515e3ec5887..6a2fd7a54a7646e8e496b1280c09d03766311f1b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,8 @@ AM_CFLAGS=-Wall
 include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \
                urcu-pointer.h urcu-qsbr.h urcu-flavor.h
 
-dist_noinst_HEADERS = urcu-die.h urcu-wait.h compat-getcpu.h
+dist_noinst_HEADERS = urcu-die.h urcu-wait.h compat-getcpu.h \
+       compat-rand.h
 
 
 if COMPAT_ARCH

diff --git a/src/compat-rand.h b/src/compat-rand.h
new file mode 100644 (file)
index 0000000..7c6acde
--- /dev/null
+++ b/src/compat-rand.h
@@ -0,0 +1,63 @@
+#ifndef _COMPAT_RAND_H
+#define _COMPAT_RAND_H
+
+/*
+ * compat-rand.h
+ *
+ * Userspace RCU library - rand/rand_r Compatibility Header
+ *
+ * Copyright 1996 - Ulrich Drepper <drepper@cygnus.com >
+ * Copyright 2013 - Pierre-Luc St-Charles <pierre-luc.st-charles@polymtl.ca>
+ *
+ * Note: this file is only used to simplify the code required to
+ * use the 'rand_r(...)' system function across multiple platforms,
+ * which might not always be referenced the same way.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifdef __ANDROID__
+/*
+ * Reentrant random function from POSIX.1c.
+ * Copyright (C) 1996, 1999 Free Software Foundation, Inc.
+ * This file is part of the GNU C Library.
+ * Contributed by Ulrich Drepper <drepper@cygnus.com <mailto:drepper@cygnus.com>>, 1996.
+ */
+static inline int rand_r(unsigned int *seed)
+{
+       unsigned int next = *seed;
+       int result;
+
+       next *= 1103515245;
+       next += 12345;
+       result = (unsigned int) (next / 65536) % 2048;
+
+       next *= 1103515245;
+       next += 12345;
+       result <<= 10;
+       result ^= (unsigned int) (next / 65536) % 1024;
+
+       next *= 1103515245;
+       next += 12345;
+       result <<= 10;
+       result ^= (unsigned int) (next / 65536) % 1024;
+
+       *seed = next;
+
+       return result;
+}
+#endif /* __ANDROID__ */
+
+#endif /* _COMPAT_RAND_H */

diff --git a/tests/benchmark/test_urcu_hash.h b/tests/benchmark/test_urcu_hash.h
index f2e23f2975824870f9c30ba0ad77303b8b080806..2f708a115cd412bf620cbeda9e1b068b1c399b48 100644 (file)
--- a/tests/benchmark/test_urcu_hash.h
+++ b/tests/benchmark/test_urcu_hash.h
@@ -36,7 +36,7 @@
 #include <signal.h>
 
 #include <urcu/tls-compat.h>
-#include <urcu/rand-compat.h>
+#include <compat-rand.h>
 #include "cpuset.h"
 #include "thread-id.h"
 #include "../common/debug-yield.h"

diff --git a/tests/common/debug-yield.h b/tests/common/debug-yield.h
index c60e4e0eb1c272b9dbf5db9691c7e2fce9cd06d0..b48561c4589fdc82e1e79aaaa107cfb999d10756 100644 (file)
--- a/tests/common/debug-yield.h
+++ b/tests/common/debug-yield.h
@@ -31,6 +31,8 @@
 #include <pthread.h>
 #include <unistd.h>
 
+#include <compat-rand.h>
+
 #define RCU_YIELD_READ         (1 << 0)
 #define RCU_YIELD_WRITE        (1 << 1)