Merge pull request #667 from eclipse-zenoh/open_options

options for z_open, z_close

examples/z_delete.c

@@ -30,7 +30,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -43,7 +43,7 @@ int main(int argc, char** argv) {
         printf("Delete failed...\n");
     }
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_get.c

@@ -38,7 +38,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config))) {
+    if (z_open(&s, z_move(config), NULL)) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -80,7 +80,7 @@ int main(int argc, char** argv) {
     }
 
     z_drop(z_move(handler));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_get_liveliness.c

@@ -36,7 +36,7 @@ int main(int argc, char** argv) {
 
     z_owned_session_t s;
     printf("Opening session...\n");
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -60,7 +60,7 @@ int main(int argc, char** argv) {
 
     z_drop(z_move(reply));
     z_drop(z_move(handler));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_get_shm.c

@@ -52,7 +52,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config))) {
+    if (z_open(&s, z_move(config), NULL)) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -119,7 +119,7 @@ int main(int argc, char** argv) {
     }
 
     z_drop(z_move(handler));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 
     z_drop(z_move(shm));
     z_drop(z_move(provider));

examples/z_info.c

@@ -31,7 +31,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -52,7 +52,7 @@ int main(int argc, char** argv) {
     z_closure(&callback2, print_zid, NULL, NULL);
     z_info_peers_zid(z_loan(s), z_move(callback2));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 
 void print_help() {

examples/z_liveliness.c

@@ -36,7 +36,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config))) {
+    if (z_open(&s, z_move(config), NULL)) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -58,7 +58,7 @@ int main(int argc, char** argv) {
     printf("Undeclaring liveliness token...\n");
     z_drop(z_move(token));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_non_blocking_get.c

@@ -36,7 +36,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config))) {
+    if (z_open(&s, z_move(config), NULL)) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -72,7 +72,7 @@ int main(int argc, char** argv) {
     }
     z_drop(z_move(reply));
     z_drop(z_move(handler));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_ping.c

@@ -38,7 +38,7 @@ int main(int argc, char** argv) {
     z_mutex_init(&mutex);
     z_condvar_init(&cond);
     z_owned_session_t session;
-    z_open(&session, z_move(config));
+    z_open(&session, z_move(config), NULL);
     z_view_keyexpr_t ping;
     z_view_keyexpr_from_str_unchecked(&ping, "test/ping");
     z_view_keyexpr_t pong;
@@ -91,7 +91,7 @@ int main(int argc, char** argv) {
     z_undeclare_subscriber(z_move(sub));
     z_undeclare_publisher(z_move(pub));
     z_drop(z_move(mutex));
-    z_close(z_move(session));
+    z_close(z_move(session), NULL);
 }
 
 void print_help() {

examples/z_ping_shm.c

@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
     }
 
     z_owned_session_t session;
-    z_open(&session, z_move(config));
+    z_open(&session, z_move(config), NULL);
     z_view_keyexpr_t ping;
     z_view_keyexpr_from_str_unchecked(&ping, "test/ping");
     z_view_keyexpr_t pong;
@@ -133,7 +133,7 @@ int main(int argc, char** argv) {
     z_undeclare_subscriber(z_move(sub));
     z_undeclare_publisher(z_move(pub));
     z_drop(z_move(mutex));
-    z_close(z_move(session));
+    z_close(z_move(session), NULL);
 
     z_drop(z_move(shm));
     z_drop(z_move(provider));

examples/z_pong.c

@@ -26,7 +26,7 @@ int main(int argc, char** argv) {
     parse_args(argc, argv, &config);
 
     z_owned_session_t session;
-    z_open(&session, z_move(config));
+    z_open(&session, z_move(config), NULL);
     z_view_keyexpr_t ping;
     z_view_keyexpr_from_str_unchecked(&ping, "test/ping");
     z_view_keyexpr_t pong;
@@ -42,7 +42,7 @@ int main(int argc, char** argv) {
         z_sleep_s(1);
     }
     z_undeclare_subscriber(z_move(sub));
-    z_close(z_move(session));
+    z_close(z_move(session), NULL);
 }
 
 void print_help() {

examples/z_pub.c

@@ -43,7 +43,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -92,7 +92,7 @@ int main(int argc, char** argv) {
 #endif
 
     z_undeclare_publisher(z_move(pub));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_pub_attachment.c

@@ -55,7 +55,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -101,7 +101,7 @@ int main(int argc, char** argv) {
 
     z_undeclare_publisher(z_move(pub));
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 
     return 0;
 }

examples/z_pub_cache.c

@@ -39,7 +39,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -72,7 +72,7 @@ int main(int argc, char** argv) {
     }
 
     ze_undeclare_publication_cache(z_move(pub_cache));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 
     return 0;
 }

examples/z_pub_shm.c

@@ -44,7 +44,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -114,7 +114,7 @@ int main(int argc, char** argv) {
 #endif
 
     z_undeclare_publisher(z_move(pub));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 
     z_drop(z_move(provider));
     z_drop(z_move(layout));

examples/z_pub_shm_thr.c

@@ -39,7 +39,7 @@ int main(int argc, char **argv) {
     }
 
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -87,7 +87,7 @@ int main(int argc, char **argv) {
     }
 
     z_undeclare_publisher(z_move(pub));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 
     z_drop(z_move(shm));
     z_drop(z_move(provider));

examples/z_pub_thr.c

@@ -31,7 +31,7 @@ int main(int argc, char** argv) {
     memset(value, 1, args.size);
 
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -56,7 +56,7 @@ int main(int argc, char** argv) {
     }
 
     z_undeclare_publisher(z_move(pub));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 }
 
 void print_help() {

examples/z_pull.c

@@ -43,7 +43,7 @@ int main(int argc, char** argv) {
     printf("Opening session...\n");
     z_owned_session_t s;
 
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -79,7 +79,7 @@ int main(int argc, char** argv) {
         }
     }
     z_undeclare_subscriber(z_move(sub));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_put.c

@@ -32,7 +32,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -60,7 +60,7 @@ int main(int argc, char** argv) {
         printf("Put failed...\n");
     }
 
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_query_sub.c

@@ -43,7 +43,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config))) {
+    if (z_open(&s, z_move(config), NULL)) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -68,7 +68,7 @@ int main(int argc, char** argv) {
     }
 
     ze_undeclare_querying_subscriber(z_move(sub));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
 
     return 0;
 }

examples/z_queryable.c

@@ -69,7 +69,7 @@ int main(int argc, char **argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config))) {
+    if (z_open(&s, z_move(config), NULL)) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -95,7 +95,7 @@ int main(int argc, char **argv) {
     }
 
     z_undeclare_queryable(z_move(qable));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }
 

examples/z_queryable_shm.c

@@ -93,7 +93,7 @@ int main(int argc, char **argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config))) {
+    if (z_open(&s, z_move(config), NULL)) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -131,7 +131,7 @@ int main(int argc, char **argv) {
     }
 
     z_undeclare_queryable(z_move(qable));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     z_drop(z_move(layout));
     z_drop(z_move(provider));
     return 0;

examples/z_queryable_with_channels.c

@@ -34,7 +34,7 @@ int main(int argc, char** argv) {
 
     printf("Opening session...\n");
     z_owned_session_t s;
-    if (z_open(&s, z_move(config)) < 0) {
+    if (z_open(&s, z_move(config), NULL) < 0) {
         printf("Unable to open session!\n");
         exit(-1);
     }
@@ -90,7 +90,7 @@ int main(int argc, char** argv) {
 
     z_undeclare_queryable(z_move(qable));
     z_drop(z_move(handler));
-    z_close(z_move(s));
+    z_close(z_move(s), NULL);
     return 0;
 }