Protocol cleanup (#374)

* Remove ACK message * Cleanup pull and subscriber * Remove Put/Del from ResponseBody * Cleanup flags * Comment unusued variables in pull examples * Fix alignment test
eclipse-zenoh · Mar 20, 2024 · 9bd061c · 9bd061c
1 parent 8e8c678
commit 9bd061c
Show file tree

Hide file tree

Showing 39 changed files with 250 additions and 862 deletions.
diff --git a/examples/arduino/z_pull.ino b/examples/arduino/z_pull.ino
@@ -34,20 +34,22 @@
 
 #define KEYEXPR "demo/example/**"
 
-z_owned_pull_subscriber_t sub;
+// @TODO
+// z_owned_pull_subscriber_t sub;
 
-void data_handler(const z_sample_t *sample, void *arg) {
-    z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
-    std::string val((const char *)sample->payload.start, sample->payload.len);
+// @TODO
+// void data_handler(const z_sample_t *sample, void *arg) {
+//     z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
+//     std::string val((const char *)sample->payload.start, sample->payload.len);
 
-    Serial.print(" >> [Subscription listener] Received (");
-    Serial.print(z_str_loan(&keystr));
-    Serial.print(", ");
-    Serial.print(val.c_str());
-    Serial.println(")");
+//     Serial.print(" >> [Subscription listener] Received (");
+//     Serial.print(z_str_loan(&keystr));
+//     Serial.print(", ");
+//     Serial.print(val.c_str());
+//     Serial.println(")");
 
-    z_str_drop(z_str_move(&keystr));
-}
+//     z_str_drop(z_str_move(&keystr));
+// }
 
 void setup() {
     // Initialize Serial for debug
@@ -91,23 +93,26 @@ void setup() {
     Serial.print("Declaring Subscriber on ");
     Serial.print(KEYEXPR);
     Serial.println(" ...");
-    z_owned_closure_sample_t callback = z_closure_sample(data_handler, NULL, NULL);
-    sub = z_declare_pull_subscriber(z_session_loan(&s), z_keyexpr(KEYEXPR), z_closure_sample_move(&callback), NULL);
-    if (!z_pull_subscriber_check(&sub)) {
-        Serial.println("Unable to declare subscriber.");
-        while (1) {
-            ;
-        }
-    }
-    Serial.println("OK");
-    Serial.println("Zenoh setup finished!");
+    // @TODO
+    // z_owned_closure_sample_t callback = z_closure_sample(data_handler, NULL, NULL);
+    // @TODO
+    // sub = z_declare_pull_subscriber(z_session_loan(&s), z_keyexpr(KEYEXPR), z_closure_sample_move(&callback), NULL);
+    // if (!z_pull_subscriber_check(&sub)) {
+    //     Serial.println("Unable to declare subscriber.");
+    //     while (1) {
+    //         ;
+    //     }
+    // }
+    // Serial.println("OK");
+    // Serial.println("Zenoh setup finished!");
+    Serial.println("Pull Subscriber not supported... exiting");
 
     delay(300);
 }
 
 void loop() {
     delay(5000);
-    z_subscriber_pull(z_pull_subscriber_loan(&sub));
+    // z_subscriber_pull(z_pull_subscriber_loan(&sub));
 }
 #else
 void setup() {

diff --git a/examples/espidf/z_pull.c b/examples/espidf/z_pull.c
@@ -100,12 +100,13 @@ void wifi_init_sta(void) {
     vEventGroupDelete(s_event_group_handler);
 }
 
-void data_handler(const z_sample_t* sample, void* arg) {
-    z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
-    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_loan(keystr), (int)sample->payload.len,
-           sample->payload.start);
-    z_drop(z_move(keystr));
-}
+// @TODO
+// void data_handler(const z_sample_t* sample, void* arg) {
+//     z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
+//     printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_loan(keystr), (int)sample->payload.len,
+//            sample->payload.start);
+//     z_drop(z_move(keystr));
+// }
 
 void app_main() {
     esp_err_t ret = nvs_flash_init();
@@ -144,23 +145,26 @@ void app_main() {
     zp_start_read_task(z_loan(s), NULL);
     zp_start_lease_task(z_loan(s), NULL);
 
+    // @TODO
+    // z_owned_closure_sample_t callback = z_closure(data_handler);
     printf("Declaring Subscriber on '%s'...", KEYEXPR);
-    z_owned_closure_sample_t callback = z_closure(data_handler);
-    z_owned_pull_subscriber_t sub = z_declare_pull_subscriber(z_loan(s), z_keyexpr(KEYEXPR), z_move(callback), NULL);
-    if (!z_check(sub)) {
-        printf("Unable to declare subscriber.\n");
-        exit(-1);
-    }
-    printf("OK!\n");
-
-    while (1) {
-        sleep(5);
-        printf("Pulling data from '%s'...\n", KEYEXPR);
-        z_subscriber_pull(z_loan(sub));
-    }
-
-    printf("Closing Zenoh Session...");
-    z_undeclare_pull_subscriber(z_move(sub));
+    // @TODO
+    // z_owned_pull_subscriber_t sub = z_declare_pull_subscriber(z_loan(s), z_keyexpr(KEYEXPR), z_move(callback), NULL);
+    // if (!z_check(sub)) {
+    //     printf("Unable to declare subscriber.\n");
+    //     exit(-1);
+    // }
+    // printf("OK!\n");
+
+    // while (1) {
+    //     sleep(5);
+    //     printf("Pulling data from '%s'...\n", KEYEXPR);
+    //     z_subscriber_pull(z_loan(sub));
+    // }
+
+    // printf("Closing Zenoh Session...");
+    // z_undeclare_pull_subscriber(z_move(sub));
+    printf("Pull Subscriber not supported... exiting\n");
 
     // Stop the receive and the session lease loop for zenoh-pico
     zp_stop_read_task(z_loan(s));

diff --git a/examples/freertos_plus_tcp/z_pull.c b/examples/freertos_plus_tcp/z_pull.c
@@ -28,13 +28,14 @@
 
 #define KEYEXPR "demo/example/**"
 
-void data_handler(const z_sample_t *sample, void *ctx) {
-    (void)(ctx);
-    z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
-    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_loan(keystr), (int)sample->payload.len,
-           sample->payload.start);
-    z_drop(z_move(keystr));
-}
+// @TODO
+// void data_handler(const z_sample_t *sample, void *ctx) {
+//     (void)(ctx);
+//     z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
+//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_loan(keystr), (int)sample->payload.len,
+//            sample->payload.start);
+//     z_drop(z_move(keystr));
+// }
 
 void app_main(void) {
     z_owned_config_t config = z_config_default();
@@ -57,21 +58,24 @@ void app_main(void) {
         return;
     }
 
-    z_owned_closure_sample_t callback = z_closure(data_handler);
+    // @TODO
+    // z_owned_closure_sample_t callback = z_closure(data_handler);
     printf("Declaring Subscriber on '%s'...\n", KEYEXPR);
-    z_owned_pull_subscriber_t sub = z_declare_pull_subscriber(z_loan(s), z_keyexpr(KEYEXPR), z_move(callback), NULL);
-    if (!z_check(sub)) {
-        printf("Unable to declare subscriber.\n");
-        return;
-    }
+    // @TODO
+    // z_owned_pull_subscriber_t sub = z_declare_pull_subscriber(z_loan(s), z_keyexpr(KEYEXPR), z_move(callback), NULL);
+    // if (!z_check(sub)) {
+    //     printf("Unable to declare subscriber.\n");
+    //     return;
+    // }
 
-    while (1) {
-        zp_sleep_s(5);
-        printf("Pulling data from '%s'...\n", KEYEXPR);
-        z_subscriber_pull(z_loan(sub));
-    }
+    // while (1) {
+    //     zp_sleep_s(5);
+    //     printf("Pulling data from '%s'...\n", KEYEXPR);
+    //     z_subscriber_pull(z_loan(sub));
+    // }
 
-    z_undeclare_pull_subscriber(z_move(sub));
+    // z_undeclare_pull_subscriber(z_move(sub));
+    printf("Pull Subscriber not supported... exiting\n");
 
     // Stop read and lease tasks for zenoh-pico
     zp_stop_read_task(z_loan(s));

diff --git a/examples/mbed/z_pull.cpp b/examples/mbed/z_pull.cpp
@@ -30,12 +30,13 @@
 
 #define KEYEXPR "demo/example/**"
 
-void data_handler(const z_sample_t *sample, void *arg) {
-    z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
-    printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)sample->payload.len,
-           sample->payload.start);
-    z_str_drop(z_str_move(&keystr));
-}
+// @TODO
+// void data_handler(const z_sample_t *sample, void *arg) {
+//     z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
+//     printf(" >> [Subscriber handler] Received ('%s': '%.*s')\n", z_str_loan(&keystr), (int)sample->payload.len,
+//            sample->payload.start);
+//     z_str_drop(z_str_move(&keystr));
+// }
 
 int main(int argc, char **argv) {
     randLIB_seed_random();
@@ -64,24 +65,27 @@ int main(int argc, char **argv) {
     zp_start_read_task(z_session_loan(&s), NULL);
     zp_start_lease_task(z_session_loan(&s), NULL);
 
+    // @TODO
+    // z_owned_closure_sample_t callback = z_closure_sample(data_handler, NULL, NULL);
     printf("Declaring Subscriber on '%s'...", KEYEXPR);
-    z_owned_closure_sample_t callback = z_closure_sample(data_handler, NULL, NULL);
-    z_owned_pull_subscriber_t sub =
-        z_declare_pull_subscriber(z_session_loan(&s), z_keyexpr(KEYEXPR), z_closure_sample_move(&callback), NULL);
-    if (!z_pull_subscriber_check(&sub)) {
-        printf("Unable to declare subscriber.\n");
-        exit(-1);
-    }
-    printf("OK!\n");
+    // @TODO
+    // z_owned_pull_subscriber_t sub =
+    //     z_declare_pull_subscriber(z_session_loan(&s), z_keyexpr(KEYEXPR), z_closure_sample_move(&callback), NULL);
+    // if (!z_pull_subscriber_check(&sub)) {
+    //     printf("Unable to declare subscriber.\n");
+    //     exit(-1);
+    // }
+    // printf("OK!\n");
 
-    while (1) {
-        zp_sleep_s(5);
-        printf("Pulling data from '%s'...\n", KEYEXPR);
-        z_subscriber_pull(z_pull_subscriber_loan(&sub));
-    }
+    // while (1) {
+    //     zp_sleep_s(5);
+    //     printf("Pulling data from '%s'...\n", KEYEXPR);
+    //     z_subscriber_pull(z_pull_subscriber_loan(&sub));
+    // }
 
-    printf("Closing Zenoh Session...");
-    z_undeclare_pull_subscriber(z_pull_subscriber_move(&sub));
+    // printf("Closing Zenoh Session...");
+    // z_undeclare_pull_subscriber(z_pull_subscriber_move(&sub));
+    printf("Pull Subscriber not supported... exiting\n");
 
     // Stop the receive and the session lease loop for zenoh-pico
     zp_stop_read_task(z_session_loan(&s));

diff --git a/examples/unix/c11/z_get.c b/examples/unix/c11/z_get.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    printf("Enter any key to pull data or 'q' to quit...\n");
+    printf("Enter any key to get data or 'q' to quit...\n");
     char c = '\0';
     while (1) {
         fflush(stdin);

diff --git a/examples/unix/c11/z_pull.c b/examples/unix/c11/z_pull.c
@@ -19,13 +19,14 @@
 #include <zenoh-pico.h>
 
 #if Z_FEATURE_SUBSCRIPTION == 1
-void data_handler(const z_sample_t *sample, void *ctx) {
-    (void)(ctx);
-    z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
-    printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_loan(keystr), (int)sample->payload.len,
-           sample->payload.start);
-    z_drop(z_move(keystr));
-}
+// @TODO
+// void data_handler(const z_sample_t *sample, void *ctx) {
+//     (void)(ctx);
+//     z_owned_str_t keystr = z_keyexpr_to_string(sample->keyexpr);
+//     printf(">> [Subscriber] Received ('%s': '%.*s')\n", z_loan(keystr), (int)sample->payload.len,
+//            sample->payload.start);
+//     z_drop(z_move(keystr));
+// }
 
 int main(int argc, char **argv) {
     const char *keyexpr = "demo/example/**";
@@ -71,27 +72,31 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    z_owned_closure_sample_t callback = z_closure(data_handler);
+    // @TODO
+    // z_owned_closure_sample_t callback = z_closure(data_handler);
     printf("Declaring Subscriber on '%s'...\n", keyexpr);
-    z_owned_pull_subscriber_t sub = z_declare_pull_subscriber(z_loan(s), z_keyexpr(keyexpr), z_move(callback), NULL);
-    if (!z_check(sub)) {
-        printf("Unable to declare subscriber.\n");
-        return -1;
-    }
 
-    printf("Enter any key to pull data or 'q' to quit...\n");
-    char c = '\0';
-    while (1) {
-        fflush(stdin);
-        int ret = scanf("%c", &c);
-        (void)ret;  // Remove unused result warning
-        if (c == 'q') {
-            break;
-        }
-        z_subscriber_pull(z_loan(sub));
-    }
+    // @TODO
+    // z_owned_pull_subscriber_t sub = z_declare_pull_subscriber(z_loan(s), z_keyexpr(keyexpr), z_move(callback), NULL);
+    // if (!z_check(sub)) {
+    //     printf("Unable to declare subscriber.\n");
+    //     return -1;
+    // }
+
+    // printf("Enter any key to pull data or 'q' to quit...\n");
+    // char c = '\0';
+    // while (1) {
+    //     fflush(stdin);
+    //     int ret = scanf("%c", &c);
+    //     (void)ret;  // Remove unused result warning
+    //     if (c == 'q') {
+    //         break;
+    //     }
+    //     z_subscriber_pull(z_loan(sub));
+    // }
 
-    z_undeclare_pull_subscriber(z_move(sub));
+    // z_undeclare_pull_subscriber(z_move(sub));
+    printf("Pull Subscriber not supported... exiting\n");
 
     // Stop read and lease tasks for zenoh-pico
     zp_stop_read_task(z_loan(s));

diff --git a/examples/unix/c99/z_get.c b/examples/unix/c99/z_get.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv) {
         return -1;
     }
 
-    printf("Enter any key to pull data or 'q' to quit...\n");
+    printf("Enter any key to get data or 'q' to quit...\n");
     char c = '\0';
     while (1) {
         fflush(stdin);