Fix session close not to close session independently of refcount (#529)

* Fix session drop to account for ref count;
Automatically stop read/lease task on session drop;

* add check for multi-thread support

examples/espidf/z_get.c

@@ -178,9 +178,6 @@ void app_main() {
     }
 
     printf("Closing Zenoh Session...");
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
 
     z_close(z_move(s));
     printf("OK!\n");

examples/espidf/z_pub.c

@@ -165,10 +165,6 @@ void app_main() {
     printf("Closing Zenoh Session...");
     z_undeclare_publisher(z_move(pub));
 
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
     printf("OK!\n");
 }

examples/espidf/z_pull.c

@@ -171,10 +171,6 @@ void app_main() {
     // 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_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
     printf("OK!\n");
 }

examples/espidf/z_queryable.c

@@ -186,10 +186,6 @@ void app_main() {
     printf("Closing Zenoh Session...");
     z_undeclare_queryable(z_move(qable));
 
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
     printf("OK!\n");
 }

examples/espidf/z_sub.c

@@ -167,10 +167,6 @@ void app_main() {
     printf("Closing Zenoh Session...");
     z_undeclare_subscriber(z_move(sub));
 
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
     printf("OK!\n");
 }

examples/freertos_plus_tcp/z_get.c

@@ -99,10 +99,6 @@ void app_main(void) {
         }
     }
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 }
 #else

examples/freertos_plus_tcp/z_pub.c

@@ -108,8 +108,6 @@ void app_main(void) {
 
     // Clean-up
     z_undeclare_publisher(z_move(pub));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
 }
 #else

examples/freertos_plus_tcp/z_pull.c

@@ -81,10 +81,6 @@ void app_main(void) {
     // 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_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 }
 #else

examples/freertos_plus_tcp/z_put.c

@@ -57,8 +57,6 @@ void app_main(void) {
     z_view_keyexpr_from_str_unchecked(&vke, KEYEXPR);
     if (z_declare_keyexpr(&ke, z_loan(s), z_loan(vke)) < 0) {
         printf("Unable to declare key expression!\n");
-        zp_stop_read_task(z_loan_mut(s));
-        zp_stop_lease_task(z_loan_mut(s));
         z_close(z_move(s));
         return;
     }
@@ -81,8 +79,6 @@ void app_main(void) {
 
     // Clean up
     z_undeclare_keyexpr(z_move(ke), z_loan(s));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
 }
 #else

examples/freertos_plus_tcp/z_queryable.c

@@ -97,10 +97,6 @@ void app_main(void) {
 
     z_undeclare_queryable(z_move(qable));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 }
 #else

examples/freertos_plus_tcp/z_sub.c

@@ -77,10 +77,6 @@ void app_main(void) {
 
     z_undeclare_subscriber(z_move(sub));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 }
 #else

examples/mbed/z_get.cpp

@@ -99,9 +99,6 @@ int main(int argc, char **argv) {
     }
 
     printf("Closing Zenoh Session...");
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_session_loan_mut(&s));
-    zp_stop_lease_task(z_session_loan_mut(&s));
 
     z_close(z_session_move(&s));
     printf("OK!\n");

examples/mbed/z_pub.cpp

@@ -85,10 +85,6 @@ int main(int argc, char **argv) {
     printf("Closing Zenoh Session...");
     z_undeclare_publisher(z_publisher_move(&pub));
 
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_session_loan_mut(&s));
-    zp_stop_lease_task(z_session_loan_mut(&s));
-
     z_close(z_session_move(&s));
     printf("OK!\n");
 

examples/mbed/z_pull.cpp

@@ -90,10 +90,6 @@ int main(int argc, char **argv) {
     // 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_mut(&s));
-    zp_stop_lease_task(z_session_loan_mut(&s));
-
     z_close(z_session_move(&s));
     printf("OK!\n");
 

examples/mbed/z_queryable.cpp

@@ -104,10 +104,6 @@ int main(int argc, char **argv) {
     printf("Closing Zenoh Session...");
     z_undeclare_queryable(z_queryable_move(&qable));
 
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_session_loan_mut(&s));
-    zp_stop_lease_task(z_session_loan_mut(&s));
-
     z_close(z_session_move(&s));
     printf("OK!\n");
 

examples/mbed/z_sub.cpp

@@ -88,10 +88,6 @@ int main(int argc, char **argv) {
     printf("Closing Zenoh Session...");
     z_undeclare_subscriber(z_subscriber_move(&sub));
 
-    // Stop the receive and the session lease loop for zenoh-pico
-    zp_stop_read_task(z_session_loan_mut(&s));
-    zp_stop_lease_task(z_session_loan_mut(&s));
-
     z_close(z_session_move(&s));
     printf("OK!\n");
 

examples/unix/c11/z_get.c

@@ -142,10 +142,6 @@ int main(int argc, char **argv) {
     z_condvar_wait(z_loan_mut(cond), z_loan_mut(mutex));
     z_mutex_unlock(z_loan_mut(mutex));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
     return 0;
 }

examples/unix/c11/z_get_attachment.c

@@ -231,10 +231,6 @@ int main(int argc, char **argv) {
     z_condvar_wait(z_loan_mut(cond), z_loan_mut(mutex));
     z_mutex_unlock(z_loan_mut(mutex));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
     return 0;
 }

examples/unix/c11/z_get_channel.c

@@ -123,10 +123,6 @@ int main(int argc, char **argv) {
 
     z_drop(z_move(handler));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 
     return 0;

examples/unix/c11/z_info.c

@@ -96,9 +96,5 @@ int main(int argc, char **argv) {
     z_closure(&callback2, print_zid);
     z_info_peers_zid(z_loan(s), z_move(callback2));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 }

examples/unix/c11/z_ping.c

@@ -135,9 +135,6 @@ int main(int argc, char** argv) {
     z_drop(z_move(pub));
     z_drop(z_move(sub));
 
-    zp_stop_read_task(z_loan_mut(session));
-    zp_stop_lease_task(z_loan_mut(session));
-
     z_close(z_move(session));
 }
 

examples/unix/c11/z_pong.c

@@ -74,9 +74,6 @@ int main(int argc, char** argv) {
 
     z_drop(z_move(sub));
 
-    zp_stop_read_task(z_loan_mut(session));
-    zp_stop_lease_task(z_loan_mut(session));
-
     z_close(z_move(session));
 }
 #else

examples/unix/c11/z_pub.c

@@ -120,8 +120,6 @@ int main(int argc, char **argv) {
     }
     // Clean up
     z_undeclare_publisher(z_move(pub));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
     return 0;
 }

examples/unix/c11/z_pub_attachment.c

@@ -171,8 +171,6 @@ int main(int argc, char **argv) {
     }
     // Clean up
     z_undeclare_publisher(z_move(pub));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
     return 0;
 }

examples/unix/c11/z_pub_thr.c

@@ -69,8 +69,6 @@ int main(int argc, char **argv) {
     }
     // Clean up
     z_undeclare_publisher(z_move(pub));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
     z_free(value);
     exit(0);

examples/unix/c11/z_pull.c

@@ -105,10 +105,6 @@ int main(int argc, char **argv) {
     z_undeclare_subscriber(z_move(sub));
     z_drop(z_move(handler));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 
     return 0;

examples/unix/c11/z_put.c

@@ -90,9 +90,6 @@ int main(int argc, char **argv) {
     z_view_keyexpr_from_str(&vke, keyexpr);
     z_owned_keyexpr_t ke;
     if (z_declare_keyexpr(&ke, z_loan(s), z_loan(vke)) < 0) {
-        printf("Unable to declare key expression!\n");
-        zp_stop_read_task(z_loan_mut(s));
-        zp_stop_lease_task(z_loan_mut(s));
         z_close(z_move(s));
         return -1;
     }
@@ -107,8 +104,6 @@ int main(int argc, char **argv) {
     }
     // Clean up
     z_undeclare_keyexpr(z_move(ke), z_loan(s));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
     return 0;
 }

examples/unix/c11/z_queryable.c

@@ -162,10 +162,6 @@ int main(int argc, char **argv) {
 
     z_undeclare_queryable(z_move(qable));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 
     return 0;

examples/unix/c11/z_queryable_attachment.c

@@ -246,10 +246,6 @@ int main(int argc, char **argv) {
 
     z_undeclare_queryable(z_move(qable));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 
     return 0;

examples/unix/c11/z_queryable_channel.c

@@ -128,10 +128,6 @@ int main(int argc, char **argv) {
     z_drop(z_move(handler));
     z_undeclare_queryable(z_move(qable));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 
     return 0;

examples/unix/c11/z_sub.c

@@ -116,8 +116,6 @@ int main(int argc, char **argv) {
     }
     // Clean up
     z_undeclare_subscriber(z_move(sub));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
     return 0;
 }

examples/unix/c11/z_sub_attachment.c

@@ -172,8 +172,6 @@ int main(int argc, char **argv) {
     }
     // Clean up
     z_undeclare_subscriber(z_move(sub));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
     return 0;
 }

examples/unix/c11/z_sub_channel.c

@@ -93,10 +93,6 @@ int main(int argc, char **argv) {
     z_undeclare_subscriber(z_move(sub));
     z_drop(z_move(handler));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
-
     z_close(z_move(s));
 
     return 0;

examples/unix/c11/z_sub_thr.c

@@ -110,8 +110,6 @@ int main(int argc, char **argv) {
 
     // Clean up
     z_undeclare_subscriber(z_move(sub));
-    zp_stop_read_task(z_loan_mut(s));
-    zp_stop_lease_task(z_loan_mut(s));
     z_close(z_move(s));
     exit(0);
 }

examples/unix/c99/z_get.c

@@ -135,10 +135,6 @@ int main(int argc, char **argv) {
     z_condvar_wait(z_condvar_loan_mut(&cond), z_mutex_loan_mut(&mutex));
     z_mutex_unlock(z_mutex_loan_mut(&mutex));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_session_loan_mut(&s));
-    zp_stop_lease_task(z_session_loan_mut(&s));
-
     z_close(z_session_move(&s));
 
     return 0;

examples/unix/c99/z_info.c

@@ -96,9 +96,5 @@ int main(int argc, char **argv) {
     z_closure_zid(&callback2, print_zid, NULL, NULL);
     z_info_peers_zid(z_session_loan(&s), z_closure_zid_move(&callback2));
 
-    // Stop read and lease tasks for zenoh-pico
-    zp_stop_read_task(z_session_loan_mut(&s));
-    zp_stop_lease_task(z_session_loan_mut(&s));
-
     z_close(z_session_move(&s));
 }