From: Mike Schonberg <mschonberg@...>
These inline asm functions are os depenent.
Signed-off-by: Mike Schonberg <mschonberg@...>
---
common/c_cpp/configure.ac | 1 +
common/c_cpp/src/c/linux/wInterlocked.h | 142 ++++++++++++++++++++++++++++++
common/c_cpp/src/c/wombat/wInterlocked.h | 142 ------------------------------
3 files changed, 143 insertions(+), 142 deletions(-)
create mode 100644 common/c_cpp/src/c/linux/wInterlocked.h
delete mode 100644 common/c_cpp/src/c/wombat/wInterlocked.h
diff --git a/common/c_cpp/configure.ac b/common/c_cpp/configure.ac
index 115602e..ab991b4 100755
--- a/common/c_cpp/configure.ac
+++ b/common/c_cpp/configure.ac
@@ -47,6 +47,7 @@ AC_CANONICAL_BUILD()
AC_MSG_NOTICE([Configuring symbolic links for $build_os in $srcdir])
case $build_os in
linux*-*) AC_CONFIG_LINKS([src/c/port.h:src/c/linux/port.h
+ src/c/wombat/wInterlocked.h:src/c/linux/wInterlocked.h
src/c/machine_port.c:src/c/linux/machine.c
src/c/platform.c:src/c/linux/platform.c
src/c/wSemaphore.c:src/c/linux/wSemaphore.c
diff --git a/common/c_cpp/src/c/linux/wInterlocked.h b/common/c_cpp/src/c/linux/wInterlocked.h
new file mode 100644
index 0000000..c128804
--- /dev/null
+++ b/common/c_cpp/src/c/linux/wInterlocked.h
@@ -0,0 +1,142 @@
+/* $Id: wInterlocked.h,v 1.1.2.6.8.3 2011/08/10 14:53:24 nicholasmarriott Exp $
+ *
+ * OpenMAMA: The open middleware agnostic messaging API
+ * Copyright (C) 2011 NYSE Inc.
+ *
+ * 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
+ */
+
+#ifndef _WOMBAT_WINTERLOCKED_H
+#define _WOMBAT_WINTERLOCKED_H
+
+/*
+ * This file contains a set of interlock functions for atomic access on scalar
+ * variables.
+ */
+
+#include "wCommon.h"
+
+/* *************************************************** */
+/* Linux implementation. */
+/* *************************************************** */
+
+/* 32-bit atomic exchange. Returns previous value. */
+static __inline__ uint32_t
+axchg32 (uint32_t* ptr, uint32_t newVal)
+{
+ __asm__ volatile ("xchgl %k0, %1"
+ : "=r" (newVal)
+ : "m" (*ptr), "0" (newVal)
+ : "memory");
+ return newVal;
+}
+
+/* 32-bit atomic increment. */
+static __inline__ void
+ainc32 (uint32_t* ptr)
+{
+ __asm__ volatile ("lock; incl %0"
+ : "=m" (*ptr)
+ : "m" (*ptr));
+}
+
+/* 32-bit atomic decrement. */
+static __inline__ void
+adec32 (uint32_t* ptr)
+{
+ __asm__ volatile ("lock; decl %0"
+ : "=m" (*ptr)
+ : "m" (*ptr));
+}
+
+/* *************************************************** */
+/* Type Defines. */
+/* *************************************************** */
+/* The structure on linux. */
+typedef uint32_t wInterlockedInt;
+
+/**
+ * This function will initialise a wInterlockedInt.
+ *
+ * @param[in] value Pointer to the item to be initialized.
+ * @return 0 on success.
+ */
+
+WCOMMONINLINE int wInterlocked_initialize(wInterlockedInt *value)
+{
+ return 0;
+}
+
+/**
+ * This function will destroy a wInterlockedInt.
+ *
+ * @param[in] value Pointer to the item to be destroyed.
+ * @return 0 on success.
+ */
+WCOMMONINLINE int wInterlocked_destroy(wInterlockedInt *value)
+{
+ return 0;
+}
+
+/**
+ * This function will atomically decrement a 32-bit integer value.
+ *
+ * @param[in] value Pointer to the value to be decremented.
+ * @return The decremented integer.
+ */
+WCOMMONINLINE int wInterlocked_decrement(wInterlockedInt *value)
+{
+ adec32(value);
+ return (int)*value;
+}
+
+/**
+ * This function will atomically increment a 32-bit integer value.
+ *
+ * @param[in] value Pointer to the value to be incremented.
+ * @return The incremented integer.
+ */
+WCOMMONINLINE int wInterlocked_increment(wInterlockedInt *value)
+{
+ ainc32(value);
+ return (int)*value;
+}
+
+/**
+ * This function will return the value of the interlocked variable.
+ *
+ * @param[in] value Pointer to the value to be read.
+ * @return The value itself.
+ */
+WCOMMONINLINE int wInterlocked_read(wInterlockedInt *value)
+{
+ return (int)*value;
+}
+
+/**
+ * This function will atomically set a 32-bit integer value.
+ *
+ * @param[in] newValue The new value to set.
+ * @param[in] value Pointer to the value to be set.
+ * @return The updated integer.
+ */
+WCOMMONINLINE int wInterlocked_set(int newValue, wInterlockedInt *value)
+{
+ axchg32(value, (uint32_t)newValue);
+ return (int)*value;
+}
+
+#endif /* _WOMBAT_WINTERLOCKED_H */
diff --git a/common/c_cpp/src/c/wombat/wInterlocked.h b/common/c_cpp/src/c/wombat/wInterlocked.h
deleted file mode 100644
index c128804..0000000
--- a/common/c_cpp/src/c/wombat/wInterlocked.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* $Id: wInterlocked.h,v 1.1.2.6.8.3 2011/08/10 14:53:24 nicholasmarriott Exp $
- *
- * OpenMAMA: The open middleware agnostic messaging API
- * Copyright (C) 2011 NYSE Inc.
- *
- * 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
- */
-
-#ifndef _WOMBAT_WINTERLOCKED_H
-#define _WOMBAT_WINTERLOCKED_H
-
-/*
- * This file contains a set of interlock functions for atomic access on scalar
- * variables.
- */
-
-#include "wCommon.h"
-
-/* *************************************************** */
-/* Linux implementation. */
-/* *************************************************** */
-
-/* 32-bit atomic exchange. Returns previous value. */
-static __inline__ uint32_t
-axchg32 (uint32_t* ptr, uint32_t newVal)
-{
- __asm__ volatile ("xchgl %k0, %1"
- : "=r" (newVal)
- : "m" (*ptr), "0" (newVal)
- : "memory");
- return newVal;
-}
-
-/* 32-bit atomic increment. */
-static __inline__ void
-ainc32 (uint32_t* ptr)
-{
- __asm__ volatile ("lock; incl %0"
- : "=m" (*ptr)
- : "m" (*ptr));
-}
-
-/* 32-bit atomic decrement. */
-static __inline__ void
-adec32 (uint32_t* ptr)
-{
- __asm__ volatile ("lock; decl %0"
- : "=m" (*ptr)
- : "m" (*ptr));
-}
-
-/* *************************************************** */
-/* Type Defines. */
-/* *************************************************** */
-/* The structure on linux. */
-typedef uint32_t wInterlockedInt;
-
-/**
- * This function will initialise a wInterlockedInt.
- *
- * @param[in] value Pointer to the item to be initialized.
- * @return 0 on success.
- */
-
-WCOMMONINLINE int wInterlocked_initialize(wInterlockedInt *value)
-{
- return 0;
-}
-
-/**
- * This function will destroy a wInterlockedInt.
- *
- * @param[in] value Pointer to the item to be destroyed.
- * @return 0 on success.
- */
-WCOMMONINLINE int wInterlocked_destroy(wInterlockedInt *value)
-{
- return 0;
-}
-
-/**
- * This function will atomically decrement a 32-bit integer value.
- *
- * @param[in] value Pointer to the value to be decremented.
- * @return The decremented integer.
- */
-WCOMMONINLINE int wInterlocked_decrement(wInterlockedInt *value)
-{
- adec32(value);
- return (int)*value;
-}
-
-/**
- * This function will atomically increment a 32-bit integer value.
- *
- * @param[in] value Pointer to the value to be incremented.
- * @return The incremented integer.
- */
-WCOMMONINLINE int wInterlocked_increment(wInterlockedInt *value)
-{
- ainc32(value);
- return (int)*value;
-}
-
-/**
- * This function will return the value of the interlocked variable.
- *
- * @param[in] value Pointer to the value to be read.
- * @return The value itself.
- */
-WCOMMONINLINE int wInterlocked_read(wInterlockedInt *value)
-{
- return (int)*value;
-}
-
-/**
- * This function will atomically set a 32-bit integer value.
- *
- * @param[in] newValue The new value to set.
- * @param[in] value Pointer to the value to be set.
- * @return The updated integer.
- */
-WCOMMONINLINE int wInterlocked_set(int newValue, wInterlockedInt *value)
-{
- axchg32(value, (uint32_t)newValue);
- return (int)*value;
-}
-
-#endif /* _WOMBAT_WINTERLOCKED_H */
--
1.7.7.6
