From 8ba489eef351aab4ff12472ea055dfc5040723c7 Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <patrick.pelissier@gmail.com>
Date: Sat, 15 Aug 2020 14:47:58 +0200
Subject: [PATCH] Add macros SNAPSHOT_SPSC_DEF_AS SNAPSHOT_SPMC_DEF_AS
 SNAPSHOT_MPMC_DEF_AS

---
 m-snapshot.h           | 33 +++++++++++++++++++++++++++++++
 tests/test-msnapshot.c | 45 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/m-snapshot.h b/m-snapshot.h
index e6e97440..d0f418af 100644
--- a/m-snapshot.h
+++ b/m-snapshot.h
@@ -41,6 +41,17 @@ M_BEGIN_PROTECTED_CODE
   M_END_PROTECTED_CODE
 
 
+/* Define a Single Producer Single Consummer snapshot and its functions
+   as the given name name_t
+   USAGE: SNAPSHOT_SPSC_DEF_AS(name, name_t, type[, oplist]) */
+#define SNAPSHOT_SPSC_DEF_AS(name, name_t, ...)                         \
+  M_BEGIN_PROTECTED_CODE                                                \
+  SNAPSHOTI_SPSC_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__)                     \
+                        ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), name_t ), \
+                         (name, __VA_ARGS__                                       , name_t ))) \
+  M_END_PROTECTED_CODE
+
+
 /* Define a Single Producer Multiple Consummer snapshot and its functions
    USAGE: SNAPSHOT_SPMC_DEF(name, type[, oplist]) */
 #define SNAPSHOT_SPMC_DEF(name, ...)                                    \
@@ -51,6 +62,17 @@ M_BEGIN_PROTECTED_CODE
   M_END_PROTECTED_CODE
 
 
+/* Define a Single Producer Multiple Consummer snapshot and its functions
+   as the given name name_t
+   USAGE: SNAPSHOT_SPMC_DEF_AS(name, type[, oplist]) */
+#define SNAPSHOT_SPMC_DEF_AS(name, name_t, ...)                         \
+  M_BEGIN_PROTECTED_CODE                                                \
+  SNAPSHOTI_SPMC_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__)                     \
+                        ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), name_t ), \
+                         (name, __VA_ARGS__                                       , name_t ))) \
+  M_END_PROTECTED_CODE
+
+
 /* Define a Multiple Producer Multiple Consummer snapshot and its functions
    USAGE: SNAPSHOT_MPMC_DEF(name, type[, oplist]) */
 #define SNAPSHOT_MPMC_DEF(name, ...)                                    \
@@ -61,6 +83,17 @@ M_BEGIN_PROTECTED_CODE
   M_END_PROTECTED_CODE
 
 
+/* Define a Multiple Producer Multiple Consummer snapshot and its functions
+   as the given name name_t
+   USAGE: SNAPSHOT_MPMC_DEF_AS(name, name_t, type[, oplist]) */
+#define SNAPSHOT_MPMC_DEF_AS(name, name_t, ...)                         \
+  M_BEGIN_PROTECTED_CODE                                                \
+  SNAPSHOTI_MPMC_DEF_P1(M_IF_NARGS_EQ1(__VA_ARGS__)                     \
+                        ((name, __VA_ARGS__, M_GLOBAL_OPLIST_OR_DEF(__VA_ARGS__)(), name_t ), \
+                         (name, __VA_ARGS__                                       , name_t ))) \
+  M_END_PROTECTED_CODE
+
+
 /* Define the oplist of a snapshot (SPSC, SPMC or MPMC).
    USAGE: SNAPSHOT_OPLIST(name[, oplist]) */
 #define SNAPSHOT_OPLIST(...)                                            \
diff --git a/tests/test-msnapshot.c b/tests/test-msnapshot.c
index eb15bb4f..b00555bf 100644
--- a/tests/test-msnapshot.c
+++ b/tests/test-msnapshot.c
@@ -53,8 +53,12 @@ SNAPSHOT_SPSC_DEF(snapshot_mpz, testobj_t, TESTOBJ_OPLIST)
 SNAPSHOT_SPMC_DEF(snapshot_mrsw_data, data_t, DATA_OPLIST)
 SNAPSHOT_MPMC_DEF(snapshot_mrmw_data, data_t, DATA_OPLIST)
 END_COVERAGE
+
 SNAPSHOT_SPSC_DEF(snapshot_data, data_t, DATA_OPLIST )
 
+SNAPSHOT_SPSC_DEF_AS(SnapshotDouble, SnapshotDouble, double)
+SNAPSHOT_SPMC_DEF_AS(SnapshotDoubleSPMC, SnapshotDoubleSPMC, double)
+SNAPSHOT_MPMC_DEF_AS(SnapshotDoubleMPMC, SnapshotDoubleMPMC, double)
 
 static void test_uint(void)
 {
@@ -341,6 +345,44 @@ static void test_mrmw_global(int reader, int writer)
   snapshot_mrmw_data_clear(global_mrmw);
 }
 
+static void test_double(void)
+{
+  SnapshotDouble s;
+  SnapshotDouble_init(s);
+  double *p = SnapshotDouble_get_write_buffer(s);
+  *p = 42.0;
+  p = SnapshotDouble_write(s);
+  const double *q = SnapshotDouble_read(s);
+  assert (*q == 42.0);
+  SnapshotDouble_clear(s);
+}
+
+static void test_doubleSPMC(void)
+{
+  SnapshotDoubleSPMC s;
+  SnapshotDoubleSPMC_init(s, 1);
+  double *p = SnapshotDoubleSPMC_get_write_buffer(s);
+  *p = 42.0;
+  p = SnapshotDoubleSPMC_write(s);
+  const double *q = SnapshotDoubleSPMC_read_start(s);
+  assert (*q == 42.0);
+  SnapshotDoubleSPMC_read_end(s, q);
+  SnapshotDoubleSPMC_clear(s);
+}
+
+static void test_doubleMPMC(void)
+{
+  SnapshotDoubleMPMC s;
+  SnapshotDoubleMPMC_init(s, 1, 1);
+  double *p = SnapshotDoubleMPMC_write_start(s);
+  *p = 42.0;
+  SnapshotDoubleMPMC_write_end(s, p);
+  const double *q = SnapshotDoubleMPMC_read_start(s);
+  assert (*q == 42.0);
+  SnapshotDoubleMPMC_read_end(s, q);
+  SnapshotDoubleMPMC_clear(s);
+}
+
 int main(void)
 {
   test_uint();
@@ -353,6 +395,9 @@ int main(void)
   test_mrsw_global(MAX_READER);
   test_mrmw_global(1, 1);
   test_mrmw_global(MAX_READER/4, MAX_WRITER/4);
+  test_double();
+  test_doubleSPMC();
+  test_doubleMPMC();
   exit(0);
 }