record: Introduce <rtems/recordserver.h>

This helps to get rid of the <rtems/rtems/tasks.h> dependency in
<rtems/record.h>.

Update #3665.

5 files changed, 82 insertions, 34 deletions

diff --git a/cpukit/headers.am b/cpukit/headers.am
index c9fe38acf3..008b7ccbe5 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -140,6 +140,7 @@ include_rtems_HEADERS += include/rtems/rbtree.h
 include_rtems_HEADERS += include/rtems/record.h
 include_rtems_HEADERS += include/rtems/recordclient.h
 include_rtems_HEADERS += include/rtems/recorddata.h
+include_rtems_HEADERS += include/rtems/recordserver.h
 include_rtems_HEADERS += include/rtems/ringbuf.h
 include_rtems_HEADERS += include/rtems/rtc.h
 include_rtems_HEADERS += include/rtems/rtems-debugger-remote-tcp.h
diff --git a/cpukit/include/rtems/record.h b/cpukit/include/rtems/record.h
index 1f83b2995d..ff1ee22b0d 100644
--- a/cpukit/include/rtems/record.h
+++ b/cpukit/include/rtems/record.h
@@ -35,7 +35,6 @@
 #include <rtems/score/percpu.h>
 #include <rtems/score/watchdog.h>
 #include <rtems/rtems/intr.h>
-#include <rtems/rtems/tasks.h>
 #include <rtems/counter.h>
 
 #ifdef __cplusplus
@@ -291,39 +290,6 @@ typedef void ( *rtems_record_drain_visitor )(
  */
 void rtems_record_drain( rtems_record_drain_visitor visitor, void *arg );
 
-/**
- * @brief Drains the record items on all processors an writes them to the file
- * descriptor.
- *
- * @param fd The file descriptor.
- * @param written Set to true if items were written to the file descriptor,
- *   otherwise set to false.
- *
- * @retval The bytes written to the file descriptor.
- */
-ssize_t rtems_record_writev( int fd, bool *written );
-
-/**
- * @brief Runs a record TCP server loop.
- *
- * @param port The TCP port to listen in host byte order.
- * @param period The drain period in clock ticks.
- */
-void rtems_record_server( uint16_t port, rtems_interval period );
-
-/**
- * @brief Starts a record TCP server task.
- *
- * @param priority The task priority.
- * @param port The TCP port to listen in host byte order.
- * @param period The drain period in clock ticks.
- */
-rtems_status_code rtems_record_start_server(
-  rtems_task_priority priority,
-  uint16_t            port,
-  rtems_interval      period
-);
-
 /** @} */
 
 #ifdef __cplusplus
diff --git a/cpukit/include/rtems/recordserver.h b/cpukit/include/rtems/recordserver.h
new file mode 100644
index 0000000000..2c04ea65cb
--- /dev/null
+++ b/cpukit/include/rtems/recordserver.h
@@ -0,0 +1,79 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (C) 2018, 2019 embedded brains GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTEMS_RECORDSERVER_H
+#define _RTEMS_RECORDSERVER_H
+
+#include "recorddata.h"
+
+#include <sys/types.h>
+#include <rtems.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @brief Drains the record items on all processors an writes them to the file
+ * descriptor.
+ *
+ * @param fd The file descriptor.
+ * @param written Set to true if items were written to the file descriptor,
+ *   otherwise set to false.
+ *
+ * @retval The bytes written to the file descriptor.
+ */
+ssize_t rtems_record_writev( int fd, bool *written );
+
+/**
+ * @brief Runs a record TCP server loop.
+ *
+ * @param port The TCP port to listen in host byte order.
+ * @param period The drain period in clock ticks.
+ */
+void rtems_record_server( uint16_t port, rtems_interval period );
+
+/**
+ * @brief Starts a record TCP server task.
+ *
+ * @param priority The task priority.
+ * @param port The TCP port to listen in host byte order.
+ * @param period The drain period in clock ticks.
+ */
+rtems_status_code rtems_record_start_server(
+  rtems_task_priority priority,
+  uint16_t            port,
+  rtems_interval      period
+);
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _RTEMS_RECORDSERVER_H */
diff --git a/cpukit/libtrace/record/record-server.c b/cpukit/libtrace/record/record-server.c
index d1f299dbdb..e19f889d8d 100644
--- a/cpukit/libtrace/record/record-server.c
+++ b/cpukit/libtrace/record/record-server.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include <rtems/recordserver.h>
 #include <rtems/record.h>
 #include <rtems/score/threadimpl.h>
 #include <rtems.h>
diff --git a/testsuites/libtests/record01/init.c b/testsuites/libtests/record01/init.c
index cb4cf451c9..e8ff23694d 100644
--- a/testsuites/libtests/record01/init.c
+++ b/testsuites/libtests/record01/init.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <rtems/record.h>
+#include <rtems/recordserver.h>
 #include <rtems.h>
 
 #include <sys/endian.h>