From 60e51479c1109e00666075f1c3c0579e336ead36 Mon Sep 17 00:00:00 2001
From: Thijs Sassen <thijs.sassen@adlinktech.com>
Date: Tue, 14 Jan 2020 17:02:10 +0100
Subject: [PATCH] Added extra header file needed to work around an issue(see
 issue #74) when reading samples in c++ And updated dds_read_instance_mask and
 dds_take_instance_mask to work with DDS_READ_WITHOUT_LOCK

Signed-off-by: Thijs Sassen <thijs.sassen@adlinktech.com>
---
 src/core/ddsc/CMakeLists.txt                  |  1 +
 .../ddsc/include/dds/ddsc/dds_internal_api.h  | 44 +++++++++++++++++++
 src/core/ddsc/src/dds_read.c                  |  4 +-
 3 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 src/core/ddsc/include/dds/ddsc/dds_internal_api.h

diff --git a/src/core/ddsc/CMakeLists.txt b/src/core/ddsc/CMakeLists.txt
index b32a4b5..65c6c34 100644
--- a/src/core/ddsc/CMakeLists.txt
+++ b/src/core/ddsc/CMakeLists.txt
@@ -51,6 +51,7 @@ PREPEND(hdrs_public_ddsc "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include/dd
     ddsc/dds_public_qosdefs.h
     ddsc/dds_public_status.h
     ddsc/dds_rhc.h
+    ddsc/dds_internal_api.h
 )
 
 PREPEND(hdrs_private_ddsc "${CMAKE_CURRENT_LIST_DIR}/src"
diff --git a/src/core/ddsc/include/dds/ddsc/dds_internal_api.h b/src/core/ddsc/include/dds/ddsc/dds_internal_api.h
new file mode 100644
index 0000000..55c5601
--- /dev/null
+++ b/src/core/ddsc/include/dds/ddsc/dds_internal_api.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright(c) 2006 to 2020 ADLINK Technology Limited and others
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License
+ * v. 1.0 which is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+ */
+
+/** @file
+ * WARNING This file is only needed for the work around for https://github.com/eclipse-cyclonedds/cyclonedds/issues/74
+ * Do not include this file in an application! Once issue #74 is solved this header file should be removed.
+ */
+
+#ifndef DDS_INTERNAL_API_H
+#define DDS_INTERNAL_API_H
+
+#if defined (__cplusplus)
+extern "C" {
+#endif
+
+#define DDS_READ_WITHOUT_LOCK (0xFFFFFFED)
+/*
+ * @private
+ * dds_reader_lock_samples: Returns number of samples in read cache and locks the
+ * reader cache to make sure that the samples content doesn't change.
+ * Because the cache is locked, you should be able to read/take without having to
+ * lock first. This is done by passing the DDS_READ_WITHOUT_LOCK value to the
+ * read/take call as maxs. Then the read/take will not lock but still unlock.
+ *
+ * CycloneDDS doesn't support a read/take that just returns all
+ * available samples issue #74. As a work around to support LENGTH_UNLIMITED in C++.
+ * dds_reader_lock_samples() and DDS_READ_WITHOUT_LOCK are needed.
+ */
+DDS_EXPORT uint32_t
+dds_reader_lock_samples (dds_entity_t entity);
+
+#if defined (__cplusplus)
+}
+#endif
+#endif
diff --git a/src/core/ddsc/src/dds_read.c b/src/core/ddsc/src/dds_read.c
index 56047f3..3901cb0 100644
--- a/src/core/ddsc/src/dds_read.c
+++ b/src/core/ddsc/src/dds_read.c
@@ -283,7 +283,7 @@ dds_return_t dds_read_instance_mask (dds_entity_t rd_or_cnd, void **buf, dds_sam
   {
     lock = false;
     /* FIXME: Fix the interface. */
-    maxs = 100;
+    maxs = (uint32_t)bufsz;
   }
   return dds_read_impl (false, rd_or_cnd, buf, bufsz, maxs, si, mask, handle, lock, false);
 }
@@ -422,7 +422,7 @@ dds_return_t dds_take_instance_mask (dds_entity_t rd_or_cnd, void **buf, dds_sam
   {
     lock = false;
     /* FIXME: Fix the interface. */
-    maxs = 100;
+    maxs = (uint32_t)bufsz;
   }
   return dds_read_impl(true, rd_or_cnd, buf, bufsz, maxs, si, mask, handle, lock, false);
 }