Add publication token config (#267)

eclipse-zenoh · Oct 23, 2023 · 5bd1370 · 5bd1370
1 parent 5a1e59f
commit 5bd1370
Show file tree

Hide file tree

Showing 28 changed files with 398 additions and 288 deletions.
diff --git a/examples/arduino/z_pub.ino b/examples/arduino/z_pub.ino
@@ -16,6 +16,7 @@
 #include <WiFi.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 // WiFi-specific parameters
 #define SSID "SSID"
 #define PASS "PASS"
@@ -107,3 +108,9 @@ void loop() {
 
     delay(1000);
 }
+#else
+void setup() {
+    Serial.println("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.");
+}
+void loop() {}
+#endif
diff --git a/examples/espidf/z_pub.c b/examples/espidf/z_pub.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 #define ESP_WIFI_SSID "SSID"
 #define ESP_WIFI_PASS "PASS"
 #define ESP_MAXIMUM_RETRY 5
@@ -163,3 +164,8 @@ void app_main() {
     z_close(z_move(s));
     printf("OK!\n");
 }
+#else
+void app_main() {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+}
+#endif
diff --git a/examples/mbed/z_pub.cpp b/examples/mbed/z_pub.cpp
@@ -16,6 +16,7 @@
 #include <randLIB.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 #define CLIENT_OR_PEER 0  // 0: Client mode; 1: Peer mode
 #if CLIENT_OR_PEER == 0
 #define MODE "client"
@@ -85,3 +86,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c11/z_ping.c b/examples/unix/c11/z_ping.c
@@ -21,7 +21,7 @@
 #include "zenoh-pico.h"
 #include "zenoh-pico/system/platform.h"
 
-#if Z_FEATURE_SUBSCRIPTION == 1
+#if Z_FEATURE_SUBSCRIPTION == 1 && Z_FEATURE_PUBLICATION == 1
 // WARNING: for the sake of this example we are using "internal" structs and functions (starting with "_").
 //          Synchronisation primitives are planned to be added to the API in the future.
 _z_condvar_t cond;
@@ -168,7 +168,9 @@ struct args_t parse_args(int argc, char** argv) {
 }
 #else
 int main(void) {
-    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    printf(
+        "ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION or Z_FEATURE_PUBLICATION but this example "
+        "requires them.\n");
     return -1;
 }
 #endif
diff --git a/examples/unix/c11/z_pong.c b/examples/unix/c11/z_pong.c
@@ -15,7 +15,7 @@
 #include "stdio.h"
 #include "zenoh-pico.h"
 
-#if Z_FEATURE_SUBSCRIPTION == 1
+#if Z_FEATURE_SUBSCRIPTION == 1 && Z_FEATURE_PUBLICATION == 1
 void callback(const z_sample_t* sample, void* context) {
     z_publisher_t pub = z_loan(*(z_owned_publisher_t*)context);
     z_publisher_put(pub, sample->payload.start, sample->payload.len, NULL);
@@ -71,7 +71,9 @@ int main(int argc, char** argv) {
 }
 #else
 int main(void) {
-    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    printf(
+        "ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION or Z_FEATURE_PUBLICATION but this example "
+        "requires them.\n");
     return -1;
 }
 #endif
diff --git a/examples/unix/c11/z_pub.c b/examples/unix/c11/z_pub.c
@@ -22,6 +22,7 @@
 
 #include "zenoh-pico/system/platform.h"
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     const char *keyexpr = "demo/example/zenoh-pico-pub";
     char *const default_value = "Pub from Pico!";
@@ -117,3 +118,9 @@ int main(int argc, char **argv) {
     }
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c11/z_pub_st.c b/examples/unix/c11/z_pub_st.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     const char *keyexpr = "demo/example/zenoh-pico-pub";
     const char *value = "Pub from Pico!";
@@ -103,3 +104,9 @@ int main(int argc, char **argv) {
     free(buf);
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c11/z_put.c b/examples/unix/c11/z_put.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     const char *keyexpr = "demo/example/zenoh-pico-put";
     const char *value = "Pub from Pico!";
@@ -101,3 +102,9 @@ int main(int argc, char **argv) {
     z_close(z_move(s));
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c99/z_ping.c b/examples/unix/c99/z_ping.c
@@ -22,7 +22,7 @@
 #include "zenoh-pico/api/primitives.h"
 #include "zenoh-pico/system/platform.h"
 
-#if Z_FEATURE_SUBSCRIPTION == 1
+#if Z_FEATURE_SUBSCRIPTION == 1 && Z_FEATURE_PUBLICATION == 1
 _z_condvar_t cond;
 _z_mutex_t mutex;
 
@@ -168,7 +168,9 @@ struct args_t parse_args(int argc, char** argv) {
 }
 #else
 int main(void) {
-    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    printf(
+        "ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION or Z_FEATURE_PUBLICATION but this example "
+        "requires them.\n");
     return -1;
 }
 #endif
diff --git a/examples/unix/c99/z_pong.c b/examples/unix/c99/z_pong.c
@@ -16,7 +16,7 @@
 #include "zenoh-pico.h"
 #include "zenoh-pico/api/primitives.h"
 
-#if Z_FEATURE_SUBSCRIPTION == 1
+#if Z_FEATURE_SUBSCRIPTION == 1 && Z_FEATURE_PUBLICATION == 1
 void callback(const z_sample_t* sample, void* context) {
     z_publisher_t pub = z_publisher_loan((z_owned_publisher_t*)context);
     z_publisher_put(pub, sample->payload.start, sample->payload.len, NULL);
@@ -45,7 +45,14 @@ int main(int argc, char** argv) {
         printf("Unable to start read and lease tasks");
         return -1;
     }
-
+#else
+int main(void) {
+    printf(
+        "ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION or Z_FEATURE_PUBLICATION but this example "
+        "requires them.\n");
+    return -1;
+}
+#endif
     z_keyexpr_t pong = z_keyexpr_unchecked("test/pong");
     z_owned_publisher_t pub = z_declare_publisher(z_session_loan(&session), pong, NULL);
     if (!z_publisher_check(&pub)) {
@@ -74,7 +81,9 @@ int main(int argc, char** argv) {
 }
 #else
 int main(void) {
-    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    printf(
+        "ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION or Z_FEATURE_PUBLICATION but this example "
+        "requires them.\n");
     return -1;
 }
 #endif
diff --git a/examples/unix/c99/z_pub.c b/examples/unix/c99/z_pub.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     const char *keyexpr = "demo/example/zenoh-pico-pub";
     const char *value = "Pub from Pico!";
@@ -106,3 +107,9 @@ int main(int argc, char **argv) {
     free(buf);
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c99/z_pub_st.c b/examples/unix/c99/z_pub_st.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     const char *keyexpr = "demo/example/zenoh-pico-pub";
     const char *value = "Pub from Pico!";
@@ -103,3 +104,9 @@ int main(int argc, char **argv) {
     free(buf);
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/unix/c99/z_put.c b/examples/unix/c99/z_put.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     const char *keyexpr = "demo/example/zenoh-pico-put";
     const char *value = "Pub from Pico!";
@@ -101,3 +102,9 @@ int main(int argc, char **argv) {
     z_close(z_session_move(&s));
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/windows/z_ping.c b/examples/windows/z_ping.c
@@ -21,7 +21,7 @@
 #include "zenoh-pico.h"
 #include "zenoh-pico/system/platform.h"
 
-#if Z_FEATURE_SUBSCRIPTION == 1
+#if Z_FEATURE_SUBSCRIPTION == 1 && Z_FEATURE_PUBLICATION == 1
 _z_condvar_t cond;
 _z_mutex_t mutex;
 
@@ -165,7 +165,9 @@ struct args_t parse_args(int argc, char** argv) {
 }
 #else
 int main(void) {
-    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    printf(
+        "ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION or Z_FEATURE_PUBLICATION but this example "
+        "requires them.\n");
     return -1;
 }
 #endif
diff --git a/examples/windows/z_pong.c b/examples/windows/z_pong.c
@@ -15,7 +15,7 @@
 #include "stdio.h"
 #include "zenoh-pico.h"
 
-#if Z_FEATURE_SUBSCRIPTION == 1
+#if Z_FEATURE_SUBSCRIPTION == 1 && Z_FEATURE_PUBLICATION == 1
 void callback(const z_sample_t* sample, void* context) {
     z_publisher_t pub = z_loan(*(z_owned_publisher_t*)context);
     z_publisher_put(pub, sample->payload.start, sample->payload.len, NULL);
@@ -71,7 +71,9 @@ int main(int argc, char** argv) {
 }
 #else
 int main(void) {
-    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION but this example requires it.\n");
+    printf(
+        "ERROR: Zenoh pico was compiled without Z_FEATURE_SUBSCRIPTION or Z_FEATURE_PUBLICATION but this example "
+        "requires them.\n");
     return -1;
 }
 #endif
diff --git a/examples/windows/z_pub.c b/examples/windows/z_pub.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     (void)(argc);
     (void)(argv);
@@ -74,3 +75,9 @@ int main(int argc, char **argv) {
     free(buf);
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/windows/z_pub_st.c b/examples/windows/z_pub_st.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     (void)(argc);
     (void)(argv);
@@ -70,3 +71,9 @@ int main(int argc, char **argv) {
     free(buf);
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/windows/z_put.c b/examples/windows/z_put.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <zenoh-pico.h>
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     (void)(argc);
     (void)(argv);
@@ -68,3 +69,9 @@ int main(int argc, char **argv) {
     z_close(z_move(s));
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif
diff --git a/examples/zephyr/z_pub.c b/examples/zephyr/z_pub.c
@@ -31,6 +31,7 @@
 #define KEYEXPR "demo/example/zenoh-pico-pub"
 #define VALUE "[STSTM32]{nucleo-F767ZI} Pub from Zenoh-Pico!"
 
+#if Z_FEATURE_PUBLICATION == 1
 int main(int argc, char **argv) {
     sleep(5);
 
@@ -82,3 +83,9 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+#else
+int main(void) {
+    printf("ERROR: Zenoh pico was compiled without Z_FEATURE_PUBLICATION but this example requires it.\n");
+    return -1;
+}
+#endif